;;; Code:
+(eval-when-compile (require 'cl))
+(eval-when-compile (require 'mm-decode))
(require 'mm-url)
(defcustom gnus-html-cache-directory (nnheader-concat gnus-directory "html-cache/")
"Where Gnus will cache images it downloads from the web."
+ :version "24.1"
:group 'gnus-art
:type 'directory)
(defcustom gnus-html-cache-size 500000000
"The size of the Gnus image cache."
+ :version "24.1"
:group 'gnus-art
:type 'integer)
(defcustom gnus-html-frame-width 70
"What width to use when rendering HTML."
+ :version "24.1"
:group 'gnus-art
:type 'integer)
+(defcustom gnus-blocked-images "."
+ "Images that have URLs matching this regexp will be blocked."
+ :version "24.1"
+ :group 'gnus-art
+ :type 'regexp)
+
+(defcustom gnus-max-image-proportion 0.7
+ "How big pictures displayed are in relation to the window they're in.
+A value of 0.7 means that they are allowed to take up 70% of the
+width and height of the window. If they are larger than this,
+and Emacs supports it, then the images will be rescaled down to
+fit these criteria."
+ :version "24.1"
+ :group 'gnus-art
+ :type 'float)
+
;;;###autoload
(defun gnus-article-html (handle)
(let ((article-buffer (current-buffer)))
(let* ((coding-system-for-read 'utf-8)
(coding-system-for-write 'utf-8)
(default-process-coding-system
- (cons coding-system-for-read coding-system-for-write)))
+ (cons coding-system-for-read coding-system-for-write))
+ (charset (mail-content-type-get (mm-handle-type handle)
+ 'charset)))
+ (when (and charset
+ (setq charset (mm-charset-to-coding-system charset))
+ (not (eq charset 'ascii)))
+ (mm-decode-coding-region (point-min) (point-max) charset))
(call-process-region (point-min) (point-max)
"w3m"
nil article-buffer nil
"-T" "text/html"))))
(gnus-html-wash-tags))))
+(defvar gnus-article-mouse-face)
+
(defun gnus-html-wash-tags ()
(let (tag parameters string start end images url)
(mm-url-decode-entities)
(cond
;; Fetch and insert a picture.
((equal tag "img_alt")
- (when (string-match "src=\"\\([^\"]+\\)" parameters)
+ (when (string-match "src=\"\\([^\"]+\\)" parameters)
(setq url (match-string 1 parameters))
- (when (or (null mm-w3m-safe-url-regexp)
- (string-match mm-w3m-safe-url-regexp url))
- (if (string-match "^cid:\\(.*\\)" url)
- ;; URLs with cid: have their content stashed in other
- ;; parts of the MIME structure, so just insert them
- ;; immediately.
- (let ((handle (mm-get-content-id
- (setq url (match-string 1 url))))
- image)
- (when handle
- (mm-with-part handle
- (setq image (gnus-create-image (buffer-string)
- nil t))))
- (when image
+ (gnus-message 8 "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
+ ;; immediately.
+ (let ((handle (mm-get-content-id
+ (setq url (match-string 1 url))))
+ image)
+ (when handle
+ (mm-with-part handle
+ (setq image (gnus-create-image (buffer-string)
+ nil t))))
+ (when image
+ (let ((string (buffer-substring start end)))
(delete-region start end)
- (gnus-put-image image)))
- ;; Normal, external URL.
+ (gnus-put-image image (gnus-string-or string "*")))))
+ ;; Normal, external URL.
+ (when (or (null gnus-blocked-images)
+ (not (string-match gnus-blocked-images url)))
(let ((file (gnus-html-image-id url)))
(if (file-exists-p file)
;; It's already cached, so just insert it.
- (when (gnus-html-put-image file (point))
+ (let ((string (buffer-substring start end)))
;; Delete the ALT text.
- (delete-region start end))
+ (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
((equal tag "a")
(when (string-match "href=\"\\([^\"]+\\)" parameters)
(setq url (match-string 1 parameters))
+ (gnus-message 8 "Fetching link URL %s" url)
(gnus-article-add-button start end
'browse-url url
url)
(gnus-overlay-put overlay 'gnus-button-url 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
+ ;; should be deleted.
+ ((equal tag "IMG_ALT")
+ (delete-region start end))
;; Whatever. Just ignore the tag.
(t
))
(gnus-html-schedule-image-fetching (current-buffer) (nreverse images)))))
(defun gnus-html-schedule-image-fetching (buffer images)
+ (gnus-message 8 "Scheduling image fetching in buffer %s, images %s" buffer images)
(let* ((url (caar images))
(process (start-process
"images" nil "curl"
(defun gnus-html-curl-sentinel (process event)
(when (string-match "finished" event)
- (let* ((images (getf (gnus-process-plist process) 'images))
- (buffer (getf (gnus-process-plist process) 'buffer))
+ (let* ((images (gnus-process-get process 'images))
+ (buffer (gnus-process-get process 'buffer))
(spec (pop images))
(file (gnus-html-image-id (car spec))))
(when (and (buffer-live-p buffer)
;; If the position of the marker is 1, then that
- ;; means that the text is was in has been deleted;
+ ;; means that the text it was in has been deleted;
;; i.e., that the user has selected a different
;; article before the image arrived.
- (not (= (marker-position (cadr spec)) 1)))
- (save-excursion
- (set-buffer buffer)
- (let ((buffer-read-only nil))
- (when (gnus-html-put-image file (cadr spec))
- (delete-region (1+ (cadr spec)) (caddr spec))))))
+ (not (= (marker-position (cadr spec)) (point-min))))
+ (with-current-buffer buffer
+ (let ((inhibit-read-only t)
+ (string (buffer-substring (cadr spec) (caddr spec))))
+ (delete-region (cadr spec) (caddr spec))
+ (gnus-html-put-image file (cadr spec) string))))
(when images
(gnus-html-schedule-image-fetching buffer images)))))
-(defun gnus-html-put-image (file point)
+(defun gnus-html-put-image (file point string)
(when (display-graphic-p)
(let ((image (ignore-errors
(gnus-create-image file))))
;; Kludge to avoid displaying 30x30 gif images, which
;; seems to be a signal of a broken image.
(not (and (listp image)
- (eq (getf (cdr image) :type) 'gif)
+ (eq (plist-get (cdr image) :type) 'gif)
(= (car (image-size image t)) 30)
(= (cdr (image-size image t)) 30))))
(progn
- (gnus-put-image image)
+ (gnus-put-image (gnus-html-rescale-image image)
+ (gnus-string-or string "*"))
t)
+ (insert string)
(when (fboundp 'find-image)
(gnus-put-image (find-image
- '((:type xpm :file "lock-broken.xpm")))))
+ '((:type xpm :file "lock-broken.xpm")))
+ (gnus-string-or string "*")))
nil)))))
+(defun gnus-html-rescale-image (image)
+ (if (not (fboundp 'imagemagick-types))
+ image
+ (let* ((width (car (image-size image t)))
+ (height (cdr (image-size image t)))
+ (edges (window-pixel-edges))
+ (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))))
+
(defun gnus-html-prune-cache ()
(let ((total-size 0)
files)
;;;###autoload
(defun gnus-html-prefetch-images (summary)
- (let (safe-url-regexp urls)
+ (let (blocked-images urls)
(when (buffer-live-p summary)
- (save-excursion
- (set-buffer summary)
- (setq safe-url-regexp mm-w3m-safe-url-regexp))
+ (with-current-buffer summary
+ (setq blocked-images gnus-blocked-images))
(save-match-data
(while (re-search-forward "<img.*src=[\"']\\([^\"']+\\)" nil t)
(let ((url (match-string 1)))
- (when (or (null safe-url-regexp)
- (string-match safe-url-regexp url))
- (unless (file-exists-p (gnus-html-image-id url))
- (push url urls)
- (push (gnus-html-image-id url) urls)
- (push "-o" urls)))))
+ (if (or (null blocked-images)
+ (not (string-match blocked-images url)))
+ (unless (file-exists-p (gnus-html-image-id url))
+ (push url urls)
+ (push (gnus-html-image-id url) urls)
+ (push "-o" urls))
+ (gnus-message 8 "Image URL %s is blocked" url))))
(let ((process
(apply 'start-process
"images" nil "curl"
projects / gnus / blobdiff