X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-image.el;h=7ec037e650cbad904b91626a2b84ceddd305d30c;hb=b77b17617ad6e2d752ffa07cc4232a54c6ebae81;hp=5f50a1845cc8330b6fb53b1bc86dd31be2c99588;hpb=70061cd3b20d164db66fed000c40db6fc6c2e34e;p=elisp%2Ftm.git

diff --git a/tm-image.el b/tm-image.el
index 5f50a18..7ec037e 100644
--- a/tm-image.el
+++ b/tm-image.el
@@ -1,273 +1,220 @@
-;;;
-;;; tm-image.el --- a tm-view content filter to display images in
-;;;                 XEmacs or Mule buffers
-;;;
-;;; Copyright (C) 1995,1996 MORIOKA Tomohiko
-;;;
-;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;;; Created: 1995/12/15
-;;; Version:
-;;;	$Id: tm-image.el,v 4.7 1996/02/23 21:58:10 morioka Exp $
-;;;
-;;; Keywords: mail, news, MIME, multimedia, image, picture
-;;;
-;;; This file is part of tm (Tools for MIME).
-;;;
-;;; This program is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU General Public License as
-;;; published by the Free Software Foundation; either version 2, or
-;;; (at your option) any later version.
-;;;
-;;; This program is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with This program.  If not, write to the Free Software
-;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-;;;
+;;; tm-image.el --- tm-view filter to display images in XEmacs or MULE buffers
+
+;; Copyright (C) 1995,1996,1997 MORIOKA Tomohiko
+;; Copyright (C) 1996 Dan Rich
+
+;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;;         Dan Rich <drich@morpheus.corp.sgi.com>
+;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Created: 1995/12/15
+;; Version: $Id: tm-image.el,v 7.29 1997/03/10 13:12:15 morioka Exp $
+
+;; Keywords: image, picture, X-Face, MIME, multimedia, mail, news
+
+;; This file is part of XEmacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU XEmacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
 ;;; Commentary:
