;;; @@@ predicate function
;;;
-(defvar mime-view-childrens-header-showing-Content-Type-list
- '("message/rfc822" "message/news"))
-
-(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)))
- (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)
- ))
+;; (defvar mime-view-childrens-header-showing-Content-Type-list
+;; '("message/rfc822" "message/news"))
+
+;; (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)))
+;; (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
;;;
;;; @@@ 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.")
(ctree-set-calist-strictly
'mime-preview-condition '((type . application)(subtype . pgp)
- (message-button . visible)
(body . visible)))
(ctree-set-calist-strictly
(body-presentation-method
. mime-view-insert-message/partial-button)))
-(defun mime-view-body-visible-p (entity message-info)
- "Return non-nil if body of ENTITY is visible."
- (ctree-match-calist mime-preview-condition
- (list* (cons 'type (mime-entity-media-type entity))
- (cons 'subtype (mime-entity-media-subtype entity))
- (cons 'encoding (mime-entity-encoding entity))
- (cons 'major-mode major-mode)
- (mime-entity-parameters entity))))
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . message)(subtype . rfc822)
+ (body-presentation-method . nil)
+ (childrens-situation (header . visible)
+ (entity-button . invisible))))
+
+(ctree-set-calist-strictly
+ 'mime-preview-condition '((type . message)(subtype . news)
+ (body-presentation-method . nil)
+ (childrens-situation (header . visible)
+ (entity-button . invisible))))
;;; @@@ entity filter
))
-;;; @@ entity separator
-;;;
-
-(defun mime-view-entity-separator-visible-p (entity message-info)
- "Return non-nil if separator is needed for ENTITY."
- (and (not (mime-view-header-visible-p entity message-info))
- (not (mime-view-body-visible-p entity message-info))))
-
-
;;; @ acting-condition
;;;
(cdr (assq 'message-button situation)))
(body-presentation-method
(cdr (assq 'body-presentation-method situation))))
- (when message-button
+ (when (eq message-button 'visible)
(goto-char (point-max))
(mime-view-insert-entity-button message-info message-info subj)
)
(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)))
- (while children
- (mime-view-display-entity (car children) message-info ibuf obuf)
- (setq children (cdr children))
- ))))
-
-(defun mime-view-display-entity (entity message-info ibuf obuf)
+ (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))
(eword-decode-string
(mime-raw-get-subject params encoding)))
)
- (set-buffer obuf)
- (setq nb (point))
- (narrow-to-region nb nb)
- (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)
- ))
(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))))
+ (button-is-invisible
+ (eq (cdr (assq 'entity-button situation)) 'invisible))
+ (header-is-visible
+ (eq (cdr (assq 'header situation)) 'visible))
(body-presentation-method
(cdr (assq 'body-presentation-method situation))))
+ (set-buffer obuf)
+ (setq nb (point))
+ (narrow-to-region nb nb)
+ (or button-is-invisible
+ (if (mime-view-entity-button-visible-p entity message-info)
+ (mime-view-insert-entity-button entity message-info subj)
+ ))
+ (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
((functionp body-presentation-method)
(funcall body-presentation-method situation)
))
- (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)
- (let ((children (mime-entity-children entity)))
- (while children
- (mime-view-display-entity (car children) message-info ibuf obuf)
- (setq children (cdr children))
- ))))
+ (or header-is-visible
+ body-presentation-method
+ (progn
+ (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)
+ (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
(erase-buffer)
(insert-buffer-substring the-buf p-beg p-end)
(goto-char (point-min))
- (if (mime-view-header-visible-p entity message-info)
- (delete-region (goto-char (point-min))
- (if (re-search-forward "^$" nil t)
- (match-end 0)
- (point-min)))
- )
- (goto-char (point-min))
- (insert "\n")
+ ;; (if (mime-view-header-visible-p entity message-info)
+ ;; (delete-region (goto-char (point-min))
+ ;; (if (re-search-forward "^$" nil t)
+ ;; (match-end 0)
+ ;; (point-min)))
+ ;; )
+ ;;(goto-char (point-min))
+ ;;(insert "\n")
(goto-char (point-min))
(let ((entity-node-id (mime-entity-node-id entity)) ci str)
(while (progn
projects / elisp / semi.git / blobdiff