tm 7.70.
[elisp/tm.git] / tm-image.el
index 4772248..7dc7228 100644 (file)
@@ -3,12 +3,14 @@
 ;;;                 XEmacs or Mule buffers
 ;;;
 ;;; Copyright (C) 1995,1996 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 4.6 1996/02/13 17:56:43 morioka Exp $
+;;;    $Id: tm-image.el,v 7.9 1996/07/08 05:44:22 morioka Exp $
 ;;;
 ;;; Keywords: mail, news, MIME, multimedia, image, picture
 ;;;
 ;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, 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)
+(cond (running-xemacs
        (require 'annotations)
        
        (set-alist 'mime-viewer/content-filter-alist
-                 "image/jpeg" (function mime-preview/filter-for-image))
+                 "image/jpeg"
+                 (if (featurep 'jpeg) ; Use built-in suport if available
+                     (function mime-preview/filter-for-inline-image)
+                   (function mime-preview/filter-for-image)
+                   ))
        
        (set-alist 'mime-viewer/content-filter-alist
-                 "image/gif" (function mime-preview/filter-for-image))
+                 "image/gif"
+                 (if (featurep 'gif) ; Use built-in suport if available
+                     (function mime-preview/filter-for-inline-image)
+                   (function mime-preview/filter-for-image)
+                   ))
+       
+       (set-alist 'mime-viewer/content-filter-alist
+                 "image/x-xpixmap"
+                 (if (featurep 'xpm) ; Use built-in suport if available
+                     (function mime-preview/filter-for-inline-image)
+                   (function mime-preview/filter-for-image)
+                   ))
        
        (set-alist 'mime-viewer/content-filter-alist
                  "image/tiff" (function mime-preview/filter-for-image))
                  "image/x-mag" (function mime-preview/filter-for-image))
        
        (defvar tm-image/inline-image-types
-        '("image/jpeg" "image/gif" "image/tiff"
-          "image/x-tiff" "image/x-pic" "image/x-mag" "image/x-xbm"))
-
+        (if (featurep 'gif)
+            (nconc
+             '("image/jpeg" "image/gif" "image/tiff"
+               "image/x-tiff" "image/x-pic" "image/x-mag"
+               "image/x-xbm" "image/x-xpixmap")
+             (if (featurep 'gif)
+                 '("application/postscript")
+               )
+             )))
+       
        (defun bitmap-read-xbm (file)
         (let (gl)
           (while (progn
           (make-annotation gl (point) 'text)
           ))
        
+       (defvar mime-viewer/image-converter-alist
+        '(("image/jpeg"      . jpeg)
+          ("image/gif"       . gif)
+          ("image/x-png"     . png)
+          ("image/x-xpixmap" . xpm)
+          ))
+       
+       (defvar mime-viewer/use-highlight-headers t)
+
        (defvar mime-preview/x-face-function
-        (function mime-preview/x-face-function-for-xemacs))
+        (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)
        
        (defvar tm-image/inline-image-types '("image/x-mag" "image/x-xbm"))
        
-       (defvar mime-preview/x-face-function
-        (function mime-preview/x-face-function-for-mule))
+       (defvar mime-preview/x-face-function (function bitmap-decode-x-face))
        ))
 
 (defvar mime-viewer/shell-command "/bin/sh")
     ("image/x-mag"  . "magtoppm < %s | ppmtoxpm > %s")
     ))
 
+
+;;; @ X-Face
+;;;
+
 (defvar mime-viewer/x-face-to-xbm-command
   (concat mime-viewer/x-face-to-pbm-command " | pbmtoxbm"))
 
-(add-hook 'mime-viewer/content-header-filter-hook
-         mime-preview/x-face-function)
+(if mime-preview/x-face-function
+    (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
            (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))
-         ))))
-
 
 ;;; @ 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)
               (xbm-file (concat orig-file ".xbm"))
               gl annot)
          ;;(remove-text-properties beg end '(face nil))
-         (mime/decode-region encoding beg end)
+         (mime-decode-region beg end encoding)
          (write-region (point-min)(point-max) orig-file)
          (delete-region (point-min)(point-max))
          (message "Now translating, please wait...")
         (xbm-file (make-temp-name (expand-file-name "tm" mime/tmp-dir)))
         )
     (remove-text-properties beg end '(face nil))
-    (mime/decode-region encoding beg end)
+    (mime-decode-region beg end encoding)
     (write-region (point-min)(point-max) xbm-file)
     (delete-region (point-min)(point-max))
     (bitmap-read-xbm xbm-file)
           "image/x-xbm" (function mime-preview/filter-for-image/xbm))
 
 
+;;; @ content filter for support in-line image types
+;;;
+;;    (for XEmacs 19.14 or later)
+
+(defun mime-preview/filter-for-inline-image (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))
+        )
+    (remove-text-properties beg end '(face nil))
+    (mime-decode-region beg end encoding)
+    (let ((data (buffer-string))
+         (minor (assoc-value ctype mime-viewer/image-converter-alist))
+         gl)
+      (delete-region (point-min)(point-max))
+      (while (progn
+              (setq gl (make-glyph (vector minor :data data)))
+              (eq (image-instance-type (glyph-image-instance gl))
+                  'text)
+              ))
+      (make-annotation gl (point) 'text)
+      )
+    (insert "\n")
+    ))
+
+
+;;; @ content filter for Postscript
+;;;
+;;    (for XEmacs 19.14 or later)
+
+(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))
+        (beg (point-min)) (end (point-max))
+        (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 beg end encoding)
+    (write-region (point-min)(point-max) ps-file) 
+    (delete-region (point-min)(point-max))
+    (call-process "pstogif" nil nil nil ps-file)
+    (let (gl)
+      (while (progn
+              (setq gl (make-glyph (vector 'gif :file gif-file)))
+              (eq (image-instance-type (glyph-image-instance gl))
+                  'text)
+              ))
+      (make-annotation gl (point) 'text)
+      )
+    (delete-file ps-file)
+    (delete-file gif-file)
+    ))
+
+(set-alist 'mime-viewer/content-filter-alist
+          "application/postscript"
+          (function mime-preview/filter-for-application/postscript))
+
+
 ;;; @ setting
 ;;;