;;; mm-view.el --- Functions for viewing MIME objects
-;; Copyright (C) 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1998,99 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; This file is part of GNU Emacs.
(require 'mm-bodies)
(require 'mm-decode)
+(eval-and-compile
+ (autoload 'gnus-article-prepare-display "gnus-art")
+ (autoload 'vcard-parse-string "vcard")
+ (autoload 'vcard-format-string "vcard"))
+
;;;
;;; Functions for displaying various formats inline
;;;
(defun mm-inline-image (handle)
- (let ((type (cadr (split-string (car (mm-handle-type handle)) "/")))
- buffer-read-only image)
- (mm-with-unibyte-buffer
- (insert-buffer-substring (mm-handle-buffer handle))
- (mm-decode-content-transfer-encoding
- (mm-handle-encoding handle)
- (car (mm-handle-type handle)))
- (setq image (make-image-specifier
- (vector (intern type) :data (buffer-string)))))
- (let ((annot (make-annotation image nil 'text)))
- (set-extent-property annot 'mm t)
- (set-extent-property annot 'duplicable t)
- (mm-handle-set-undisplayer handle annot))
- (insert " \n")))
+ (let ((annot (make-annotation (mm-get-image handle) nil 'text))
+ buffer-read-only)
+ (mm-insert-inline handle "\n")
+ (set-extent-property annot 'mm t)
+ (set-extent-property annot 'duplicable t)))
+
+(defvar mm-w3-setup nil)
+(defun mm-setup-w3 ()
+ (unless mm-w3-setup
+ (require 'w3)
+ (w3-do-setup)
+ (require 'url)
+ (require 'w3-vars)
+ (require 'url-vars)
+ (setq mm-w3-setup t)))
(defun mm-inline-text (handle)
(let ((type (cadr (split-string (car (mm-handle-type handle)) "/")))
text buffer-read-only)
(cond
- ((equal type "plain")
- (with-temp-buffer
- (insert-buffer-substring (mm-handle-buffer handle))
- (mm-decode-content-transfer-encoding
- (mm-handle-encoding handle)
- (car (mm-handle-type handle)))
- (setq text (buffer-string)))
- (let ((b (point)))
- (insert text)
- (save-restriction
- (narrow-to-region b (point))
- (let ((charset (mail-content-type-get
- (mm-handle-type handle) 'charset)))
- (when charset
- (mm-decode-body charset nil)))
+ ((equal type "html")
+ (mm-setup-w3)
+ (setq text (mm-get-part handle))
+ (let ((b (point))
+ (url-standalone-mode t)
+ (url-current-object
+ (url-generic-parse-url (format "cid:%s" (mm-handle-id handle))))
+ (width (window-width)))
+ (save-excursion
+ (insert text)
+ (save-restriction
+ (narrow-to-region b (point))
+ (save-window-excursion
+ (let ((w3-strict-width width)
+ (url-standalone-mode t))
+ (w3-region (point-min) (point-max)))))
+ (narrow-to-region (1+ (point-min)) (point-max))
(mm-handle-set-undisplayer
handle
`(lambda ()
(let (buffer-read-only)
- (delete-region
- ,(set-marker (make-marker) (point-min))
- ,(set-marker (make-marker) (point-max)))))))))
- ((equal type "html")
- (let ((width (window-width)))
- (save-excursion
- (w3-do-setup)
- (mm-with-unibyte-buffer
- (insert-buffer-substring (mm-handle-buffer handle))
- (mm-decode-content-transfer-encoding
- (mm-handle-encoding handle)
- (car (mm-handle-type handle)))
- (require 'url)
- (save-window-excursion
- (let ((w3-strict-width width))
- (w3-region (point-min) (point-max)))
- (setq text (buffer-string))))))
- (mm-insert-inline handle text))
+ (mapc (lambda (prop)
+ (remove-specifier
+ (face-property 'default prop) (current-buffer)))
+ '(background background-pixmap foreground))
+ (delete-region ,(point-min-marker)
+ ,(point-max-marker))))))))
((or (equal type "enriched")
(equal type "richtext"))
(save-excursion
(mm-with-unibyte-buffer
- (insert-buffer-substring (mm-handle-buffer handle))
- (mm-decode-content-transfer-encoding
- (mm-handle-encoding handle)
- (car (mm-handle-type handle)))
+ (mm-insert-part handle)
(save-window-excursion
(enriched-decode (point-min) (point-max))
(setq text (buffer-string)))))
(mm-insert-inline handle text))
+ ((equal type "x-vcard")
+ (mm-insert-inline
+ handle
+ (concat "\n-- \n"
+ (vcard-format-string
+ (vcard-parse-string (mm-get-part handle)
+ 'vcard-standard-filter)))))
(t
- (save-excursion
- (mm-with-unibyte-buffer
- (insert-buffer-substring (mm-handle-buffer handle))
- (mm-decode-content-transfer-encoding
- (mm-handle-encoding handle)
- (car (mm-handle-type handle)))
- (setq text (buffer-string))))
- (mm-insert-inline handle text)))))
+ (setq text (mm-get-part handle))
+ (let ((b (point))
+ (charset (mail-content-type-get
+ (mm-handle-type handle) 'charset)))
+ (insert (mm-decode-string text charset))
+ (save-restriction
+ (narrow-to-region b (point))
+ (set-text-properties (point-min) (point-max) nil)
+ (mm-handle-set-undisplayer
+ handle
+ `(lambda ()
+ (let (buffer-read-only)
+ (delete-region ,(point-min-marker)
+ ,(point-max-marker)))))))))))
(defun mm-insert-inline (handle text)
"Insert TEXT inline from HANDLE."
(let (buffer-read-only)
(delete-region ,(set-marker (make-marker) b)
,(set-marker (make-marker) (point))))))))
-
+
(defun mm-inline-audio (handle)
(message "Not implemented"))
(defun mm-w3-prepare-buffer ()
(require 'w3)
- (w3-prepare-buffer))
+ (let ((url-standalone-mode t))
+ (w3-prepare-buffer)))
+
+(defun mm-view-message ()
+ (mm-enable-multibyte)
+ (gnus-article-prepare-display)
+ (run-hooks 'gnus-article-decode-hook)
+ (fundamental-mode)
+ (goto-char (point-min)))
+
+(defun mm-inline-message (handle)
+ (let ((b (point)))
+ (save-excursion
+ (save-restriction
+ (narrow-to-region b b)
+ (mm-insert-part handle)
+ (run-hooks 'gnus-article-decode-hook)
+ (gnus-article-prepare-display)
+ (mm-handle-set-undisplayer
+ handle
+ `(lambda ()
+ (let (buffer-read-only)
+ (mapc (lambda (prop)
+ (remove-specifier
+ (face-property 'default prop) (current-buffer)))
+ '(background background-pixmap foreground))
+ (delete-region ,(point-min-marker) ,(point-max-marker)))))))))
(provide 'mm-view)
projects / gnus / blobdiff