;;; newst-treeview.el --- Treeview frontend for newsticker.
-;; Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
;; Author: Ulf Jasper <ulf.jasper@web.de>
;; Filename: newst-treeview.el
;; URL: http://www.nongnu.org/newsticker
;; Created: 2007
;; Keywords: News, RSS, Atom
-;; Time-stamp: "15. April 2009, 19:51:17 (ulf)"
+;; Time-stamp: "6. Dezember 2009, 19:17:28 (ulf)"
+;; Package: newsticker
;; ======================================================================
;; ======================================================================
;;; Code:
-(require 'newsticker-reader "newst-reader")
+(require 'newst-reader)
(require 'widget)
(require 'tree-widget)
(require 'wid-edit)
30
"Width of tree window in treeview layout.
See also `newsticker-treeview-listwindow-height'."
- :type 'int
+ :type 'integer
:group 'newsticker-treeview)
(defcustom newsticker-treeview-listwindow-height
10
"Height of list window in treeview layout.
See also `newsticker-treeview-treewindow-width'."
- :type 'int
+ :type 'integer
:group 'newsticker-treeview)
(defcustom newsticker-treeview-automatically-mark-displayed-items-as-old
"Update faces in the treeview list buffer."
(let (pos-sel)
(with-current-buffer (newsticker--treeview-list-buffer)
- (let ((inhibit-read-only t))
- (goto-char (point-min))
- (while (not (eobp))
- (let* ((pos (save-excursion (end-of-line) (point)))
- (item (get-text-property (point) :nt-item))
- (age (newsticker--age item))
- (selected (get-text-property (point) :nt-selected))
- (face (cond ((eq age 'new)
- 'newsticker-treeview-new-face)
- ((eq age 'old)
- 'newsticker-treeview-old-face)
- ((eq age 'immortal)
- 'newsticker-treeview-immortal-face)
- ((eq age 'obsolete)
- 'newsticker-treeview-obsolete-face)
- (t
- 'bold))))
- (put-text-property (point) pos 'face face)
- (if selected
- (move-overlay newsticker--selection-overlay (point)
- (1+ pos) ;include newline
- (current-buffer)))
- (if selected (setq pos-sel (point)))
- (forward-line 1)
- (beginning-of-line))))) ;; FIXME!?
+ (save-excursion
+ (let ((inhibit-read-only t))
+ (goto-char (point-min))
+ (while (not (eobp))
+ (let* ((pos (point-at-eol))
+ (item (get-text-property (point) :nt-item))
+ (age (newsticker--age item))
+ (selected (get-text-property (point) :nt-selected))
+ (face (cond ((eq age 'new)
+ 'newsticker-treeview-new-face)
+ ((eq age 'old)
+ 'newsticker-treeview-old-face)
+ ((eq age 'immortal)
+ 'newsticker-treeview-immortal-face)
+ ((eq age 'obsolete)
+ 'newsticker-treeview-obsolete-face)
+ (t
+ 'bold))))
+ (put-text-property (point) pos 'face face)
+ (if selected
+ (move-overlay newsticker--selection-overlay (point)
+ (1+ pos) ;include newline
+ (current-buffer)))
+ (if selected (setq pos-sel (point)))
+ (forward-line 1)
+ (beginning-of-line)))))) ;; FIXME!?
(when pos-sel
(if (window-live-p (newsticker--treeview-list-window))
(set-window-point (newsticker--treeview-list-window) pos-sel)))))
(let (pos num-lines)
(with-current-buffer (newsticker--treeview-list-buffer)
(let ((inhibit-read-only t))
- (put-text-property (save-excursion (beginning-of-line) (point))
- (save-excursion (end-of-line) (point))
- :nt-selected t))
+ (put-text-property (point-at-bol) (point-at-eol) :nt-selected t))
(newsticker--treeview-list-update-faces))))
(defun newsticker--treeview-list-highlight-start ()
"Return position of selection in treeview list buffer."
(with-current-buffer (newsticker--treeview-list-buffer)
- (goto-char (point-min))
- (next-single-property-change (point) :nt-selected)))
+ (save-excursion
+ (goto-char (point-min))
+ (next-single-property-change (point) :nt-selected))))
(defun newsticker--treeview-list-update (clear-buffer)
"Update the faces and highlight in the treeview list buffer.
'face face
'keymap newsticker-treeview-list-sort-button-map)))
+(defun newsticker--treeview-list-select (item)
+ "Select ITEM in treeview's list buffer."
+ (newsticker--treeview-list-clear-highlight)
+ (let (pos num-lines)
+ (save-current-buffer
+ (set-buffer (newsticker--treeview-list-buffer))
+ (goto-char (point-min))
+ (catch 'found
+ (while t
+ (let ((it (get-text-property (point) :nt-item)))
+ (when (eq it item)
+ (newsticker--treeview-list-update-highlight)
+ (newsticker--treeview-list-update-faces)
+ (newsticker--treeview-item-show
+ item (get-text-property (point) :nt-feed))
+ (throw 'found t)))
+ (forward-line 1)
+ (when (eobp)
+ (goto-char (point-min))
+ (throw 'found nil)))))))
+
;; ======================================================================
;;; item window
;; ======================================================================
(insert "\n\n" description)
(when newsticker-justification
(fill-region (point-min) (point-max) newsticker-justification))
- (newsticker-treeview-mode)
+ (newsticker-treeview-item-mode)
(goto-char (point-min)))))
(defun newsticker--treeview-item-show (item feed-name-symbol)
(not is-rendered-HTML))
(fill-region marker1 marker2 newsticker-justification))
- (newsticker-treeview-mode)
+ (newsticker-treeview-item-mode)
(goto-char (point-min))
;; insert logo at top
(let* ((newsticker-enable-logo-manipulations nil)
(set-buffer (newsticker--treeview-item-buffer))
(let ((inhibit-read-only t))
(erase-buffer))
- (newsticker-treeview-mode)))
+ (newsticker-treeview-item-mode)))
;; ======================================================================
;;; Tree window
(with-current-buffer (newsticker--treeview-tree-buffer)
(goto-char pos)
(move-overlay newsticker--tree-selection-overlay
- (save-excursion (beginning-of-line) (point))
- (save-excursion (end-of-line) (1+ (point)))
+ (point-at-bol) (1+ (point-at-eol))
(current-buffer)))
(if (window-live-p (newsticker--treeview-tree-window))
(set-window-point (newsticker--treeview-tree-window) pos)))))
"Update all treeview buffers and windows.
Note: does not update the layout."
(interactive)
- (newsticker--group-manage-orphan-feeds)
- (newsticker--treeview-list-update t)
- (newsticker--treeview-item-update)
- (newsticker--treeview-tree-update-tags)
- (cond (newsticker--treeview-current-feed
- (newsticker--treeview-list-items newsticker--treeview-current-feed))
- (newsticker--treeview-current-vfeed
- (newsticker--treeview-list-items-with-age
- (intern newsticker--treeview-current-vfeed))))
- (newsticker--treeview-tree-update-highlight)
- (newsticker--treeview-list-update-highlight))
+ (let ((cur-item (newsticker--treeview-get-selected-item)))
+ (newsticker--group-manage-orphan-feeds)
+ (newsticker--treeview-list-update t)
+ (newsticker--treeview-item-update)
+ (newsticker--treeview-tree-update-tags)
+ (cond (newsticker--treeview-current-feed
+ (newsticker--treeview-list-items newsticker--treeview-current-feed))
+ (newsticker--treeview-current-vfeed
+ (newsticker--treeview-list-items-with-age
+ (intern newsticker--treeview-current-vfeed))))
+ (newsticker--treeview-tree-update-highlight)
+ (newsticker--treeview-list-update-highlight)
+ (let ((cur-feed (or newsticker--treeview-current-feed
+ newsticker--treeview-current-vfeed)))
+ (if (and cur-feed cur-item)
+ (newsticker--treeview-list-select cur-item)))))
(defun newsticker-treeview-quit ()
"Quit newsticker treeview."
"Move to next new or immortal item.
Will move to next feed until an item is found. Will not move if
optional argument CURRENT-ITEM-COUNTS is t and current item is
-new or immortal."
+new or immortal. Will not move from virtual to ordinary feed
+tree or vice versa if optional argument DONT-WRAP-TREES is non-nil."
(interactive)
(newsticker--treeview-restore-layout)
(newsticker--treeview-list-clear-highlight)
(widget-apply-action node)))))
(defun newsticker--treeview-first-feed ()
- "Jump to the depth-first feed in the newsticker-groups tree."
+ "Jump to the depth-first feed in the `newsticker-groups' tree."
(newsticker-treeview-jump
(car (reverse (newsticker--group-get-feeds newsticker-groups t)))))
(define-key menu [newsticker-treeview-mark-list-items-old]
(list 'menu-item "Mark all items old"
'newsticker-treeview-mark-list-items-old))
+ (define-key menu [newsticker-treeview-mark-item-old]
+ (list 'menu-item "Mark current item old"
+ 'newsticker-treeview-mark-item-old))
+ (define-key menu [newsticker-treeview-toggle-item-immortal]
+ (list 'menu-item "Mark current item immortal (toggle)"
+ 'newsticker-treeview-toggle-item-immortal))
+ (define-key menu [newsticker-treeview-get-news]
+ (list 'menu-item "Get news for current feed"
+ 'newsticker-treeview-get-news))
+ menu)
+ "Map for newsticker list menu.")
+
+(defvar newsticker-treeview-item-menu
+ (let ((menu (make-sparse-keymap "Newsticker Item")))
+ (define-key menu [newsticker-treeview-mark-item-old]
+ (list 'menu-item "Mark current item old"
+ 'newsticker-treeview-mark-item-old))
+ (define-key menu [newsticker-treeview-toggle-item-immortal]
+ (list 'menu-item "Mark current item immortal (toggle)"
+ 'newsticker-treeview-toggle-item-immortal))
+ (define-key menu [newsticker-treeview-get-news]
+ (list 'menu-item "Get news for current feed"
+ 'newsticker-treeview-get-news))
menu)
- "Map for newsticker tree menu.")
+ "Map for newsticker item menu.")
(defvar newsticker-treeview-mode-map
(let ((map (make-sparse-keymap 'newsticker-treeview-mode-map)))
(define-key newsticker-treeview-list-mode-map [down-mouse-3]
newsticker-treeview-list-menu))
+(define-derived-mode newsticker-treeview-item-mode newsticker-treeview-mode
+ "Item"
+ (define-key newsticker-treeview-item-mode-map [down-mouse-3]
+ newsticker-treeview-item-menu))
+
(defun newsticker-treeview-tree-click (event)
"Handle click EVENT on a tag in the newsticker tree."
(interactive "e")
(when newsticker--treeview-current-feed
(newsticker-get-news newsticker--treeview-current-feed)))
-(provide 'newsticker-treeview)
+(provide 'newst-treeview)
-;; arch-tag: 5dbaff48-1f3e-4fc6-8ebd-e966fc90d2d4
;;; newst-treeview.el ends here