X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Fgnus-fun.el;h=5e9d79a3e1ffc3a30e9aa5becd1e179ab0949b4c;hb=46c806246b3879561fa06411aaf5d2c3209650e5;hp=76e8dbdf6b794353fe2904ebba1be6603e475d01;hpb=dc1b896ef8b9dc20194003c98e6d238815e93c5a;p=gnus

diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index 76e8dbdf6..5e9d79a3e 100644
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -30,16 +30,34 @@
   :group 'gnus-fun
   :type 'directory)
 
-(defcustom gnus-convert-pbm-to-x-face-command "pbmtoxbm '%s' | compface"
+(defcustom gnus-convert-pbm-to-x-face-command "pbmtoxbm %s | compface"
   "Command for converting a PBM to an X-Face."
   :group 'gnus-fun
   :type 'string)
 
-(defcustom gnus-convert-image-to-x-face-command "giftopnm '%s' | ppmnorm 2>/dev/null | pnmscale -width 48 -height 48 | ppmtopgm | pgmtopbm | pbmtoxbm | compface"
+(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."
   :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."
+  :group 'gnus-fun
+  :type 'string)
+
+(defun gnus-shell-command-to-string (command)
+  "Like `shell-command-to-string' except not mingling ERROR."
+  (with-output-to-string
+    (call-process shell-file-name nil (list standard-output nil)
+		  nil shell-command-switch command)))
+
+(defun gnus-shell-command-on-region (start end command)
+  "A simplified `shell-command-on-region'.
+Output to the current buffer, replace text, and don't mingle error."
+  (call-process-region start end shell-file-name t
+		       (list (current-buffer) nil)
+		       nil shell-command-switch command))
+
 ;;;###autoload
 (defun gnus-random-x-face ()
   "Insert a random X-Face header from `gnus-x-face-directory'."
@@ -48,19 +66,67 @@
     (let* ((files (directory-files gnus-x-face-directory t "\\.pbm$"))
 	   (file (nth (random (length files)) files)))
       (when file
-	(shell-command-to-string
-	 (format gnus-convert-pbm-to-x-face-command file))))))
+	(gnus-shell-command-to-string
+	 (format gnus-convert-pbm-to-x-face-command
+		 (shell-quote-argument file)))))))
 
 ;;;###autoload
 (defun gnus-x-face-from-file (file)
   "Insert an X-Face header based on an image file."
   (interactive "fImage file name:" )
   (when (file-exists-p file)
-    (shell-command-to-string
-     (format gnus-convert-image-to-x-face-command file))))
+    (gnus-shell-command-to-string
+     (format gnus-convert-image-to-x-face-command
+	     (shell-quote-argument file)))))
+
+;;;###autoload
+(defun gnus-face-from-file (file)
+  "Return an Face header based on an image file."
+  (interactive "fImage file name:" )
+  (when (file-exists-p file)
+    (let ((done nil)
+	  (attempt "")
+	  (step 72)
+	  (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)
+		       quant)))
+	(if (> (length attempt) 740)
+	    (progn
+	      (setq quant (- quant 2))
+	      (message "Length %d; trying quant %d"
+		       (length attempt) quant))
+	  (setq done t)))
+      (if done
+	  (mm-with-unibyte-buffer	
+	    (insert attempt)
+	    (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))
+	nil))))
+
+;;;###autoload
+(defun gnus-convert-face-to-png (face)
+  (mm-with-unibyte-buffer
+    (insert face)
+    (base64-decode-region (point-min) (point-max))
+    (buffer-string)))
 
 (defun gnus-convert-image-to-gray-x-face (file depth)
-  (let* ((mapfile (make-temp-name (expand-file-name "gnus." mm-tmp-directory)))
+  (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)
@@ -74,8 +140,10 @@
 	(push (cons (* step i) i) color-alist)))
     (when (file-exists-p file)
       (with-temp-buffer
-	(insert (shell-command-to-string (format "giftopnm '%s' | ppmnorm 2>/dev/null | pnmscale -width 48 -height 48 | ppmquant -map %s 2>/dev/null | ppmtopgm | pnmtoplainpnm"
-			       file mapfile)))
+	(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))))
@@ -87,48 +155,59 @@
 	    (insert "P1\n48 48\n")
 	    (dolist (bits bits-list)
 	      (insert (if (zerop (logand bits mask)) "0 " "1 ")))
