(shr-add-font): Use overlays for combining faces.

[gnus] / lisp / shr.el

diff --git a/lisp/shr.el b/lisp/shr.el
index 6bea1f4..4a778b8 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -30,7 +30,29 @@
 
 ;;; Code:
 
+(defgroup shr nil
+  "Simple HTML Renderer"
+  :group 'mail)
+
+(defcustom shr-max-image-proportion 0.9
+  "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 'shr
+  :type 'float)
+
+(defcustom shr-blocked-images nil
+  "Images that have URLs matching this regexp will be blocked."
+  :version "24.1"
+  :group 'shr
+  :type 'regexp)
+
 (defvar shr-folding-mode nil)
+(defvar shr-state nil)
+(defvar shr-start nil)
 
 (defvar shr-width 70)
 
@@ -46,9 +68,11 @@
        (push (shr-transform-dom sub) result)))
     (nreverse result)))
 
+;;;###autoload
 (defun shr-insert-document (dom)
-  (setq dom (shr-transform-dom dom))
-  (shr-descend dom))
+  (let ((shr-state nil)
+       (shr-start nil))
+    (shr-descend (shr-transform-dom dom))))
 
 (defun shr-descend (dom)
   (let ((function (intern (concat "shr-" (symbol-name (car dom))) obarray)))
@@ -83,24 +107,47 @@
   (shr-fontize-cont cont 'strikethru))
 
 (defun shr-fontize-cont (cont type)
-  (let ((start (point)))
+  (let (shr-start)
     (shr-generic cont)
-    (shr-add-font start (point) type)))
+    (shr-add-font shr-start (point) type)))
 
 (defun shr-add-font (start end type)
-  (put-text-property start end 'face type))
+  (let ((overlay (make-overlay start end)))
+    (overlay-put overlay 'face type)))
+
+(defun shr-a (cont)
+  (let ((url (cdr (assq :href cont)))
+       shr-start)
+    (shr-generic cont)
+    (widget-convert-button
+     'link shr-start (point)
+     :action 'shr-browse-url
+     :url url
+     :keymap widget-keymap
+     :help-echo url)))
+
+(defun shr-browse-url (widget &rest stuff)
+  (browse-url (widget-get widget :url)))
 
 (defun shr-img (cont)
-  (shr-ensure-newline)
   (let ((start (point-marker)))
-    (let ((alt (or (cdr (assq :alt cont)) "[img]"))
+    (let ((alt (cdr (assq :alt cont)))
          (url (cdr (assq :src cont))))
-      (if (url-is-cached url)
-         (shr-put-image (shr-get-image-data url) (point) alt)
+      (when (zerop (length alt))
+       (setq alt "[img]"))
+      (cond
+       ((and shr-blocked-images
+            (string-match shr-blocked-images url))
+       (insert alt))
+       ((url-is-cached (browse-url-url-encode-chars url "[&)$ ]"))
+       (shr-put-image (shr-get-image-data url) (point) alt))
+       (t
        (insert alt)
        (url-retrieve url 'shr-image-fetched
-                     (list (current-buffer) start (point-marker)))))
-    (shr-ensure-newline)))
+                     (list (current-buffer) start (point-marker))
+                     t)))
+      (insert " ")
+      (setq shr-state 'image))))
 
 (defun shr-image-fetched (status buffer start end)
   (when (and (buffer-name buffer)
@@ -119,9 +166,36 @@
 (defun shr-put-image (data point alt)
   (if (not (display-graphic-p))
       (insert alt)
-    (let ((image (create-image data nil t)))
+    (let ((image (shr-rescale-image data)))
       (put-image image point alt))))
 
+(defun shr-rescale-image (data)
+  (if (or (not (fboundp 'imagemagick-types))
+         (not (get-buffer-window (current-buffer))))
+      (create-image data nil t)
+    (let* ((image (create-image data nil t))
+          (size (image-size image))
+          (width (car size))
+          (height (cdr size))
+          (edges (window-inside-pixel-edges
+                  (get-buffer-window (current-buffer))))
+          (window-width (truncate (* shr-max-image-proportion
+                                     (- (nth 2 edges) (nth 0 edges)))))
+          (window-height (truncate (* shr-max-image-proportion
+                                      (- (nth 3 edges) (nth 1 edges)))))
+          scaled-image)
+      (when (> height window-height)
+       (setq image (or (create-image data 'imagemagick t
+                                     :height window-height)
+                       image))
+       (setq size (image-size image t)))
+      (when (> (car size) window-width)
+       (setq image (or
+                    (create-image data 'imagemagick t
+                                  :width window-width)
+                    image)))
+      image)))
+
 (defun shr-pre (cont)
   (let ((shr-folding-mode nil))
     (shr-ensure-newline)
@@ -136,6 +210,9 @@
     (insert "\n")))
 
 (defun shr-insert (text)
+  (when (eq shr-state 'image)
+    (insert "\n")
+    (setq shr-state nil))
   (cond
    ((eq shr-folding-mode 'none)
     (insert t))
@@ -143,11 +220,16 @@
     (let (column)
       (dolist (elem (split-string text))
        (setq column (current-column))
-       (if (zerop column)
-           (insert elem)
+       (when (plusp column)
          (if (> (+ column (length elem) 1) shr-width)
-             (insert "\n" elem)
-           (insert " " elem))))))))
+             (insert "\n")
+           (insert " ")))
+       ;; The shr-start is a special variable that is used to pass
+       ;; upwards the first point in the buffer where the text really
+       ;; starts.
+       (unless shr-start
+         (setq shr-start (point)))
+       (insert elem))))))
 
 (defun shr-get-image-data (url)
   "Get image data for URL.