(mime-preview-condition): Specify 'childrens-situation field for
[elisp/semi.git] / mime-view.el
index 2cd9ffe..82dbe45 100644 (file)
@@ -3,8 +3,8 @@
 ;; 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
+;; Created: 1994/07/13
+;;     Renamed: 1994/08/31 from tm-body.el
 ;;     Renamed: 1997/02/19 from tm-view.el
 ;; Keywords: MIME, multimedia, mail, news
 
@@ -31,6 +31,7 @@
 (require 'mel)
 (require 'eword-decode)
 (require 'mime-parse)
+(require 'semi-def)
 (require 'calist)
 
 
@@ -38,9 +39,9 @@
 ;;;
 
 (defconst mime-view-version-string
-  `,(concat "SEMI MIME-View "
-           (mapconcat #'number-to-string (cdr semi-version) ".")
-           " (" (car semi-version) ")"))
+  `,(concat (car mime-module-version) " MIME-View "
+           (mapconcat #'number-to-string (cddr mime-module-version) ".")
+           " (" (cadr mime-module-version) ")"))
 
 
 ;;; @ buffer local variables
@@ -185,26 +186,22 @@ If optional argument MESSAGE-INFO is not specified,
 ;;; @@@ predicate function
 ;;;
 
-(defvar mime-view-content-button-visible-ctype-list
-  '("application/pgp"))
-
 (defun mime-view-entity-button-visible-p (entity message-info)
   "Return non-nil if header of ENTITY is visible.
 Please redefine this function if you want to change default setting."
-  (and (not (mime-root-entity-p entity))
-       (let ((media-type (mime-entity-media-type entity))
-            (media-subtype (mime-entity-media-subtype entity)))
-        (or (not (eq media-type 'application))
-            (and (not (eq media-subtype 'x-selection))
-                 (or (not (eq media-subtype 'octet-stream))
-                     (let ((mother-entity
-                            (mime-raw-entity-parent entity message-info)))
-                       (or (not (eq (mime-entity-media-type mother-entity)
-                                    'multipart))
-                           (not (eq (mime-entity-media-subtype mother-entity)
-                                    'encrypted)))
-                       )
-                     ))))))
+  (let ((media-type (mime-entity-media-type entity))
+       (media-subtype (mime-entity-media-subtype entity)))
+    (or (not (eq media-type 'application))
+       (and (not (eq media-subtype 'x-selection))
+            (or (not (eq media-subtype 'octet-stream))
+                (let ((mother-entity
+                       (mime-raw-entity-parent entity message-info)))
+                  (or (not (eq (mime-entity-media-type mother-entity)
+                               'multipart))
+                      (not (eq (mime-entity-media-subtype mother-entity)
+                               'encrypted)))
+                  )
+                )))))
 
 ;;; @@@ entity button generator
 ;;;
@@ -273,12 +270,11 @@ Please redefine this function if you want to change default setting."
 (defun mime-view-header-visible-p (entity message-info)
   "Return non-nil if header of ENTITY is visible."
   (let ((entity-node-id (mime-entity-node-id entity)))
-    (or (null entity-node-id)
-       (member (mime-entity-type/subtype
-                (mime-raw-find-entity-from-node-id
-                 (cdr entity-node-id) message-info))
-               mime-view-childrens-header-showing-Content-Type-list)
-       )))
+    (member (mime-entity-type/subtype
+            (mime-raw-find-entity-from-node-id
+             (cdr entity-node-id) message-info))
+           mime-view-childrens-header-showing-Content-Type-list)
+    ))
 
 ;;; @@@ entity header filter
 ;;;
@@ -339,6 +335,21 @@ Each elements are regexp of field-name.")
 ;;; @@@ predicate function
 ;;;
 
+(defun mime-calist::field-match-method-as-default-rule (calist
+                                                       field-type field-value)
+  (let ((s-field (assq field-type calist)))
+    (cond ((null s-field)
+          (cons (cons field-type field-value) calist)
+          )
+         (t calist))))
+
+(define-calist-field-match-method
+  'header #'mime-calist::field-match-method-as-default-rule)
+
+(define-calist-field-match-method
+  'body #'mime-calist::field-match-method-as-default-rule)
+
+
 (defvar mime-preview-condition nil
   "Condition-tree about how to display entity.")
 
@@ -376,35 +387,43 @@ Each elements are regexp of field-name.")
                           (body . visible)))
 
 (ctree-set-calist-strictly
+ 'mime-preview-condition '((type . message)(subtype . rfc822)
+                          (childrens-situation (header . visible))))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . message)(subtype . news)
+                          (childrens-situation (header . visible))))
+
+(ctree-set-calist-strictly
  'mime-preview-condition '((body . visible)
                           (body-presentation-method . with-filter)
-                          (body-filter . mime-view-filter-for-text/plain)))
+                          (body-filter . mime-preview-filter-for-text/plain)))
 
 (ctree-set-calist-strictly
  'mime-preview-condition '((type . nil)
                           (body . visible)
                           (body-presentation-method . with-filter)
-                          (body-filter . mime-view-filter-for-text/plain)))
+                          (body-filter . mime-preview-filter-for-text/plain)))
 
 (ctree-set-calist-strictly
  'mime-preview-condition '((type . text)(subtype . enriched)
                           (body . visible)
                           (body-presentation-method . with-filter)
                           (body-filter
-                           . mime-view-filter-for-text/enriched)))
+                           . mime-preview-filter-for-text/enriched)))
 
 (ctree-set-calist-strictly
  'mime-preview-condition '((type . text)(subtype . richtext)
                           (body . visible)
                           (body-presentation-method . with-filter)
                           (body-filter
-                           . mime-view-filter-for-text/richtext)))
+                           . mime-preview-filter-for-text/richtext)))
 
 (ctree-set-calist-strictly
  'mime-preview-condition '((type . text)(subtype . t)
                           (body . visible)
                           (body-presentation-method . with-filter)
-                          (body-filter . mime-view-filter-for-text/plain)))
+                          (body-filter . mime-preview-filter-for-text/plain)))
 
 (ctree-set-calist-strictly
  'mime-preview-condition '((type . message)(subtype . partial)
@@ -424,9 +443,9 @@ Each elements are regexp of field-name.")
 ;;; @@@ entity filter
 ;;;
 
-(autoload 'mime-view-filter-for-text/plain "mime-text")
-(autoload 'mime-view-filter-for-text/enriched "mime-text")
-(autoload 'mime-view-filter-for-text/richtext "mime-text")
+(autoload 'mime-preview-filter-for-text/plain "mime-text")
+(autoload 'mime-preview-filter-for-text/enriched "mime-text")
+(autoload 'mime-preview-filter-for-text/richtext "mime-text")
 
 (defvar mime-text-decoder-alist
   '((mime-show-message-mode    . mime-text-decode-buffer)
@@ -623,11 +642,9 @@ The compressed face will be piped to this command.")
   (or mime-view-redisplay
       (setq mime-raw-message-info (mime-parse-message ctl encoding))
       )
-  (let* ((message-info mime-raw-message-info)
-        (pcl (mime-raw-flatten-message-info message-info))
-        (the-buf (current-buffer))
-        (mode major-mode)
-        )
+  (let ((message-info mime-raw-message-info)
+       (the-buf (current-buffer))
+       (mode major-mode))
     (or obuf
        (setq obuf (concat "*Preview-" (buffer-name the-buf) "*")))
     (set-buffer (get-buffer-create obuf))
@@ -639,10 +656,7 @@ The compressed face will be piped to this command.")
       (setq mime-preview-original-major-mode mode)
       (setq major-mode 'mime-view-mode)
       (setq mode-name "MIME-View")
-      (while pcl
-       (mime-view-display-entity (car pcl) message-info the-buf obuf)
-       (setq pcl (cdr pcl))
-       )
+      (mime-view-display-message message-info the-buf obuf)
       (set-buffer-modified-p nil)
       )
     (setq buffer-read-only t)
@@ -651,20 +665,94 @@ The compressed face will be piped to this command.")
   (setq mime-preview-buffer obuf)
   )
 
-(defun mime-view-display-entity (entity message-info ibuf obuf)
-  "Display ENTITY."
+(defun mime-view-display-message (message-info ibuf obuf)
+  (let* ((start (mime-entity-point-min message-info))
+        (end (mime-entity-point-max message-info))
+        (media-type (mime-entity-media-type message-info))
+        (media-subtype (mime-entity-media-subtype message-info))
+        (params (mime-entity-parameters message-info))
+        (encoding (mime-entity-encoding message-info))
+        end-of-header e nb ne subj)
+    (set-buffer ibuf)
+    (goto-char start)
+    (setq end-of-header (if (re-search-forward "^$" nil t)
+                           (1+ (match-end 0))
+                         end))
+    (if (> end-of-header end)
+       (setq end-of-header end)
+      )
+    (save-restriction
+      (narrow-to-region start end)
+      (setq subj
+           (eword-decode-string
+            (mime-raw-get-subject params encoding)))
+      )
+    (set-buffer obuf)
+    (setq nb (point))
+    (narrow-to-region nb nb)
+    ;; Insert message-header
+    (save-restriction
+      (narrow-to-region (point)(point))
+      (insert-buffer-substring mime-raw-buffer start end-of-header)
+      (let ((f (cdr (assq mime-preview-original-major-mode
+                         mime-view-content-header-filter-alist))))
+       (if (functionp f)
+           (funcall f)
+         (mime-view-default-content-header-filter)
+         ))
+      (run-hooks 'mime-view-content-header-filter-hook)
+      )
+    (let* ((situation
+           (ctree-match-calist mime-preview-condition
+                               (list* (cons 'type       media-type)
+                                      (cons 'subtype    media-subtype)
+                                      (cons 'encoding   encoding)
+                                      (cons 'major-mode major-mode)
+                                      params)))
+          (message-button
+           (cdr (assq 'message-button situation)))
+          (body-presentation-method
+           (cdr (assq 'body-presentation-method situation))))
+      (when message-button
+       (goto-char (point-max))
+       (mime-view-insert-entity-button message-info message-info subj)
+       )
+      (cond ((eq body-presentation-method 'with-filter)
+            (let ((body-filter (cdr (assq 'body-filter situation))))
+              (save-restriction
+                (narrow-to-region (point-max)(point-max))
+                (insert-buffer-substring mime-raw-buffer end-of-header end)
+                (funcall body-filter situation)
+                )))
+           ((functionp body-presentation-method)
+            (funcall body-presentation-method situation)
+            )
+           ((null (mime-entity-children message-info))
+            (goto-char (point-max))
+            (mime-view-insert-entity-button message-info message-info subj)
+            ))
+      (setq ne (point-max))
+      (widen)
+      (put-text-property nb ne 'mime-view-raw-buffer ibuf)
+      (put-text-property nb ne 'mime-view-entity message-info)
+      (goto-char ne)
+      (let ((children (mime-entity-children message-info))
+           (default-situation
+            (cdr (assq 'childrens-situation situation))))
+       (while children
+         (mime-view-display-entity (car children) message-info ibuf obuf
+                                   default-situation)
+         (setq children (cdr children))
+         )))))
+
+(defun mime-view-display-entity (entity message-info ibuf obuf
+                                       default-situation)
   (let* ((start (mime-entity-point-min entity))
         (end (mime-entity-point-max entity))
         (media-type (mime-entity-media-type entity))
         (media-subtype (mime-entity-media-subtype entity))
-        (ctype (if media-type
-                   (if media-subtype
-                       (format "%s/%s" media-type media-subtype)
-                     (symbol-name media-type)
-                     )))
         (params (mime-entity-parameters entity))
         (encoding (mime-entity-encoding entity))
-        (entity-node-id (mime-entity-node-id entity))
         end-of-header e nb ne subj)
     (set-buffer ibuf)
     (goto-char start)
@@ -686,34 +774,30 @@ The compressed face will be piped to this command.")
     (if (mime-view-entity-button-visible-p entity message-info)
        (mime-view-insert-entity-button entity message-info subj)
       )
-    (if (mime-view-header-visible-p entity message-info)
-       (save-restriction
-         (narrow-to-region (point)(point))
-         (insert-buffer-substring mime-raw-buffer start end-of-header)
-         (let ((f (cdr (assq mime-preview-original-major-mode
-                             mime-view-content-header-filter-alist))))
-           (if (functionp f)
-               (funcall f)
-             (mime-view-default-content-header-filter)
-             ))
-         (run-hooks 'mime-view-content-header-filter-hook)
-         ))
-    (if (and (mime-root-entity-p entity)
-            (member
-             ctype mime-view-content-button-visible-ctype-list))
-       (save-excursion
-         (goto-char (point-max))
-         (mime-view-insert-entity-button entity message-info subj)
-         ))
     (let* ((situation
            (ctree-match-calist mime-preview-condition
                                (list* (cons 'type       media-type)
                                       (cons 'subtype    media-subtype)
                                       (cons 'encoding   encoding)
                                       (cons 'major-mode major-mode)
-                                      params)))
+                                      (append params
+                                              default-situation))))
+          (header-is-visible
+           (cdr (assq 'header situation)))
           (body-presentation-method
            (cdr (assq 'body-presentation-method situation))))
+      (if header-is-visible
+         (save-restriction
+           (narrow-to-region (point)(point))
+           (insert-buffer-substring mime-raw-buffer start end-of-header)
+           (let ((f (cdr (assq mime-preview-original-major-mode
+                               mime-view-content-header-filter-alist))))
+             (if (functionp f)
+                 (funcall f)
+               (mime-view-default-content-header-filter)
+               ))
+           (run-hooks 'mime-view-content-header-filter-hook)
+           ))
       (cond ((eq body-presentation-method 'with-filter)
             (let ((body-filter (cdr (assq 'body-filter situation))))
               (save-restriction
@@ -723,22 +807,23 @@ The compressed face will be piped to this command.")
                 )))
            ((functionp body-presentation-method)
             (funcall body-presentation-method situation)
-            )
-           ((and (null entity-node-id)
-                 (null (mime-entity-children message-info)))
-            (goto-char (point-max))
-            (mime-view-insert-entity-button entity message-info subj)
             ))
       (when (mime-view-entity-separator-visible-p entity message-info)
        (goto-char (point-max))
        (insert "\n"))
-      )
-    (setq ne (point-max))
-    (widen)
-    (put-text-property nb ne 'mime-view-raw-buffer ibuf)
-    (put-text-property nb ne 'mime-view-entity entity)
-    (goto-char ne)
-    ))
+      (setq ne (point-max))
+      (widen)
+      (put-text-property nb ne 'mime-view-raw-buffer ibuf)
+      (put-text-property nb ne 'mime-view-entity entity)
+      (goto-char ne)
+      (let ((children (mime-entity-children entity))
+           (default-situation
+             (cdr (assq 'childrens-situation situation))))
+       (while children
+         (mime-view-display-entity (car children) message-info ibuf obuf
+                                   default-situation)
+         (setq children (cdr children))
+         )))))
 
 (defun mime-raw-get-uu-filename (param &optional encoding)
   (if (member (or encoding