-;;;   If you use this program with Mule, please install bitmap
-;;;   extension package. It is available from
-;;;	ftp://etlport.etl.go.jp/pub/mule/contrib/bitmap.tar.gz
-;;;
+;;	If you use this program with MULE, please install
+;;	etl8x16-bitmap.bdf font included in tl package.
+
 ;;; Code:
 
 (require 'tm-view)
 
-(cond ((string-match "XEmacs" emacs-version)
-       (require 'xpm)
-       (require 'annotations)
+(cond (running-xemacs
+       (require 'images)
        
-       (set-alist 'mime-viewer/content-filter-alist
-		  "image/jpeg" (function mime-preview/filter-for-image))
+       (defun-maybe image-inline-p (format)
+	 (or (memq format image-native-formats)
+	     (find-if (function
+		       (lambda (native)
+			 (image-converter-chain format native)
+			 ))
+		      image-native-formats)
+	     ))
        
-       (set-alist 'mime-viewer/content-filter-alist
-		  "image/gif" (function mime-preview/filter-for-image))
+       (image-register-netpbm-utilities)
+       (image-register-converter 'pic 'ppm "pictoppm")
+       (image-register-converter 'mag 'ppm "magtoppm")
        
-       (set-alist 'mime-viewer/content-filter-alist
-		  "image/tiff" (function mime-preview/filter-for-image))
-       (set-alist 'mime-viewer/content-filter-alist
-		  "image/x-tiff" (function mime-preview/filter-for-image))
+       (defun bitmap-insert-xbm-file (file)
+	 (let ((gl (make-glyph (list (cons 'x file))))
+	       (e (make-extent (point) (point)))
+	       )
+	   (set-extent-end-glyph e gl)
+	   ))
        
-       (set-alist 'mime-viewer/content-filter-alist
-		  "image/x-pic" (function mime-preview/filter-for-image))
+       ;;
+       ;; X-Face
+       ;;
+       (autoload 'highlight-headers "highlight-headers")
        
-       (set-alist 'mime-viewer/content-filter-alist
-		  "image/x-mag" (function mime-preview/filter-for-image))
+       (defun mime-preview/x-face-function-use-highlight-headers ()
+	 (highlight-headers (point-min) (re-search-forward "^$" nil t) t)
+	 )
+       
+       (add-hook 'mime-viewer/content-header-filter-hook
+		 'mime-preview/x-face-function-use-highlight-headers)
        
-       (defvar tm-image/inline-image-types
-	 '("image/jpeg" "image/gif" "image/tiff"
-	   "image/x-tiff" "image/x-pic" "image/x-mag" "image/x-xbm"))
-
-       (defun bitmap-read-xbm (file)
-	 (let (gl)
-	   (while (progn
-		    (setq gl (make-glyph file))
-		    (eq (image-instance-type (glyph-image-instance gl))
-			'text)
-		    ))
-	   (make-annotation gl (point) 'text)
-	   ))
-
-       (defvar mime-viewer/use-highlight-headers t)
-
-       (defvar mime-preview/x-face-function
-	 (if (and mime-viewer/use-highlight-headers
-		  (progn
-		    (require 'highlight-headers)
-		    highlight-headers-hack-x-face-p
-		    ))
-	     (function mime-preview/x-face-function-use-highlight-headers)
-	   (function mime-preview/x-face-function-for-xemacs)
-	   ))
        )
-      ((boundp 'MULE)
-       (require 'bitmap)
+      ((featurep 'mule)
+       ;; for MULE 2.* or mule merged EMACS
+       (require 'x-face-mule)
+
+       (defvar image-native-formats '(xbm))
+       
+       (defun-maybe image-inline-p (format)
+	 (memq format image-native-formats)
+	 )
        
-       (defvar tm-image/inline-image-types '("image/x-mag" "image/x-xbm"))
+       (defun-maybe image-normalize (format data)
+	 (and (eq format 'xbm)
+	      (vector 'xbm ':data data)
+	      ))
        
-       (defvar mime-preview/x-face-function
-	 (function mime-preview/x-face-function-for-mule))
+       ;;
+       ;; X-Face
+       ;;
+       (if (exec-installed-p uncompface-program)
+	   (add-hook 'mime-viewer/content-header-filter-hook
+		     'x-face-decode-message-header)
+	 )
        ))
 
-(defvar mime-viewer/shell-command "/bin/sh")
-(defvar mime-viewer/shell-arguments '("-c"))
-
-(defvar mime-viewer/graphic-converter-alist
-  '(("image/jpeg"   . "djpeg -color 256 < %s | ppmtoxpm > %s")
-    ("image/gif"    . "giftopnm < %s | ppmtoxpm > %s")
-    ("image/tiff"   . "tifftopnm < %s | ppmquant 256 | ppmtoxpm > %s")
-    ("image/x-tiff" . "tifftopnm < %s | ppmquant 256 | ppmtoxpm > %s")
-    ("image/x-pic"  . "pictoppm < %s | ppmquant 256 | ppmtoxpm > %s")
-    ("image/x-mag"  . "magtoppm < %s | ppmtoxpm > %s")
-    ))
+(or (fboundp 'image-invalid-glyph-p)
+    (defsubst image-invalid-glyph-p (glyph)
+      (or (null (aref glyph 0))
+	  (null (aref glyph 2))
+	  (equal (aref glyph 2) "")
+	  ))
+    )
 
-(defvar mime-viewer/x-face-to-xbm-command
-  (concat mime-viewer/x-face-to-pbm-command " | pbmtoxbm"))
+(defvar mime-viewer/image-converter-alist nil)
 
-(add-hook 'mime-viewer/content-header-filter-hook
-	  mime-preview/x-face-function)
-
-(defun mime-preview/x-face-function-use-highlight-headers ()
-  (highlight-headers (point-min) (re-search-forward "^$" nil t) t)
-  )
-
-(defun mime-preview/x-face-function-for-xemacs ()
-  (save-restriction
-    (narrow-to-region (point-min) (re-search-forward "^$" nil t))
-    (goto-char (point-min))
-    (if (re-search-forward "^X-Face:[ \t]*" nil t)
-	(let ((beg (match-end 0))
-	      (end (rfc822/field-end))
-	      (xbm-file
-	       (make-temp-name (expand-file-name "tmxf" mime/tmp-dir))
-	       ))
-	  (call-process-region
-	   beg end "sh" nil 0 nil
-	   "-c"
-	   (format "%s > %s"
-		   mime-viewer/x-face-to-xbm-command
-		   xbm-file))
-	  (while (not (file-exists-p xbm-file)))
-	  (delete-region beg end)
-	  (bitmap-read-xbm xbm-file)
-	  (condition-case nil
-	      (delete-file xbm-file)
-	    (error nil))
-	  ))))
-
-(defun mime-preview/x-face-function-for-mule ()
-  (save-restriction
-    (narrow-to-region (point-min) (re-search-forward "^$" nil t))
-    (goto-char (point-min))
-    (if (re-search-forward "^X-Face:[ \t]*" nil t)
-	(let ((p (match-beginning 0))
-	      (beg (match-end 0))
-	      (end (rfc822/field-end))
-	      (xbm-file
-	       (concat
-		(make-temp-name (expand-file-name "tmxf" mime/tmp-dir))
-		".xbm")
-	       ))
-	  (if (< end (point-max))
-	      (setq end (1+ end))
-	    )
-	  (while (progn
-		   (call-process-region
-		    beg end "sh" nil 0 nil
-		    "-c"
-		    (format "%s > %s"
-			    mime-viewer/x-face-to-xbm-command
-			    xbm-file))
-		   (not (file-exists-p xbm-file))
-		   ))
-	  (save-restriction
-	    (narrow-to-region p end)
-	    (delete-region p end)
-	    (goto-char p)
-	    (while (progn
-		     (condition-case nil
-			 (bitmap-read-xbm xbm-file)
-		       (error nil))
-		     (kill-buffer 
-		      (some-element
-		       (function
-			(lambda (buf)
-			  (string-equal (buffer-file-name buf) xbm-file)
-			  ))
-		       (buffer-list)))
-		     (= (point-min) (point-max))
-		     ))
-	    (goto-char p)
-	    (insert "X-Face: ")
-	    (while (re-search-forward "^." nil t)
-	      (goto-char (match-beginning 0))
-	      (insert "        ")
-	      ))
-	  (condition-case nil
-	      (delete-file xbm-file)
-	    (error nil))
-	  ))))
+(mapcar (function
+	 (lambda (rule)
+	   (let ((ctype  (car rule))
+		 (format (cdr rule))
+		 )
+	     (if (image-inline-p format)
+		 (progn
+		   (set-alist 'mime-viewer/content-filter-alist
+			      ctype
+			      (function mime-preview/filter-for-image))
+		   (set-alist 'mime-viewer/image-converter-alist
+			      ctype format)
+		   (add-to-list
+		    'mime-viewer/default-showing-Content-Type-list
+		    ctype)
+		   )
+	       ))))
+	'(("image/jpeg"			. jpeg)
+	  ("image/gif"			. gif)
+	  ("image/tiff"			. tiff)
+	  ("image/x-tiff"		. tiff)
+	  ("image/xbm"			. xbm)
+	  ("image/x-xbm"		. xbm)
+	  ("image/x-xpixmap"		. xpm)
+	  ("image/x-pic"		. pic)
+	  ("image/x-mag"		. mag)
+	  ))
+
+(defvar mime-viewer/ps-to-gif-command "pstogif")
 
 
 ;;; @ content filter for images
 ;;;
+;;    (for XEmacs 19.12 or later)
 
 (defun mime-preview/filter-for-image (ctype params encoding)
   (let* ((mode mime::preview/original-major-mode)
 	 (m (assq mode mime-viewer/code-converter-alist))
-	 (filter (assoc-value ctype mime-viewer/graphic-converter-alist))
+	 (charset (assoc "charset" params))
+	 (beg (point-min)) (end (point-max))
 	 )
-    (if filter
-	(let* ((beg (point-min)) (end (point-max))
-	       (orig-file
-		(make-temp-name (expand-file-name "tm" mime/tmp-dir)))
-	       (xbm-file (concat orig-file ".xbm"))
-	       gl annot)
-	  ;;(remove-text-properties beg end '(face nil))
-	  (mime/decode-region encoding beg end)
-	  (write-region (point-min)(point-max) orig-file)
-	  (delete-region (point-min)(point-max))
-	  (message "Now translating, please wait...")
-	  (apply (function call-process)
-		 mime-viewer/shell-command nil nil nil
-		 (append mime-viewer/shell-arguments
-			 (list (format filter orig-file xbm-file)))
-		 )
-	  (setq gl (make-glyph xbm-file))
-	  (setq annot (make-annotation gl (point) 'text))
-	  (unwind-protect
-	      (delete-file orig-file)
-	    (condition-case nil
-		(delete-file xbm-file)
-	      (error nil)))
-	  (goto-char (point-max))
-	  (insert "\n")
-	  (message "Translation done.")
-	  )
-      (message (format "%s is not supported." ctype))
-      )))
+    (remove-text-properties beg end '(face nil))
+    (message "Decoding image...")
+    (mime-decode-region beg end encoding)
+    (let* ((minor (assoc-value ctype mime-viewer/image-converter-alist))
+	   (gl (image-normalize minor (buffer-string)))
+	   e)
+      (delete-region (point-min)(point-max))
+      (cond ((image-invalid-glyph-p gl)
+	     (setq gl nil)
+	     (message "Invalid glyph!")
+	     )
+	    ((eq (aref gl 0) 'xbm)
+	     (let ((xbm-file
+		    (make-temp-name (expand-file-name "tm" mime/tmp-dir))))
+	       (insert (aref gl 2))
+	       (write-region (point-min)(point-max) xbm-file)
+	       (message "Decoding image...")
+	       (delete-region (point-min)(point-max))
+	       (bitmap-insert-xbm-file xbm-file)
+	       (delete-file xbm-file)
+	       )
+	     (message "Decoding image... done")
+	     )
+	    (t
+	     (setq gl (make-glyph gl))
+	     (setq e (make-extent (point) (point)))
+	     (set-extent-end-glyph e gl)
+	     (message "Decoding image... done")
+	     ))
+      )
+    (insert "\n")
+    ))
 
 
-;;; @ content filter for xbm
+;;; @ content filter for Postscript
 ;;;
+;;    (for XEmacs 19.14 or later)
 
-(defun mime-preview/filter-for-image/xbm (ctype params encoding)
+(defun mime-preview/filter-for-application/postscript (ctype params encoding)
   (let* ((mode mime::preview/original-major-mode)
 	 (m (assq mode mime-viewer/code-converter-alist))
-	 (charset (assoc "charset" params))
 	 (beg (point-min)) (end (point-max))
-	 (xbm-file (make-temp-name (expand-file-name "tm" mime/tmp-dir)))
+	 (file-base (make-temp-name (expand-file-name "tm" mime/tmp-dir)))
+	 (ps-file (concat file-base ".ps"))
+	 (gif-file (concat file-base ".gif"))
 	 )
     (remove-text-properties beg end '(face nil))
-    (mime/decode-region encoding beg end)
-    (write-region (point-min)(point-max) xbm-file)
+    (message "Decoding Postscript...")
+    (mime-decode-region beg end encoding)
+    (write-region (point-min)(point-max) ps-file) 
+    (message "Decoding Postscript...")
     (delete-region (point-min)(point-max))
-    (bitmap-read-xbm xbm-file)
-    (delete-file xbm-file)
+    (call-process mime-viewer/ps-to-gif-command nil nil nil ps-file)
+    (set-extent-end-glyph (make-extent (point) (point))
+			  (make-glyph (vector 'gif :file gif-file)))
+    (message "Decoding Postscript... done")
+    (delete-file ps-file)
+    (delete-file gif-file)
     ))
 
 (set-alist 'mime-viewer/content-filter-alist
-	   "image/xbm" (function mime-preview/filter-for-image/xbm))
+	   "application/postscript"
+	   (function mime-preview/filter-for-application/postscript))
 
-(set-alist 'mime-viewer/content-filter-alist
-	   "image/x-xbm" (function mime-preview/filter-for-image/xbm))
-
-
-;;; @ setting
-;;;
-
-(mapcar
- (lambda (ctype)
-   (or (member ctype mime-viewer/default-showing-Content-Type-list)
-       (setq mime-viewer/default-showing-Content-Type-list
-	     (cons ctype
-		   mime-viewer/default-showing-Content-Type-list))
-       ))
- tm-image/inline-image-types)
+(if (featurep 'gif)
+    (add-to-list 'mime-viewer/default-showing-Content-Type-list
+		 "application/postscript")
+  )
 
 
 ;;; @ end