-	    (shell-command-on-region
+	    (gnus-shell-command-on-region
 	     (point-min) (point-max)
-	     "pbmtoxbm | compface"
-	     (current-buffer) t)
+	     ;; 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)))
 
-(defun gnus-convert-gray-x-face-to-ppm (faces)
+;;;###autoload
+(defun gnus-convert-gray-x-face-to-xpm (faces)
   (let* ((depth (length faces))
 	 (scale (/ 255 (1- (expt 2 depth))))
-	 bit-list bit-lists pixels pixel)
-    (dolist (face faces)
-      (with-temp-buffer
-	(insert face)
-	(shell-command-on-region
+	 (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)
-	 "uncompface -X | xbmtopbm | pnmtoplainpnm"
-	 (current-buffer) t)
+	 "pnmnoraw")
 	(goto-char (point-min))
 	(forward-line 2)
+	(setq start (point))
+	(insert "[")
 	(while (not (eobp))
-	  (cond
-	   ((eq (following-char) ?0)
-	    (push 0 bit-list))
-	   ((eq (following-char) ?1)
-	    (push 1 bit-list)))
-	  (forward-char 1)))
-      (push bit-list bit-lists))
-    (dotimes (i (* 48 48))
-      (setq pixel 0)
-      (dotimes (plane depth)
-	(setq pixel (+ (* pixel 2) (nth i (nth plane bit-lists)))))
-      (push pixel pixels))
-    (with-temp-buffer
-      (insert "P2\n48 48\n255\n")
-      (dolist (pixel pixels)
-	(insert (number-to-string (* scale pixel)) " "))
-      (buffer-string))))
+	  (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")
@@ -142,7 +221,74 @@
 	  (mail-header-narrow-to-field)
 	  (push (mail-header-field-value) faces)
 	  (goto-char (point-max)))))
-    (gnus-convert-gray-x-face-to-ppm faces)))
+    (gnus-convert-gray-x-face-to-xpm faces)))
+
+(defface gnus-x-face '((t (:foreground "black" :background "white")))
+  "Face to show X-Face.
+The colors from this face are used as the foreground and background
+colors of the displayed X-Faces."
+  :group 'gnus-article-headers)
+
+(defun gnus-display-x-face-in-from (data)
+  "Display the X-Face DATA in the From header."
+  (let ((default-enable-multibyte-characters nil)
+	pbm)
+    (when (or (gnus-image-type-available-p 'xface)
+	      (and (gnus-image-type-available-p 'pbm)
+		   (setq pbm (uncompface data))))
+      (save-excursion
+	(save-restriction
+	  (article-narrow-to-head)
+	  (gnus-article-goto-header "from")
+	  (when (bobp)
+	    (insert "From: [no `from' set]\n")
+	    (forward-char -17))
+	  (gnus-add-image
+	   'xface
+	   (gnus-put-image
+	    (if (gnus-image-type-available-p 'xface)
+		(gnus-create-image
+		 (concat "X-Face: " data)
+		 'xface t :ascent 'center :face 'gnus-x-face)
+	      (gnus-create-image
+	       pbm 'pbm t :ascent 'center :face 'gnus-x-face))))
+	  (gnus-add-wash-type 'xface))))))
+
+(defun gnus-grab-cam-x-face ()
+  "Grab a picture off the camera and make it into an X-Face."
+  (interactive)
+  (shell-command "xawtv-remote snap ppm")
+  (let ((file nil))
+    (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 110 -top 30 -width 144 -height 144 '%s' | ppmnorm 2>/dev/null | pnmscale -width 48 | ppmtopgm | pgmtopbm -threshold -value 0.92 | pbmtoxbm | compface"
+	       file)
+       (current-buffer))
+      ;;(sleep-for 3)
+      (delete-file file)
+      (buffer-string))))
+
+(defun gnus-grab-gray-x-face ()
+  "Grab a picture off the camera and make it into an X-Face."
+  (interactive)
+  (shell-command "xawtv-remote snap ppm")
+  (let ((file nil))
+    (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"))))
 
 (provide 'gnus-fun)