Newsticker: Show feedicons in treeview. Small fix in opml export.

* etc/images/newsticker/README: Add rss-feed.png, rss-feed.svg.

* etc/images/newsticker/rss-feed.png: New.

* etc/images/newsticker/rss-feed.svg: New.

* lisp/net/newst-backend.el: Require url-parse.
(newsticker--get-news-by-wget): Store feed name as process property.
(newsticker--sentinel): Read feed name from process property.
(newsticker--sentinel-work): Rename argument name to feed-name.
Rename variable imageurl to image-url.  Pick icon url from Atom
1.0 data.  Launch download of feed icon.
(newsticker--get-icon-url-atom-1.0): New.
(newsticker--unxml)
(newsticker--unxml-node)
(newsticker--unxml-attribute): Documentation.
(newsticker--icons-dir): New.
(newsticker--image-get): New arguments FILENAME and DIRECTORY.
Use `url-retrieve' if `newsticker-retrieval-method' is 'intern.
(newsticker--image-download-by-wget): New.  Use process properties
for storing informations.
(newsticker--image-sentinel): Read informations from process properties.
(newsticker--image-save)
(newsticker--image-remove)
(newsticker--image-download-by-url)
(newsticker--image-download-by-url-callback): New.
(newsticker-opml-export): Handle url list entries containing a
function instead of an url string.

* lisp/net/newst-reader.el (newsticker-html-renderer): Whitespace.
(newsticker--print-extra-elements)
(newsticker--do-print-extra-element): Documentation
(newsticker--image-read): Optionally limit image height.  Use
imagemagick if possible.
(newsticker--icon-read): New.

* lisp/net/newst-treeview.el (newsticker--treeview-item-show): Limit height of feed logo.
(newsticker--treeview-tree-expand): Use feed icons in treeview.
(newsticker--tree-widget-icon-create): New.  Set the tree widget icon.
(newsticker--tree-widget-leaf-icon): Use feed icon.

1 files changed, 20 insertions, 1 deletions

diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index 097a2a58805..6d0720d074e 100644
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -735,7 +735,7 @@ for the button."
         (goto-char (point-min))
         ;; insert logo at top
         (let* ((newsticker-enable-logo-manipulations nil)
-               (img (newsticker--image-read feed-name-symbol nil)))
+               (img (newsticker--image-read feed-name-symbol nil 40)))
           (if (and (display-images-p) img)
               (newsticker--insert-image img (car item))
             (insert (newsticker--real-feed-name feed-name-symbol))))
@@ -829,6 +829,7 @@ Callback function for tree widget that adds nodes for feeds and subgroups."
                       :nt-group ,(cdr g)
                       :nt-feed ,g-name
                       :nt-id ,nt-id
+                      :leaf-icon newsticker--tree-widget-leaf-icon
                       :keep (:nt-feed :num-new :nt-id :open);;  :nt-group
                       :open nil))
                 (let ((tag (newsticker--treeview-tree-get-tag g nil nt-id)))
@@ -841,6 +842,23 @@ Callback function for tree widget that adds nodes for feeds and subgroups."
                        :open t))))
             group)))
 
+(defun newsticker--tree-widget-icon-create (icon)
+  "Create the ICON widget."
+  (let* ((g (widget-get (widget-get icon :node) :nt-feed))
+         (ico (and g (newsticker--icon-read (intern g)))))
+    (if ico
+        (progn
+          (widget-put icon :tag-glyph ico)
+          (widget-default-create icon)
+          ;; Insert space between the icon and the node widget.
+          (insert-char ?  1)
+          (put-text-property
+           (1- (point)) (point)
+           'display (list 'space :width tree-widget-space-width)))
+      ;; fallback: default icon
+      (widget-put icon :leaf-icon 'tree-widget-leaf-icon)
+      (tree-widget-icon-create icon))))
+
 (defun newsticker--treeview-tree-expand-status (tree &optional changed-widget
                                                      event)
   "Expand the vfeed TREE.
@@ -875,6 +893,7 @@ Optional arguments CHANGED-WIDGET and EVENT are ignored."
   "Icon for a tree-widget leaf node."
   :tag        "O"
   :glyph-name "leaf"
+  :create 'newsticker--tree-widget-icon-create
   :button-face 'default)
 
 (defun newsticker--treeview-tree-update ()