updated.

[elisp/semi.git] / mime-view.el

diff --git a/mime-view.el b/mime-view.el
index f7c8245..41264b4 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -6,7 +6,7 @@
 ;; Created: 1994/7/13
 ;;     Renamed: 1994/8/31 from tm-body.el
 ;;     Renamed: 1997/02/19 from tm-view.el
-;; Version: $Revision: 0.96 $
+;; Version: $Revision: 0.112 $
 ;; Keywords: MIME, multimedia, mail, news
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -40,7 +40,7 @@
 ;;;
 
 (defconst mime-view-RCS-ID
-  "$Id: mime-view.el,v 0.96 1997-07-03 11:58:50 morioka Exp $")
+  "$Id: mime-view.el,v 0.112 1997-09-05 16:56:00 morioka Exp $")
 
 (defconst mime-view-version
   `,(get-version-string mime-view-RCS-ID))
@@ -131,7 +131,7 @@
      (method . mime-display-message/external-ftp)
      )
     ((type . "message/rfc822")
-     (method . mime-article/view-message/rfc822)
+     (method . mime-display-message/rfc822)
      (mode . "play")
      )
     ((type . "message/partial")
@@ -204,26 +204,22 @@ Each elements are regexp of field-name.")
 (defun mime-view-header-visible-p (rcnum cinfo)
   "Return non-nil if header of current entity is visible."
   (or (null rcnum)
-      (member (mime::content-info/type
+      (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::content-info/type
-              (setq ccinfo (mime-article/rcnum-to-cinfo rcnum cinfo))
-              ))
-       )
+(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 (string-equal ctype "application/octet-stream")
-            (progn
-              (or ccinfo
-                  (setq ccinfo (mime-article/rcnum-to-cinfo rcnum cinfo))
-                  )
-              (member (mime::content-info/encoding ccinfo)
+        (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))
@@ -233,7 +229,9 @@ Each elements are regexp of field-name.")
 ;;; @@ 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))
@@ -264,12 +262,14 @@ Each elements are regexp of field-name.")
              (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)))
@@ -277,24 +277,31 @@ Each elements are regexp of field-name.")
    (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")
-          (string= (mime::content-info/type
-                    (mime-article/rcnum-to-cinfo (cdr rcnum) cinfo))
-                   "multipart/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)
       ))
 
 
 ;;; @@ content header filter
 ;;;
 
-(defsubst mime-view-cut-header ()
+(defun mime-view-cut-header ()
   (goto-char (point-min))
   (while (re-search-forward mime-view-ignored-field-regexp nil t)
     (let* ((beg (match-beginning 0))
@@ -337,11 +344,13 @@ function.  t means default media-type.")
 ;;; @@ 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")
@@ -498,12 +507,18 @@ The compressed face will be piped to this command.")
 
 (defun mime-view-display-entity (content cinfo ibuf obuf)
   "Display entity from content-info CONTENT."
-  (let* ((beg (mime::content-info/point-min content))
-        (end (mime::content-info/point-max content))
-        (ctype (mime::content-info/type content))
-        (params (mime::content-info/parameters content))
-        (encoding (mime::content-info/encoding content))
-        (rcnum (mime::content-info/rcnum content))
+  (let* ((beg (mime-entity-info-point-min content))
+        (end (mime-entity-info-point-max content))
+        (media-type (mime-entity-info-media-type content))
+        (media-subtype (mime-entity-info-media-subtype content))
+        (ctype (if media-type
+                   (if media-subtype
+                       (format "%s/%s" media-type media-subtype)
+                     (symbol-name media-type)
+                     )))
+        (params (mime-entity-info-parameters content))
+        (encoding (mime-entity-info-encoding content))
+        (rcnum (mime-entity-info-rnum content))
         he e nb ne subj)
     (set-buffer ibuf)
     (goto-char beg)
@@ -522,9 +537,10 @@ The compressed face will be piped to this command.")
     (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-preview/display-header beg he)
+       (mime-view-display-header beg he)
       )
     (if (and (null rcnum)
             (member
@@ -532,23 +548,24 @@ The compressed face will be piped to this command.")
        (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)
-          (mime-preview/display-body he end
+    (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)
-               (null (mime::content-info/children cinfo))
+               (null (mime-entity-info-children cinfo))
                )
           (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)
@@ -556,7 +573,7 @@ The compressed face will be piped to this command.")
     (goto-char ne)
     ))
 
-(defun mime-preview/display-header (beg end)
+(defun mime-view-display-header (beg end)
   (save-restriction
     (narrow-to-region (point)(point))
     (insert-buffer-substring mime-raw-buffer beg end)
@@ -569,8 +586,7 @@ The compressed face will be piped to this command.")
     (run-hooks 'mime-view-content-header-filter-hook)
     ))
 
-(defun mime-preview/display-body (beg end
-                                     rcnum cinfo ctype params subj encoding)
+(defun mime-view-display-body (beg end rcnum cinfo ctype params subj encoding)
   (save-restriction
     (narrow-to-region (point-max)(point-max))
     (insert-buffer-substring mime-raw-buffer beg end)
@@ -629,9 +645,9 @@ The compressed face will be piped to this command.")
   (or cinfo
       (setq cinfo mime::article/content-info)
       )
-  (let ((b (mime::content-info/point-min cinfo))
-       (e (mime::content-info/point-max cinfo))
-       (c (mime::content-info/children cinfo))
+  (let ((b (mime-entity-info-point-min cinfo))
+       (e (mime-entity-info-point-max cinfo))
+       (c (mime-entity-info-children cinfo))
        )
     (if (and (<= b p)(<= p e))
        (or (let (co ret (sn 0))
@@ -653,7 +669,7 @@ The compressed face will be piped to this command.")
       )
   (find-if (function
            (lambda (ci)
-             (equal (mime::content-info/rcnum ci) rcnum)
+             (equal (mime-entity-info-rnum ci) rcnum)
              ))
           (mime/flatten-content-info cinfo)
           ))
@@ -667,7 +683,7 @@ The compressed face will be piped to this command.")
     (let ((sn (car cn)))
       (if (null sn)
          cinfo
-       (let ((rc (nth sn (mime::content-info/children cinfo))))
+       (let ((rc (nth sn (mime-entity-info-children cinfo))))
          (if rc
              (mime-article/cnum-to-cinfo (cdr cn) rc)
            ))
@@ -678,7 +694,7 @@ The compressed face will be piped to this command.")
       (setq cinfo mime::article/content-info)
       )
   (let ((dest (list cinfo))
-       (rcl (mime::content-info/children cinfo))
+       (rcl (mime-entity-info-children cinfo))
        )
     (while rcl
       (setq dest (nconc dest (mime/flatten-content-info (car rcl))))
@@ -920,7 +936,7 @@ It calls following-method selected from variable
       )
     (let* ((p-beg (previous-single-property-change (point) 'mime-view-cinfo))
           p-end
-          (rcnum (mime::content-info/rcnum cinfo))
+          (rcnum (mime-entity-info-rnum cinfo))
           (len (length rcnum))
           )
       (cond ((null p-beg)
@@ -951,7 +967,7 @@ It calls following-method selected from variable
                                (next-single-property-change
                                 (point) 'mime-view-cinfo))
                     (goto-char e)
-                    (let ((rc (mime::content-info/rcnum
+                    (let ((rc (mime-entity-info-rnum
                                (get-text-property (point)
                                                   'mime-view-cinfo))))
                       (or (equal rcnum (nthcdr (- (length rc) len) rc))
@@ -982,7 +998,7 @@ It calls following-method selected from variable
          (goto-char (point-min))
          (insert "\n")
          (goto-char (point-min))
-         (let ((rcnum (mime::content-info/rcnum cinfo)) ci str)
+         (let ((rcnum (mime-entity-info-rnum cinfo)) ci str)
            (while (progn
                     (setq str
                           (save-excursion
@@ -990,15 +1006,16 @@ It calls following-method selected from variable
                             (setq ci (mime-article/rcnum-to-cinfo rcnum))
                             (save-restriction
                               (narrow-to-region
-                               (mime::content-info/point-min ci)
-                               (mime::content-info/point-max ci)
+                               (mime-entity-info-point-min ci)
+                               (mime-entity-info-point-max ci)
                                )
                               (std11-header-string-except
                                (concat "^"
                                        (apply (function regexp-or) fields)
                                        ":") ""))))
-                    (if (string= (mime::content-info/type 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)
@@ -1062,7 +1079,7 @@ If there is no upper entity, call function `mime-view-quit'."
       (backward-char)
       )
     (let ((r (mime-article/rcnum-to-cinfo
-             (cdr (mime::content-info/rcnum cinfo))
+             (cdr (mime-entity-info-rnum cinfo))
              (get-text-property 1 'mime-view-cinfo)))
          point)
       (catch 'tag