-;;; 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))
+
+(defvar gnus-html-displayed-image-map
+ (let ((map (make-sparse-keymap)))
+ (define-key map "a" 'gnus-html-show-alt-text)
+ (define-key map "i" 'gnus-html-browse-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
(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)
+ (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[^\n>]+>" nil t)
(replace-match "" t t))
(goto-char (point-min))
(while (re-search-forward "<\\([^ />]+\\)\\([^>]*\\)>" nil t)
(when (plusp (length parameters))
(set-text-properties 0 (1- (length parameters)) nil parameters))
(delete-region start (point))
- (when (search-forward (concat "</" tag ">") nil t)
+ (when (search-forward (concat "</" tag ">") (line-end-position) t)
(delete-region (match-beginning 0) (match-end 0)))
(setq end (point))
(cond
(when image
(let ((string (buffer-substring start end)))
(delete-region start end)
- (gnus-put-image image (gnus-string-or string "*")))))
+ (gnus-put-image image (gnus-string-or string "*") 'cid)
+ (gnus-add-image 'cid image))))
;; 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))
+ (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)
+ width height alt-text)
(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))))
+ (when (string-match "\\(alt\\|title\\)=\"\\([^\"]+\\)"
+ parameters)
+ (setq alt-text (match-string 2 parameters)))
;; Don't fetch images that are really small. They're
;; probably tracking pictures.
(when (and (or (null height)
(if (file-exists-p file)
;; It's already cached, so just insert it.
(let ((string (buffer-substring start end)))
- ;; Delete the ALT text.
+ ;; Delete the IMG text.
(delete-region start end)
- (gnus-html-put-image file (point) string))
+ (gnus-html-put-image file (point) string url alt-text))
;; We don't have it, so schedule it for fetching
;; asynchronously.
(push (list 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
(goto-char (point-min))
;; The output from -halfdump isn't totally regular, so strip
;; off any </pre_int>s that were left over.
- (while (re-search-forward "</pre_int>" nil t)
+ (while (re-search-forward "</pre_int>\\|</internal>" 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-show-alt-text ()
+ "Show the ALT text of the image under point."
+ (interactive)
+ (message "%s" (get-text-property (point) 'gnus-alt-text)))
+
+(defun gnus-html-browse-image ()
+ "Browse the image under point."
+ (interactive)
+ (browse-url (get-text-property (point) 'gnus-image)))
(defun gnus-html-schedule-image-fetching (buffer images)
(gnus-message 8 "gnus-html-schedule-image-fetching: buffer %s, images %s"
"--location"
"--max-time" "60"
"-o" (gnus-html-image-id url)
- url)))
+ (mm-url-decode-entities-string url))))
(process-kill-without-query process)
(set-process-sentinel process 'gnus-html-curl-sentinel)
(gnus-set-process-plist process (list 'images images
(when images
(gnus-html-schedule-image-fetching buffer images)))))
-(defun gnus-html-put-image (file point string)
+(defun gnus-html-put-image (file point string &optional url alt-text)
(when (gnus-graphic-display-p)
(let* ((image (ignore-errors
(gnus-create-image file)))
(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)
+ (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 file size)
- (gnus-string-or string "*"))
+ (let ((start (point)))
+ (setq image (gnus-html-rescale-image image file size))
+ (gnus-put-image image
+ (gnus-string-or string "*")
+ 'external)
+ (let ((overlay (gnus-make-overlay start (point))))
+ (gnus-overlay-put overlay 'local-map
+ gnus-html-displayed-image-map)
+ (gnus-put-text-property start (point) 'gnus-alt-text alt-text)
+ (when url
+ (gnus-put-text-property start (point) 'gnus-image url)))
+ (gnus-add-image 'external image)
t)
(insert string)
(when (fboundp 'find-image)
- (gnus-put-image (find-image
- '((:type xpm :file "lock-broken.xpm")))
- (gnus-string-or string "*")))
+ (setq image (find-image '((:type xpm :file "lock-broken.xpm"))))
+ (gnus-put-image image
+ (gnus-string-or string "*")
+ 'internal)
+ (gnus-add-image 'internal image))
nil)))))
(defun gnus-html-rescale-image (image file size)
(delete-file (nth 2 file)))))))
(defun gnus-html-image-url-blocked-p (url blocked-images)
-"Find out if URL is blocked by BLOCKED-IMAGES."
+ "Find out if URL is blocked by BLOCKED-IMAGES."
(let ((ret (and blocked-images
(string-match blocked-images url))))
(if ret
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)
(let ((url (match-string 1)))
(unless (gnus-html-image-url-blocked-p url blocked-images)
(unless (file-exists-p (gnus-html-image-id url))
- (push url urls)
+ (push (mm-url-decode-entities-string url) urls)
(push (gnus-html-image-id url) urls)
(push "-o" urls)))))
(let ((process
projects / gnus / blobdiff