;;; mime-view.el --- interactive MIME viewer for GNU Emacs
-;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
;; Created: 1994/7/13
;; Renamed: 1994/8/31 from tm-body.el
;; Renamed: 1997/02/19 from tm-view.el
-;; Version: $Revision: 0.108 $
;; Keywords: MIME, multimedia, mail, news
-;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
+;; This file is part of SEMI (Sophisticated Emacs MIME Interfaces).
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
;;; Code:
-(require 'cl)
(require 'std11)
(require 'mel)
(require 'eword-decode)
;;; @ version
;;;
-(defconst mime-view-RCS-ID
- "$Id: mime-view.el,v 0.108 1997-09-05 12:49:47 morioka Exp $")
-
-(defconst mime-view-version
- `,(get-version-string mime-view-RCS-ID))
-
-(defconst mime-view-version-name
- `,(concat "SEMI MIME-View " mime-view-version
- " (" semi-version-name ")"))
+(defconst mime-view-version-string
+ `,(concat "SEMI MIME-View "
+ (mapconcat #'number-to-string (cdr semi-version) ".")
+ " (" (car semi-version) ")"))
;;; @ variables
(mode . "play")
)
((type . "text/x-rot13-47")
- (method . mime-display-caesar)
+ (method . mime-method-to-display-caesar)
(mode . "play")
)
((type . "text/x-rot13-47-48")
- (method . mime-display-caesar)
+ (method . mime-method-to-display-caesar)
(mode . "play")
)
((type . "audio/basic")
(mode "play" "print")
)
((type . "application/octet-stream")
- (method "tm-file" nil 'file 'type 'encoding 'mode 'name)
- (mode "play" "print")
+ (method . mime-method-to-save)(mode "play" "print")
)
-
- ;;((type . "message/external-body")
- ;; (method "xterm" nil
- ;; "-e" "showexternal"
- ;; 'file '"access-type" '"name" '"site" '"directory"))
+
((type . "message/external-body")
("access-type" . "anon-ftp")
- (method . mime-display-message/external-ftp)
+ (method . mime-method-to-display-message/external-ftp)
)
((type . "message/rfc822")
- (method . mime-display-message/rfc822)
+ (method . mime-method-to-display-message/rfc822)
(mode . "play")
)
((type . "message/partial")
- (method . mime-display-message/partial)
+ (method . mime-method-to-store-message/partial)
(mode . "play")
)
((method "metamail" t "-m" "tm" "-x" "-d" "-z" "-e" 'file)
(mode . "play")
)
- ((method "tm-file" nil 'file 'type 'encoding 'mode 'name)
- (mode . "extract")
- )
+ ((method . mime-method-to-save)(mode . "extract"))
))
(defvar mime-view-childrens-header-showing-Content-Type-list
))
-;;; @@ predicate functions
-;;;
-
-(defun mime-view-header-visible-p (rcnum cinfo)
- "Return non-nil if header of current entity is visible."
- (or (null rcnum)
- (member (mime-entity-info-type/subtype
- (mime-article/rcnum-to-cinfo (cdr rcnum) cinfo))
- mime-view-childrens-header-showing-Content-Type-list)
- ))
-
-(defun mime-view-body-visible-p (rcnum cinfo &optional ctype)
- (let (ccinfo)
- (or ctype
- (setq ctype
- (mime-entity-info-type/subtype
- (setq ccinfo (mime-article/rcnum-to-cinfo rcnum cinfo))
- ))
- )
- (and (member ctype mime-view-visible-media-type-list)
- (if (string-equal ctype "application/octet-stream")
- (progn
- (or ccinfo
- (setq ccinfo (mime-article/rcnum-to-cinfo rcnum cinfo))
- )
- (member (mime-entity-info-encoding ccinfo)
- '(nil "7bit" "8bit"))
- )
- t))
- ))
-
-
;;; @@ entity button
;;;
-(defun mime-view-insert-entity-button (rcnum cinfo ctype params subj encoding)
+(defun mime-view-insert-entity-button (rcnum cinfo
+ media-type media-subtype params
+ subj encoding)
"Insert entity-button."
(mime-insert-button
(let ((access-type (assoc "access-type" params))
(concat
num " " subj
(let ((rest
- (concat " <" ctype
+ (format " <%s/%s%s%s>"
+ media-type media-subtype
(if charset
(concat "; " charset)
- (if encoding (concat " (" encoding ")"))
- )
- ">")))
+ "")
+ (if encoding
+ (concat " (" encoding ")")
+ ""))))
(if (>= (+ (current-column)(length rest))(window-width))
"\n\t")
rest)))
(function mime-view-play-current-entity))
)
-(defun mime-view-entity-button-function
- (rcnum cinfo ctype params subj encoding)
+(defun mime-view-entity-button-function (rcnum cinfo
+ media-type media-subtype
+ params subj encoding)
"Insert entity button conditionally.
Please redefine this function if you want to change default setting."
(or (null rcnum)
- (string= ctype "application/x-selection")
- (and (string= ctype "application/octet-stream")
- (let ((entity-info
- (mime-article/rcnum-to-cinfo (cdr rcnum) cinfo)))
- (and (eq (mime-entity-info-media-type entity-info)
- 'multipart)
- (eq (mime-entity-info-media-subtype entity-info)
- 'encrypted)
- )))
- (mime-view-insert-entity-button rcnum cinfo ctype params subj encoding)
+ (and (eq media-type 'application)
+ (or (eq media-subtype 'x-selection)
+ (and (eq media-subtype 'octet-stream)
+ (let ((entity-info
+ (mime-article/rcnum-to-cinfo (cdr rcnum) cinfo)))
+ (and (eq (mime-entity-info-media-type entity-info)
+ 'multipart)
+ (eq (mime-entity-info-media-subtype entity-info)
+ 'encrypted)
+ )))))
+ (mime-view-insert-entity-button
+ rcnum cinfo media-type media-subtype params subj encoding)
))
(end (match-end 0))
(name (buffer-substring beg end))
)
- (or (member-if (function
- (lambda (regexp)
- (string-match regexp name)
- )) mime-view-visible-field-list)
- (delete-region beg
- (save-excursion
- (if (re-search-forward "^\\([^ \t]\\|$\\)" nil t)
- (match-beginning 0)
- (point-max))))
- ))))
+ (catch 'visible
+ (let ((rest mime-view-visible-field-list))
+ (while rest
+ (if (string-match (car rest) name)
+ (throw 'visible nil)
+ )
+ (setq rest (cdr rest))))
+ (delete-region beg
+ (save-excursion
+ (if (re-search-forward "^\\([^ \t]\\|$\\)" nil t)
+ (match-beginning 0)
+ (point-max))))
+ ))))
(defun mime-view-default-content-header-filter ()
(mime-view-cut-header)
;;; @@ entity separator
;;;
-(defun mime-view-entity-separator-function (rcnum cinfo ctype params subj)
+(defun mime-view-entity-separator-function (rcnum cinfo
+ media-type media-subtype
+ params subj)
"Insert entity separator conditionally.
Please redefine this function if you want to change default setting."
(or (mime-view-header-visible-p rcnum cinfo)
- (mime-view-body-visible-p rcnum cinfo ctype)
+ (mime-view-body-visible-p rcnum cinfo media-type media-subtype)
(progn
(goto-char (point-max))
(insert "\n")
;;; @@@ in raw buffer
;;;
-(defvar mime::article/content-info
+(defvar mime-raw-content-info
"Information about structure of message.
Please use reference function `mime::content-info/SLOT-NAME' to
reference slot of content-info. Their argument is only content-info.
If a entity includes other entities in its body, such as multipart or
message/rfc822, content-infos of other entities are included in
`children', so content-info become a tree.")
-(make-variable-buffer-local 'mime::article/content-info)
+(make-variable-buffer-local 'mime-raw-content-info)
(defvar mime-view-buffer nil
"MIME View buffer corresponding with the (raw) buffer.")
(set-buffer ibuf)
))
(or mime-view-redisplay
- (setq mime::article/content-info (mime-parse-message ctl encoding))
+ (setq mime-raw-content-info (mime-parse-message ctl encoding))
)
- (let* ((cinfo mime::article/content-info)
+ (let* ((cinfo mime-raw-content-info)
(pcl (mime/flatten-content-info cinfo))
(the-buf (current-buffer))
(mode major-mode)
(set-buffer obuf)
(setq nb (point))
(narrow-to-region nb nb)
- (mime-view-entity-button-function rcnum cinfo ctype params subj encoding)
+ (mime-view-entity-button-function
+ rcnum cinfo media-type media-subtype params subj encoding)
(if (mime-view-header-visible-p rcnum cinfo)
(mime-view-display-header beg he)
)
(save-excursion
(goto-char (point-max))
(mime-view-insert-entity-button
- rcnum cinfo ctype params subj encoding)
+ rcnum cinfo media-type media-subtype params subj encoding)
))
- (cond ((mime-view-body-visible-p rcnum cinfo ctype)
+ (cond ((mime-view-body-visible-p rcnum cinfo media-type media-subtype)
(mime-view-display-body he end
rcnum cinfo ctype params subj encoding)
)
- ((equal ctype "message/partial")
+ ((and (eq media-type 'message)(eq media-subtype 'partial))
(mime-view-insert-message/partial-button)
)
((and (null rcnum)
)
(goto-char (point-max))
(mime-view-insert-entity-button
- rcnum cinfo ctype params subj encoding)
+ rcnum cinfo media-type media-subtype params subj encoding)
))
- (mime-view-entity-separator-function rcnum cinfo ctype params subj)
+ (mime-view-entity-separator-function
+ rcnum cinfo media-type media-subtype params subj)
(setq ne (point-max))
(widen)
(put-text-property nb ne 'mime-view-raw-buffer ibuf)
""))
-;;; @ content information
+;;; @ entity information
;;;
(defun mime-article/point-content-number (p &optional cinfo)
(or cinfo
- (setq cinfo mime::article/content-info)
+ (setq cinfo mime-raw-content-info)
)
(let ((b (mime-entity-info-point-min cinfo))
(e (mime-entity-info-point-max cinfo))
)))
t))))
-(defun mime-article/rcnum-to-cinfo (rcnum &optional cinfo)
- (or cinfo
- (setq cinfo mime::article/content-info)
- )
- (find-if (function
- (lambda (ci)
- (equal (mime-entity-info-rnum ci) rcnum)
- ))
- (mime/flatten-content-info cinfo)
- ))
+(defsubst mime-article/rcnum-to-cinfo (rnum &optional cinfo)
+ (mime-article/cnum-to-cinfo (reverse rnum) cinfo)
+ )
(defun mime-article/cnum-to-cinfo (cn &optional cinfo)
(or cinfo
- (setq cinfo mime::article/content-info)
+ (setq cinfo mime-raw-content-info)
)
(if (eq cn t)
cinfo
(defun mime/flatten-content-info (&optional cinfo)
(or cinfo
- (setq cinfo mime::article/content-info)
+ (setq cinfo mime-raw-content-info)
)
(let ((dest (list cinfo))
(rcl (mime-entity-info-children cinfo))
dest))
+;;; @@ predicate functions
+;;;
+
+(defun mime-view-header-visible-p (rcnum cinfo)
+ "Return non-nil if header of current entity is visible."
+ (or (null rcnum)
+ (member (mime-entity-info-type/subtype
+ (mime-article/rcnum-to-cinfo (cdr rcnum) cinfo))
+ mime-view-childrens-header-showing-Content-Type-list)
+ ))
+
+(defun mime-view-body-visible-p (rcnum cinfo media-type media-subtype)
+ (let ((ctype (if media-type
+ (if media-subtype
+ (format "%s/%s" media-type media-subtype)
+ (symbol-name media-type)
+ ))))
+ (and (member ctype mime-view-visible-media-type-list)
+ (if (and (eq media-type 'application)
+ (eq media-subtype 'octet-stream))
+ (let ((ccinfo (mime-article/rcnum-to-cinfo rcnum cinfo)))
+ (member (mime-entity-info-encoding ccinfo)
+ '(nil "7bit" "8bit"))
+ )
+ t))
+ ))
+
+
;;; @ MIME viewer mode
;;;
(run-hooks 'mime-view-define-keymap-hook)
))
-(defsubst mime-hide-echo-buffer ()
- "Hide mime-echo buffer."
- (let ((win (get-buffer-window mime-echo-buffer-name)))
- (if win
- (delete-window win)
- )))
+(defsubst mime-maybe-hide-echo-buffer ()
+ "Clear mime-echo buffer and delete window for it."
+ (let ((buf (get-buffer mime-echo-buffer-name)))
+ (if buf
+ (save-excursion
+ (set-buffer buf)
+ (erase-buffer)
+ (let ((win (get-buffer-window buf)))
+ (if win
+ (delete-window win)
+ ))
+ (bury-buffer buf)
+ ))))
(defun mime-view-mode (&optional mother ctl encoding ibuf obuf
default-keymap-or-function)
and decode current content as `play mode'
"
(interactive)
- (let ((buf (get-buffer mime-echo-buffer-name)))
- (if buf
- (save-excursion
- (set-buffer buf)
- (erase-buffer)
- (mime-hide-echo-buffer)
- )))
+ (mime-maybe-hide-echo-buffer)
(let ((ret (mime-view-setup-buffers ctl encoding ibuf obuf))
(win-conf (current-window-configuration))
)
(concat "^"
(apply (function regexp-or) fields)
":") ""))))
- (if (string= (mime-entity-info-type/subtype ci)
- "message/rfc822")
+ (if (and
+ (eq (mime-entity-info-media-type ci) 'message)
+ (eq (mime-entity-info-media-subtype ci) 'rfc822))
nil
(if str
(insert str)
projects / elisp / semi.git / blobdiff