-;;; gnus-html.el --- Quoted-Printable functions
+;;; gnus-html.el --- Render HTML in a buffer.
;; Copyright (C) 2010 Free Software Foundation, Inc.
:group 'gnus-art
:type 'float)
+(defvar gnus-html-image-map
+ (let ((map (make-sparse-keymap)))
+ (define-key map "u" 'gnus-article-copy-string)
+ (define-key map "i" 'gnus-html-insert-image)
+ map))
+
;;;###autoload
-(defun gnus-article-html (handle)
+(defun gnus-article-html (&optional handle)
(let ((article-buffer (current-buffer)))
+ (unless handle
+ (setq handle (mm-dissect-buffer t)))
(save-restriction
(narrow-to-region (point) (point))
(save-excursion
(when (and charset
(setq charset (mm-charset-to-coding-system charset))
(not (eq charset 'ascii)))
- (mm-decode-coding-region (point-min) (point-max) charset))
+ (insert (prog1
+ (mm-decode-coding-string (buffer-string) charset)
+ (erase-buffer)
+ (mm-enable-multibyte))))
(call-process-region (point-min) (point-max)
- "w3m"
+ "w3m"
nil article-buffer nil
"-halfdump"
"-no-cookie"
"-o" "pre_conv=1"
"-t" (format "%s" tab-width)
"-cols" (format "%s" gnus-html-frame-width)
- "-o" "display_image=off"
+ "-o" "display_image=on"
"-T" "text/html"))))
(gnus-html-wash-tags))))
(defun gnus-html-wash-tags ()
(let (tag parameters string start end images url)
- (mm-url-decode-entities)
+ (goto-char (point-min))
+ (while (re-search-forward " *<pre_int> *</pre_int> *\n" nil t)
+ (replace-match "" t t))
+ (goto-char (point-min))
+ (while (re-search-forward "<a name[^>]+>" nil t)
+ (replace-match "" t t))
(goto-char (point-min))
(while (re-search-forward "<\\([^ />]+\\)\\([^>]*\\)>" nil t)
(setq tag (match-string 1)
((equal tag "img_alt")
(when (string-match "src=\"\\([^\"]+\\)" parameters)
(setq url (match-string 1 parameters))
- (gnus-message 8 "Fetching image URL %s" url)
+ (gnus-message 8 "gnus-html-wash-tags: fetching image URL %s" url)
(if (string-match "^cid:\\(.*\\)" url)
;; URLs with cid: have their content stashed in other
;; parts of the MIME structure, so just insert them
(delete-region start end)
(gnus-put-image image (gnus-string-or string "*")))))
;; Normal, external URL.
- (unless (gnus-html-image-url-blocked-p
- url
- (if (buffer-live-p gnus-summary-buffer)
- (with-current-buffer gnus-summary-buffer
- gnus-blocked-images)
- gnus-blocked-images))
- (let ((file (gnus-html-image-id url)))
- (if (file-exists-p file)
- ;; It's already cached, so just insert it.
- (let ((string (buffer-substring start end)))
- ;; Delete the ALT text.
- (delete-region start end)
- (gnus-html-put-image file (point) string))
- ;; We don't have it, so schedule it for fetching
- ;; asynchronously.
- (push (list url
- (set-marker (make-marker) start)
- (point-marker))
- images)))))))
+ (if (gnus-html-image-url-blocked-p
+ url
+ (if (buffer-live-p gnus-summary-buffer)
+ (with-current-buffer gnus-summary-buffer
+ gnus-blocked-images)
+ gnus-blocked-images))
+ (progn
+ (widget-convert-button
+ 'link start end
+ :action 'gnus-html-insert-image
+ :help-echo url
+ :keymap gnus-html-image-map
+ :button-keymap gnus-html-image-map)
+ (let ((overlay (gnus-make-overlay start end))
+ (spec (list url
+ (set-marker (make-marker) start)
+ (set-marker (make-marker) end))))
+ (gnus-overlay-put overlay 'local-map gnus-html-image-map)
+ (gnus-overlay-put overlay 'gnus-image spec)
+ (gnus-put-text-property
+ start end
+ 'gnus-image spec)))
+ (let ((file (gnus-html-image-id url))
+ width height)
+ (when (string-match "height=\"?\\([0-9]+\\)" parameters)
+ (setq height (string-to-number (match-string 1 parameters))))
+ (when (string-match "width=\"?\\([0-9]+\\)" parameters)
+ (setq width (string-to-number (match-string 1 parameters))))
+ ;; Don't fetch images that are really small. They're
+ ;; probably tracking pictures.
+ (when (and (or (null height)
+ (> height 4))
+ (or (null width)
+ (> width 4)))
+ (if (file-exists-p file)
+ ;; It's already cached, so just insert it.
+ (let ((string (buffer-substring start end)))
+ ;; Delete the ALT text.
+ (delete-region start end)
+ (gnus-html-put-image file (point) string))
+ ;; We don't have it, so schedule it for fetching
+ ;; asynchronously.
+ (push (list url
+ (set-marker (make-marker) start)
+ (point-marker))
+ images))))))))
;; Add a link.
((or (equal tag "a")
(equal tag "A"))
(when (string-match "href=\"\\([^\"]+\\)" parameters)
(setq url (match-string 1 parameters))
- (gnus-message 8 "Fetching link URL %s" url)
+ (gnus-message 8 "gnus-html-wash-tags: fetching link URL %s" url)
(gnus-article-add-button start end
'browse-url url
url)
(let ((overlay (gnus-make-overlay start end)))
(gnus-overlay-put overlay 'evaporate t)
(gnus-overlay-put overlay 'gnus-button-url url)
+ (gnus-put-text-property start end 'gnus-string url)
(when gnus-article-mouse-face
(gnus-overlay-put overlay 'mouse-face gnus-article-mouse-face)))))
;; The upper-case IMG_ALT is apparently just an artifact that
(while (re-search-forward "</pre_int>" nil t)
(replace-match "" t t))
(when images
- (gnus-html-schedule-image-fetching (current-buffer) (nreverse images)))))
+ (gnus-html-schedule-image-fetching (current-buffer) (nreverse images)))
+ (mm-url-decode-entities)))
+
+(defun gnus-html-insert-image ()
+ "Fetch and insert the image under point."
+ (interactive)
+ (gnus-html-schedule-image-fetching
+ (current-buffer) (list (get-text-property (point) 'gnus-image))))
(defun gnus-html-schedule-image-fetching (buffer images)
- (gnus-message 8 "Scheduling image fetching in buffer %s, images %s" buffer images)
+ (gnus-message 8 "gnus-html-schedule-image-fetching: buffer %s, images %s"
+ buffer images)
(let* ((url (caar images))
(process (start-process
"images" nil "curl"
(gnus-html-schedule-image-fetching buffer images)))))
(defun gnus-html-put-image (file point string)
- (when (display-graphic-p)
- (let ((image (ignore-errors
- (gnus-create-image file))))
+ (when (gnus-graphic-display-p)
+ (let* ((image (ignore-errors
+ (gnus-create-image file)))
+ (size (and image
+ (if (featurep 'xemacs)
+ (cons (glyph-width image) (glyph-height image))
+ (image-size image t)))))
(save-excursion
(goto-char point)
(if (and image
;; Kludge to avoid displaying 30x30 gif images, which
;; seems to be a signal of a broken image.
- (not (and (listp image)
- (eq (plist-get (cdr image) :type) 'gif)
- (= (car (image-size image t)) 30)
- (= (cdr (image-size image t)) 30))))
+ (not (and (if (featurep 'xemacs)
+ (glyphp image)
+ (listp image))
+ (eq (if (featurep 'xemacs)
+ (let ((data (cdadar (specifier-spec-list
+ (glyph-image image)))))
+ (and (vectorp data)
+ (aref data 0)))
+ (plist-get (cdr image) :type))
+ 'gif)
+ (= (car size) 30)
+ (= (cdr size) 30))))
(progn
- (gnus-put-image (gnus-html-rescale-image image)
- (gnus-string-or string "*"))
+ (setq image (gnus-html-rescale-image image file size))
+ (gnus-put-image image
+ (gnus-string-or string "*")
+ 'external)
+ (gnus-add-image 'external image)
t)
(insert string)
(when (fboundp 'find-image)
(gnus-string-or string "*")))
nil)))))
-(defun gnus-html-rescale-image (image)
+(defun gnus-html-rescale-image (image file size)
(if (or (not (fboundp 'imagemagick-types))
(not (get-buffer-window (current-buffer))))
image
- (let* ((width (car (image-size image t)))
- (height (cdr (image-size image t)))
+ (let* ((width (car size))
+ (height (cdr size))
(edges (window-pixel-edges (get-buffer-window (current-buffer))))
(window-width (truncate (* gnus-max-image-proportion
(- (nth 2 edges) (nth 0 edges)))))
(window-height (truncate (* gnus-max-image-proportion
(- (nth 3 edges) (nth 1 edges)))))
scaled-image)
- (when (> width window-width)
- (setq window-height (truncate (* window-height
- (/ (* 1.0 window-width) width)))))
- (or
- (cond ((> height window-height)
- (create-image file 'imagemagick nil
- :height window-height))
- ((> width window-width)
- (create-image file 'imagemagick nil
- :width window-width)))
- image))))
+ (when (> height window-height)
+ (setq image (or (create-image file 'imagemagick nil
+ :height window-height)
+ image))
+ (setq size (image-size image t)))
+ (when (> (car size) window-width)
+ (setq image (or
+ (create-image file 'imagemagick nil
+ :width window-width)
+ image)))
+ image)))
(defun gnus-html-prune-cache ()
(let ((total-size 0)
(decf total-size (cadr file))
(delete-file (nth 2 file)))))))
-
(defun gnus-html-image-url-blocked-p (url blocked-images)
"Find out if URL is blocked by BLOCKED-IMAGES."
(let ((ret (and blocked-images
(string-match blocked-images url))))
- (when ret
- (gnus-message 8 "Image URL %s is blocked by gnus-blocked-images regex %s" url blocked-images))
+ (if ret
+ (gnus-message 8 "gnus-html-image-url-blocked-p: %s blocked by regex %s"
+ url blocked-images)
+ (gnus-message 9 "gnus-html-image-url-blocked-p: %s passes regex %s"
+ url blocked-images))
ret))
+(defun gnus-html-show-images ()
+ "Show any images that are in the HTML-rendered article buffer.
+This only works if the article in question is HTML."
+ (interactive)
+ (gnus-with-article-buffer
+ (let ((overlays (overlays-in (point-min) (point-max)))
+ overlay images)
+ (while (setq overlay (pop overlays))
+ (when (overlay-get overlay 'gnus-image)
+ (push (overlay-get overlay 'gnus-image) images)))
+ (if (not images)
+ (message "No images to show")
+ (gnus-html-schedule-image-fetching (current-buffer) images)))))
+
;;;###autoload
(defun gnus-html-prefetch-images (summary)
(let (blocked-images urls)
(push (gnus-html-image-id url) urls)
(push "-o" urls)))))
(let ((process
- (apply 'start-process
+ (apply 'start-process
"images" nil "curl"
"-s" "--create-dirs"
"--location"
projects / gnus / blobdiff