X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-unread.el;h=64bb382e588e7eb0a9b6d2385bfc3bee7c946684;hp=5c7ad7f60748ee95cdcd0ac3510029d808cf15fb;hb=1a81aa31cd21424720b8a59283ab1d01ae181f73;hpb=75b7883184690a5c31dd12091b73517e42967c4f

diff --git a/lisp/riece-unread.el b/lisp/riece-unread.el
index 5c7ad7f..64bb382 100644
--- a/lisp/riece-unread.el
+++ b/lisp/riece-unread.el
@@ -23,26 +23,56 @@
 
 ;;; Commentary:
 
-;; This add-on displays unread mark ("!") for channels which have
-;; "unread messages".
+;; This add-on marks channels where new messages are arrived.
 
-;; To use, add the following line to your ~/.riece/init.el:
-;; (add-to-list 'riece-addons 'riece-unread t)
+;; You can check the unread channels via `C-c g' in the commands
+;; buffer, by adding the following lines to ~/.riece/init.el:
+
+;;   (add-hook 'riece-guess-channel-try-functions
+;;             'riece-guess-channel-from-unread)
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-message))
+(require 'riece-message)
+(require 'riece-commands)
+
+(eval-when-compile (require 'riece-highlight))
+
+(defgroup riece-unread nil
+  "Mark unread channels"
+  :tag "Unread"
+  :prefix "riece-"
+  :group 'riece)
+
+(defcustom riece-channel-list-unread-face 'riece-channel-list-unread-face
+  "Face used for displaying unread channels."
+  :type 'face
+  :group 'riece-highlight-faces)
+
+(defface riece-channel-list-unread-face
+  '((((class color)
+      (background dark))
+     (:foreground "orange"))
+    (((class color)
+      (background light))
+     (:foreground "firebrick"))
+    (t
+     (:bold t)))
+  "Face used for displaying unread channels."
+  :group 'riece-highlight-faces)
 
 (defvar riece-unread-channels nil)
 
-(defun riece-unread-display-message-function (message)
+(defun riece-unread-after-display-message-function (message)
   (unless (or (riece-message-own-p message)
 	      (equal (riece-message-target message) riece-current-channel))
+    (setq riece-unread-channels
+	  (delete (riece-message-target message) riece-unread-channels))
     (add-to-list 'riece-unread-channels
 		 (riece-message-target message))
     (riece-unread-update-channel-list-buffer)))
 
-(defun riece-unread-channel-switch-hook ()
+(defun riece-unread-after-switch-to-channel-function (last)
   (setq riece-unread-channels
 	(delete riece-current-channel
 		riece-unread-channels))
@@ -56,23 +86,59 @@
 	      buffer-read-only)
 	  (goto-char (point-min))
 	  (while (not (eobp))
-	    (if (looking-at "\\( ?[0-9]+:\\)\\([ !]\\)\\(.+\\)")
-		(let ((channel (match-string 3)))
+	    (if (looking-at "\\( ?[0-9]+:\\)\\(.\\)\\(.+\\)")
+		(let ((channel (save-match-data
+				 (riece-parse-identity (match-string 3)))))
 		  (replace-match
 		   (concat "\\1"
 			   (if (member channel riece-unread-channels)
 			       "!"
-			     " ")
+			     "\\2")
 			   "\\3"))))
 	    (forward-line))))))
       
+(defun riece-unread-switch-to-channel ()
+  (interactive)
+  (if (car riece-unread-channels)
+      (riece-command-switch-to-channel (car riece-unread-channels))
+    (error "No unread channel!")))
+
+(defun riece-guess-channel-from-unread ()
+  riece-unread-channels)
+
+(defvar riece-command-mode-map)
+(defvar riece-dialogue-mode-map)
+(defvar riece-channel-list-mode-map)
+
+(defun riece-unread-requires ()
+  (let (requires)
+    (if (memq 'riece-highlight riece-addons)
+	(setq requires (cons 'riece-highlight requires)))
+;;;    (if (memq 'riece-guess riece-addons)
+;;;	(setq requires (cons 'riece-guess requires)))
+    requires))
+
 (defun riece-unread-insinuate ()
   (add-hook 'riece-after-display-message-functions
-	    'riece-unread-display-message-function)
-  (add-hook 'riece-channel-switch-hook
-	    'riece-unread-channel-switch-hook)
-  (add-hook 'riece-update-buffers-hook
-	    'riece-unread-update-channel-list-buffer))
+	    'riece-unread-after-display-message-function)
+  (add-hook 'riece-after-switch-to-channel-functions
+	    'riece-unread-after-switch-to-channel-function)
+  (add-hook 'riece-update-buffer-functions
+	    'riece-unread-update-channel-list-buffer t)
+  (define-key riece-command-mode-map
+    "\C-c\C-u" 'riece-unread-switch-to-channel)
+  (define-key riece-dialogue-mode-map
+    "u" 'riece-unread-switch-to-channel)
+  (define-key riece-channel-list-mode-map
+    "u" 'riece-unread-switch-to-channel)
+  (if (memq 'riece-highlight riece-addons)
+      (setq riece-channel-list-mark-face-alist
+	    (cons '(?! . riece-channel-list-unread-face)
+		  riece-channel-list-mark-face-alist)))
+;;;  (if (memq 'riece-guess riece-addons)
+;;;      (add-hook 'riece-guess-channel-try-functions
+;;;		'riece-guess-channel-from-unread))
+  )
 
 (provide 'riece-unread)