(require 'riece-message)
(require 'riece-commands)
+(require 'riece-signal)
(eval-when-compile (require 'riece-highlight))
:group 'riece-highlight-faces)
(defvar riece-channel-list-unread-face 'riece-channel-list-unread-face)
+(unless (riece-facep 'riece-modeline-unread-face)
+ (make-face 'riece-modeline-unread-face
+ "Face used for displaying unread channels in modeline.")
+ (if (featurep 'xemacs)
+ (set-face-parent 'riece-modeline-unread-face 'modeline))
+ (set-face-foreground 'riece-modeline-unread-face
+ (face-foreground 'riece-channel-list-unread-face)))
+
(defvar riece-unread-channels nil)
+(defvar riece-unread-enabled nil)
+
+(defconst riece-unread-description
+ "Mark channels where \"unread\" messages arrived")
+
(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
- (cons (riece-message-target message)
- (delete (riece-message-target message) riece-unread-channels)))
- (riece-unread-update-channel-list-buffer)))
+ (if riece-unread-enabled
+ (let ((target (if (riece-message-private-p message)
+ (riece-message-speaker message)
+ (riece-message-target message))))
+ (unless (or (riece-message-own-p message)
+ (riece-message-type message)
+ (riece-identity-equal target riece-current-channel)
+ (riece-identity-member target riece-unread-channels))
+ (setq riece-unread-channels (cons target riece-unread-channels))
+ (riece-emit-signal 'channel-list-changed)))))
(defun riece-unread-after-switch-to-channel-function (last)
- (setq riece-unread-channels
- (delete riece-current-channel
- riece-unread-channels))
- (riece-unread-update-channel-list-buffer))
-
-(defun riece-unread-update-channel-list-buffer ()
- (if riece-channel-list-buffer-mode
- (save-excursion
- (set-buffer riece-channel-list-buffer)
- (let ((inhibit-read-only t)
- buffer-read-only)
- (goto-char (point-min))
- (while (not (eobp))
- (if (looking-at "\\( ?[0-9]+:\\)\\(.\\)")
- (let ((channel (get-text-property (match-end 0)
- 'riece-identity)))
- (replace-match
- (concat "\\1"
- (if (riece-identity-member channel
- riece-unread-channels)
- "!"
- "\\2")))))
- (forward-line))))))
-
+ (if riece-unread-enabled
+ (setq riece-unread-channels
+ (delq (car (riece-identity-member riece-current-channel
+ riece-unread-channels))
+ riece-unread-channels))))
+
+(defun riece-unread-format-identity-for-channel-list-buffer (index identity)
+ (if (and riece-unread-enabled
+ (riece-identity-member identity riece-unread-channels))
+ (concat (format "%2d:!" index)
+ (riece-format-identity identity))))
+
+(defun riece-unread-format-identity-for-channel-list-indicator (index identity)
+ (if (and riece-unread-enabled
+ (riece-identity-member identity riece-unread-channels))
+ (let ((string (riece-format-identity identity))
+ (start 0))
+ ;; Escape % -> %%.
+ (while (string-match "%" string start)
+ (setq start (1+ (match-end 0))
+ string (replace-match "%%" nil nil string)))
+ (list (format "%d:" index)
+ (riece-propertize-modeline-string
+ string 'face 'riece-modeline-unread-face)))))
+
(defun riece-unread-switch-to-channel ()
(interactive)
- (if (car riece-unread-channels)
- (riece-command-switch-to-channel (car riece-unread-channels))
+ (if riece-unread-channels
+ (let ((channel (car riece-unread-channels)))
+ (if (riece-identity-member channel riece-current-channels)
+ (riece-command-switch-to-channel channel)
+ (setq riece-unread-channels
+ (delete channel riece-unread-channels))
+ (riece-unread-switch-to-channel)))
(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)
'riece-unread-after-display-message-function)
(add-hook 'riece-after-switch-to-channel-functions
'riece-unread-after-switch-to-channel-function)
- (add-hook 'riece-channel-list-mode-hook
- (lambda ()
- (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)
+ (add-hook 'riece-format-identity-for-channel-list-buffer-functions
+ 'riece-unread-format-identity-for-channel-list-buffer)
+ (add-hook 'riece-format-identity-for-channel-list-indicator-functions
+ 'riece-unread-format-identity-for-channel-list-indicator)
(if (memq 'riece-highlight riece-addons)
(setq riece-channel-list-mark-face-alist
(cons '(?! . riece-channel-list-unread-face)
;;; 'riece-guess-channel-from-unread))
)
+(defvar riece-command-mode-map)
+(defvar riece-dialogue-mode-map)
+(defvar riece-channel-list-mode-map)
+(defun riece-unread-enable ()
+ (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)
+ (setq riece-unread-enabled t)
+ (riece-emit-signal 'channel-list-changed))
+
+(defun riece-unread-disable ()
+ (define-key riece-command-mode-map
+ "\C-c\C-u" nil)
+ (define-key riece-dialogue-mode-map
+ "u" nil)
+ (define-key riece-channel-list-mode-map
+ "u" nil)
+ (setq riece-unread-channels nil
+ riece-unread-enabled nil)
+ (riece-emit-signal 'channel-list-changed))
+
(provide 'riece-unread)
;;; riece-unread.el ends here
projects / riece / blobdiff