;;; 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.3 1996/04/26 04:20:52 morioka Exp $
;;;
;;; Keywords: mail, news, MIME, multimedia, image, picture
;;;
(require 'tm-view)
-(cond ((string-match "XEmacs" emacs-version)
+(cond (running-xemacs
(require 'xpm)
(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-image/inline)
+ (function mime-preview/filter-for-image)
+ ))
+
+ (set-alist 'mime-viewer/content-filter-alist
+ "image/gif"
+ (if (featurep 'gif) ; Use built-in suport if available
+ (function mime-preview/filter-for-image/inline)
+ (function mime-preview/filter-for-image)
+ ))
(set-alist 'mime-viewer/content-filter-alist
- "image/gif" (function mime-preview/filter-for-image))
+ "image/x-xpixmap"
+ (if (featurep 'xpm) ; Use built-in suport if available
+ (function mime-preview/filter-for-image/inline)
+ (function mime-preview/filter-for-image)
+ ))
(set-alist 'mime-viewer/content-filter-alist
"image/tiff" (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"))
-
+ "image/x-tiff" "image/x-pic" "image/x-mag"
+ "image/x-xbm" "image/x-xpixmap"))
+
(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)
+ ))
+
+ (defun image-read-file (ctype file)
+ (let ((minor (assoc-value ctype mime-viewer/image-converter-alist))
+ gl)
+ (while (progn
+ (setq gl (make-glyph (vector minor :file 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
- (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)
)))
+;;; @ content filter for support in-line image types
+;;;
+;; (for XEmacs 19.14 or later)
+
+(defun mime-preview/filter-for-image/inline (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))
+ (image-file (make-temp-name (expand-file-name "tm" mime/tmp-dir)))
+ )
+ (remove-text-properties beg end '(face nil))
+ (mime/decode-region encoding beg end)
+ (write-region (point-min)(point-max) image-file)
+ (delete-region (point-min)(point-max))
+ (image-read-file ctype image-file)
+ (delete-file image-file)
+ (insert "\n")
+ ))
+
+
;;; @ content filter for xbm
;;;
projects / elisp / tm.git / blobdiff