X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-fun.el;h=aaf45cb7deaff71e006af1c9a892d29ef5ff6efa;hb=8a89881263f22a446758ace2e3de1cd4b4fa8c9c;hp=eef1c882cf0d8031b1d628df1abb8db40ef2dec9;hpb=db77cdaa101f075c7ce415a1f7e2bceface4cf58;p=gnus

diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index eef1c882c..aaf45cb7d 100644
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -1,5 +1,5 @@
-;;; gnus-fun.el --- various frivoluos extension functions to Gnus
-;; Copyright (C) 2002 Free Software Foundation, Inc.
+;;; gnus-fun.el --- various frivolous extension functions to Gnus
+;; Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -25,6 +25,10 @@
 
 ;;; Code:
 
+(eval-when-compile
+  (require 'cl)
+  (require 'mm-util))
+
 (defcustom gnus-x-face-directory (expand-file-name "x-faces" gnus-directory)
   "*Directory where X-Face PBM files are stored."
   :group 'gnus-fun
@@ -36,12 +40,16 @@
   :type 'string)
 
 (defcustom gnus-convert-image-to-x-face-command "giftopnm %s | ppmnorm | pnmscale -width 48 -height 48 | ppmtopgm | pgmtopbm | pbmtoxbm | compface"
-  "Command for converting a GIF to an X-Face."
+  "Command for converting an image to an X-Face.
+By default it takes a GIF filename and output the X-Face header data
+on stdout."
   :group 'gnus-fun
   :type 'string)
 
 (defcustom gnus-convert-image-to-face-command "djpeg %s | ppmnorm | pnmscale -width 48 -height 48 | ppmquant %d | pnmtopng"
-  "Command for converting a GIF to an X-Face."
+  "Command for converting an image to an Face.
+By default it takes a JPEG filename and output the Face header data
+on stdout."
   :group 'gnus-fun
   :type 'string)
 
@@ -60,7 +68,7 @@ Output to the current buffer, replace text, and don't mingle error."
 
 ;;;###autoload
 (defun gnus-random-x-face ()
-  "Insert a random X-Face header from `gnus-x-face-directory'."
+  "Return X-Face header data chosen randomly from `gnus-x-face-directory'."
   (interactive)
   (when (file-exists-p gnus-x-face-directory)
     (let* ((files (directory-files gnus-x-face-directory t "\\.pbm$"))
@@ -70,149 +78,90 @@ Output to the current buffer, replace text, and don't mingle error."
 	 (format gnus-convert-pbm-to-x-face-command
 		 (shell-quote-argument file)))))))
 
+;;;###autoload
+(defun gnus-insert-random-x-face-header ()
+  "Insert a random X-Face header from `gnus-x-face-directory'."
+  (interactive)
+  (let ((data (gnus-random-x-face)))
+    (save-excursion
+      (message-goto-eoh)
+      (if data
+	  (insert "X-Face: " data)
+	(message
+	 "No face returned by `gnus-random-x-face'.  Does %s/*.pbm exist?"
+	 gnus-x-face-directory)))))
+
 ;;;###autoload
 (defun gnus-x-face-from-file (file)
   "Insert an X-Face header based on an image file."
-  (interactive "fImage file name:" )
+  (interactive "fImage file name (by default GIF): ")
   (when (file-exists-p file)
     (gnus-shell-command-to-string
      (format gnus-convert-image-to-x-face-command
-	     (shell-quote-argument file)))))
+	     (shell-quote-argument (expand-file-name file))))))
 
+;;;###autoload
 (defun gnus-face-from-file (file)
   "Return an Face header based on an image file."
-  (interactive "fImage file name:" )
+  (interactive "fImage file name (by default JPEG): ")
   (when (file-exists-p file)
     (let ((done nil)
 	  (attempt "")
-	  (quant 4))
+	  (quant 16))
       (while (and (not done)
 		  (> quant 1))
 	(setq attempt
 	      (gnus-shell-command-to-string
 	       (format gnus-convert-image-to-face-command
-		       (shell-quote-argument file)
+		       (shell-quote-argument (expand-file-name file))
 		       quant)))
 	(if (> (length attempt) 740)
-	    (setq quant (/ quant 2))
+	    (progn
+	      (setq quant (- quant 2))
+	      (message "Length %d; trying quant %d"
+		       (length attempt) quant))
 	  (setq done t)))
       (if done
-	  (mm-with-unibyte-buffer	
+	  (mm-with-unibyte-buffer
 	    (insert attempt)
-	    (base64-encode-region (point-min) (point-max))
-	    (goto-char (point-min))
-	    (forward-line 1)
-	    (while (not (eobp))
-	      (insert " ")
-	      (forward-line 1))
-	    (buffer-string))
+	    (gnus-face-encode))
 	nil))))
 
