-;;;
-;;; tm-image.el --- a tm-view content filter to display images in
-;;; 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 7.8 1996/06/12 05:22:11 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 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.15 1996/09/17 04:38:00 morioka Exp $
+
+;; Keywords: mail, news, MIME, multimedia, image, picture, X-Face
+
+;; 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; 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 (running-xemacs
- (require 'xpm)
(require 'annotations)
(set-alist 'mime-viewer/content-filter-alist
)
)))
- (defun bitmap-read-xbm (file)
+ (defun bitmap-insert-xbm-file (file)
(let (gl)
(while (progn
(setq gl (make-glyph file))
("image/x-xpixmap" . xpm)
))
- (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)
- ))
+ (function mime-preview/x-face-function-use-highlight-headers))
+
+ (autoload 'highlight-headers "highlight-headers")
+
+ (defun mime-preview/x-face-function-use-highlight-headers ()
+ (highlight-headers (point-min) (re-search-forward "^$" nil t) t)
+ )
)
- ((boundp 'MULE)
- (require 'bitmap)
+ ((featurep 'mule)
+ ;; for MULE 2.* or mule merged EMACS
+ (require 'x-face-mule)
(defvar tm-image/inline-image-types '("image/x-mag" "image/x-xbm"))
- (defvar mime-preview/x-face-function (function bitmap-decode-x-face))
+ (defvar mime-preview/x-face-function
+ (function x-face-decode-message-header))
))
(defvar mime-viewer/shell-command "/bin/sh")
(defvar mime-viewer/shell-arguments '("-c"))
+(defvar mime-viewer/ps-to-gif-command "pstogif")
+
(defvar mime-viewer/graphic-converter-alist
'(("image/jpeg" . "djpeg -color 256 < %s | ppmtoxpm > %s")
("image/gif" . "giftopnm < %s | ppmtoxpm > %s")
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))
- ))))
-
;;; @ content filter for images
;;;
(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)
+ (bitmap-insert-xbm-file xbm-file)
(delete-file xbm-file)
))
(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)
+ (call-process mime-viewer/ps-to-gif-command nil nil nil ps-file)
(let (gl)
(while (progn
(setq gl (make-glyph (vector 'gif :file gif-file)))