From: yamaoka <yamaoka>
Date: Tue, 17 Feb 2004 05:58:46 +0000 (+0000)
Subject: Synch to No Gnus 200402170557.
X-Git-Tag: t-gnus-6_17_4-quimby-~1068
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=5035bc4f82ae7ed5191abc62fa0b17f1d36793ff;p=elisp%2Fgnus.git-

Synch to No Gnus 200402170557.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 899ec20..a8ff4db 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2004-02-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* compface.el (uncompface-use-external): Default to undecided.
+	(uncompface-use-external-threshold): New variable.
+	(uncompface-float-time): New macro.
+	(uncompface): Determine whether to use the external decoder if
+	uncompface-use-external is undecided.
+
 2004-02-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* mm-view.el (mm-inline-image-emacs): Don't insert blank lines
diff --git a/lisp/compface.el b/lisp/compface.el
index 0c4c4b2..f04b6ba 100644
--- a/lisp/compface.el
+++ b/lisp/compface.el
@@ -30,42 +30,87 @@
   "X-Face image conversion."
   :group 'extensions)
 
-(defcustom uncompface-use-external nil
-  "*nil means use the internal ELisp-based uncompface program.
-If you aren't satisfied with the speed, try to alter the value.  In
-that case, you need to have the external `uncompface' and `icontopbm'
-programs installed."
-  :type 'boolean
+(defcustom uncompface-use-external (and (not noninteractive)
+					(executable-find "uncompface")
+					(executable-find "icontopbm")
+					'undecided)
+  "*Specify which of the internal or the external decoder should be used.
+nil means to use the internal ELisp-based uncompface program.  t means
+to use the external decoder.  In the later case, you need to have the
+external `uncompface' and `icontopbm' programs installed.  The default
+value is nil if those external programs aren't available, otherwise
+`undecided' which means to determine it by checking whether the host
+machine is slow.  See also `uncompface-use-external-threshold'.  You
+can skip that check by setting this value as nil or t explicitly."
+  :type '(choice (const :tag "Use the internal decoder" nil)
+		 (const :tag "Use the external decoder" t)
+		 (const :tag "Autodetection" undecided))
   :group 'compface)
 
+(defcustom uncompface-use-external-threshold 0.1
+  "*Number of seconds to check whether the host machine is slow.
+If the host takes time larger than this value for decoding an X-Face
+using the internal ELisp-based uncompface program, it will be changed
+to using the external `uncompface' and `icontopbm' programs if they
+are available.  Note that the measurement may never be exact."
+  :type 'number
+  :group 'compface)
+
+(eval-when-compile
+  (defmacro uncompface-float-time (&optional specified-time)
+    (if (fboundp 'float-time)
+	`(float-time ,specified-time)
+      `(let ((time (or ,specified-time (current-time))))
+	 (+ (* (car time) 65536.0)
+	    (cadr time)
+	    (cond ((consp (setq time (cddr time)))
+		   (/ (car time) 1000000.0))
+		  (time
+		   (/ time 1000000.0))
+		  (t
+		   0)))))))
+
 (defun uncompface (face)
   "Convert FACE to pbm.
 If `uncompface-use-external' is non-nil, it requires the external
 programs `uncompface', and `icontopbm'.  On a GNU/Linux system these
 might be in packages with names like `compface' or `faces-xface' and
 `netpbm' or `libgr-progs', for instance."
-  (if uncompface-use-external
-      (with-temp-buffer
-	(insert face)
-	(and (eq 0 (apply 'call-process-region (point-min) (point-max)
-			  "uncompface"
-			  'delete '(t nil) nil))
-	     (progn
-	       (goto-char (point-min))
-	       (insert "/* Width=48, Height=48 */\n")
-	       ;; I just can't get "icontopbm" to work correctly on its
-	       ;; own in XEmacs.  And Emacs doesn't understand un-raw pbm
-	       ;; files.
-	       (if (not (featurep 'xemacs))
-		   (eq 0 (call-process-region (point-min) (point-max)
-					      "icontopbm"
-					      'delete '(t nil)))
-		 (shell-command-on-region (point-min) (point-max)
-					  "icontopbm | pnmnoraw"
-					  (current-buffer) t)
-		 t))
-	     (buffer-string)))
-    (uncompface-internal face)))
+  (cond ((eq uncompface-use-external nil)
+	 (uncompface-internal face))
+	((eq uncompface-use-external t)
+	 (with-temp-buffer
+	   (insert face)
+	   (and (eq 0 (apply 'call-process-region (point-min) (point-max)
+			     "uncompface"
+			     'delete '(t nil) nil))
+		(progn
+		  (goto-char (point-min))
+		  (insert "/* Width=48, Height=48 */\n")
+		  ;; I just can't get "icontopbm" to work correctly on its
+		  ;; own in XEmacs.  And Emacs doesn't understand un-raw pbm
+		  ;; files.
+		  (if (not (featurep 'xemacs))
+		      (eq 0 (call-process-region (point-min) (point-max)
+						 "icontopbm"
+						 'delete '(t nil)))
+		    (shell-command-on-region (point-min) (point-max)
+					     "icontopbm | pnmnoraw"
+					     (current-buffer) t)
+		    t))
+		(buffer-string))))
+	(t
+	 (let* ((gc-cons-threshold (eval '(lsh -1 -1)))
+		(start (current-time)))
+	   (prog1
+	       (uncompface-internal face)
+	     (setq uncompface-use-external
+		   (and (> (- (uncompface-float-time (current-time))
+			      (uncompface-float-time start))
+			   uncompface-use-external-threshold)
+			(executable-find "uncompface")
+			(executable-find "icontopbm")
+			t)))))))
 
 ;; The following section is a bug-for-bug compatible version of
 ;; `uncompface' program entirely implemented in Emacs-Lisp.