+(defun gnus-face-encode ()
+  (let ((step 72))
+    (base64-encode-region (point-min) (point-max))
+    (goto-char (point-min))
+    (while (search-forward "\n" nil t)
+      (replace-match ""))
+    (goto-char (point-min))
+    (while (> (- (point-max) (point))
+	      step)
+      (forward-char step)
+      (insert "\n ")
+      (setq step 76))
+    (buffer-string)))
+
 ;;;###autoload
 (defun gnus-convert-face-to-png (face)
+  "Convert FACE (which is base64-encoded) to a PNG.
+The PNG is returned as a string."
   (mm-with-unibyte-buffer
     (insert face)
-    (base64-decode-region (point-min) (point-max))
+    (ignore-errors
+      (base64-decode-region (point-min) (point-max)))
     (buffer-string)))
 
-(defun gnus-convert-image-to-gray-x-face (file depth)
-  (let* ((mapfile (mm-make-temp-file (expand-file-name "gnus." 
-						       mm-tmp-directory)))
-	 (levels (expt 2 depth))
-	 (step (/ 255 (1- levels)))
-	 color-alist bits bits-list mask pixel x-faces)
-    (with-temp-file mapfile
-      (insert "P3\n")
-      (insert (format "%d 1\n" levels))
-      (insert "255\n")
-      (dotimes (i levels)
-	(insert (format "%d %d %d\n"
-			(* step i) (* step i) (* step i)))
-	(push (cons (* step i) i) color-alist)))
-    (when (file-exists-p file)
-      (with-temp-buffer
-	(insert (gnus-shell-command-to-string
-		 (format "giftopnm %s | ppmnorm | pnmscale -width 48 -height 48 | ppmquant -fs -map %s | ppmtopgm | pnmnoraw"
-			 (shell-quote-argument file)
-			 mapfile)))
-	(goto-char (point-min))
-	(forward-line 3)
-	(while (setq pixel (ignore-errors (read (current-buffer))))
-	  (push (cdr (assq pixel color-alist)) bits-list))
-	(setq bits-list (nreverse bits-list))
-	(dotimes (bit-number depth)
-	  (setq mask (expt 2 bit-number))
-	  (with-temp-buffer
-	    (insert "P1\n48 48\n")
-	    (dolist (bits bits-list)
-	      (insert (if (zerop (logand bits mask)) "0 " "1 ")))
-	    (gnus-shell-command-on-region
-	     (point-min) (point-max)
-	     ;; the following is taken from xbmtoikon:
-	     "pbmtoicon | sed '/^[ 	]*[*\\\\/]/d; s/[ 	]//g; s/,$//' | tr , '\\012' | sed 's/^0x//; s/^/0x/' | pr -l1 -t -w22 -3 -s, | sed 's/,*$/,/' | compface")
-	    (push (buffer-string) x-faces))))
-      (dotimes (i (length x-faces))
-	(insert (if (zerop i) "X-Face:" (format "X-Face-%s:" i))
-		(nth i x-faces))))
-    (delete-file mapfile)))
-
 ;;;###autoload
-(defun gnus-convert-gray-x-face-to-xpm (faces)
-  (let* ((depth (length faces))
-	 (scale (/ 255 (1- (expt 2 depth))))
-	 (ok-p t)
-	 (coding-system-for-read 'binary)
-	 (coding-system-for-write 'binary)
-	 default-enable-multibyte-characters
-	 start bit-array bit-arrays pixel)
-    (with-temp-buffer
-      (dolist (face faces)
-	(erase-buffer)
-	(insert (uncompface face))
-	(gnus-shell-command-on-region
-	 (point-min) (point-max)
-	 "pnmnoraw")
-	(goto-char (point-min))
-	(forward-line 2)
-	(setq start (point))
-	(insert "[")
-	(while (not (eobp))
-	  (forward-char 1)
-	  (insert " "))
-	(insert "]")
-	(goto-char start)
-	(setq bit-array (read (current-buffer)))
-	(unless (= (length bit-array) (* 48 48))
-	  (setq ok-p nil))
-	(push bit-array bit-arrays))
-      (when ok-p
-	(erase-buffer)
-	(insert "P2\n48 48\n255\n")
-	(dotimes (i (* 48 48))
-	  (setq pixel 0)
-	  (dotimes (plane depth)
-	    (setq pixel (+ (* pixel 2) (aref (nth plane bit-arrays) i))))
-	  (insert (number-to-string (* scale pixel)) " "))
-	(gnus-shell-command-on-region
-	 (point-min) (point-max)
-	 "ppmtoxpm")
-	(buffer-string)))))
-
-;;;###autoload
-(defun gnus-convert-gray-x-face-region (beg end)
-  "Convert the X-Faces in region to a PPM file."
-  (interactive "r")
-  (let ((input (buffer-substring beg end))
-	faces)
-    (with-temp-buffer
-      (insert input)
-      (goto-char (point-min))
-      (while (not (eobp))
-	(save-restriction
-	  (mail-header-narrow-to-field)
-	  (push (mail-header-field-value) faces)
-	  (goto-char (point-max)))))
-    (gnus-convert-gray-x-face-to-xpm faces)))
+(defun gnus-convert-png-to-face (file)
+  "Convert FILE to a Face.
+FILE should be a PNG file that's 48x48 and smaller than or equal to
+740 bytes."
+  (mm-with-unibyte-buffer
+    (insert-file-contents file)
+    (when (> (buffer-size) 740)
+      (error "The file is %d bytes long, which is too long"
+	     (buffer-size)))
+    (gnus-face-encode)))
 
 (defface gnus-x-face '((t (:foreground "black" :background "white")))
   "Face to show X-Face.
@@ -263,23 +212,38 @@ colors of the displayed X-Faces."
       (delete-file file)
       (buffer-string))))
 
-(defun gnus-grab-gray-x-face ()
+(defun gnus-grab-cam-face ()
   "Grab a picture off the camera and make it into an X-Face."
   (interactive)
   (shell-command "xawtv-remote snap ppm")
-  (let ((file nil))
+  (let ((file nil)
+	result)
     (while (null (setq file (directory-files "/tftpboot/sparky/tmp"
 					     t "snap.*ppm")))
       (sleep-for 1))
     (setq file (car file))
-    (with-temp-buffer
-      (shell-command
-       (format "pnmcut -left 70 -top 100 -width 144 -height 144 '%s' | ppmquant 256 2>/dev/null | ppmtogif > '%s.gif'"
-	       file file)
-       (current-buffer))
-      (delete-file file))
-    (gnus-convert-image-to-gray-x-face (concat file ".gif") 3)
-    (delete-file (concat file ".gif"))))
+    (shell-command
+     (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | pnmscale -width 48 -height 48 | ppmtopgm > /tmp/gnus.face.ppm"
+	     file))
+    (let ((gnus-convert-image-to-face-command
+	   (format "cat '%%s' | ppmquant %%d | ppmchange %s | pnmtopng"
+		   (gnus-fun-ppm-change-string))))
+      (setq result (gnus-face-from-file "/tmp/gnus.face.ppm")))
+    (delete-file file)
+    ;;(delete-file "/tmp/gnus.face.ppm")
+    result))
+
+(defun gnus-fun-ppm-change-string ()
+  (let* ((possibilites '("%02x0000" "00%02x00" "0000%02x"
+			"%02x%02x00" "00%02x%02x" "%02x00%02x"))
+	 (format (concat "'#%02x%02x%02x' '#"
+			 (nth (random 6) possibilites)
+			 "'"))
+	 (values nil))
+  (dotimes (i 255)
+    (push (format format i i i i i i)
+	  values))
+  (mapconcat 'identity values " ")))
 
 (provide 'gnus-fun)