X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-display.el;h=f675e991e803b7a7dbd5ef744a28eaf9d516392a;hb=f88a663c1b379044573897f6f2ae44e5f5172ed6;hp=8ddf882d1c876f7cc0f7b5d9e0d02ee4747644b5;hpb=d44bc59776f059686a3588f8a99be255d606c9e4;p=riece diff --git a/lisp/riece-display.el b/lisp/riece-display.el index 8ddf882..f675e99 100644 --- a/lisp/riece-display.el +++ b/lisp/riece-display.el @@ -29,67 +29,85 @@ (require 'riece-misc) (require 'riece-layout) -(defvar riece-update-buffer-functions - '(riece-update-user-list-buffer - riece-update-channel-list-buffer - riece-update-status-indicators - riece-update-channel-indicator - riece-update-short-channel-indicator - riece-update-channel-list-indicator)) +(defvar riece-channel-buffer-format "*Channel:%s*" + "Format of channel message buffer.") +(defvar riece-channel-buffer-alist nil + "An alist mapping identities to channel buffers.") -(defvar riece-channel-list-changed nil) +(defvar riece-update-buffer-functions nil + "Functions to redisplay the buffer. +Local to the buffer in `riece-buffer-list'.") + +(defvar riece-update-indicator-functions + '(riece-update-status-indicators + riece-update-channel-indicator + riece-update-long-channel-indicator + riece-update-channel-list-indicator) + "Functions to update modeline indicators.") (defun riece-update-user-list-buffer () (save-excursion (set-buffer riece-user-list-buffer) - (when (and riece-current-channel - (riece-channel-p (riece-identity-prefix riece-current-channel))) - (let (users operators speakers) - (with-current-buffer (process-buffer (riece-server-process - (riece-identity-server - riece-current-channel))) - (setq users - (riece-channel-get-users - (riece-identity-prefix riece-current-channel)) - operators - (riece-channel-get-operators - (riece-identity-prefix riece-current-channel)) - speakers - (riece-channel-get-speakers - (riece-identity-prefix riece-current-channel)))) - (let ((inhibit-read-only t) - buffer-read-only) + (if (and riece-current-channel + (riece-channel-p (riece-identity-prefix riece-current-channel))) + (let* ((users + (with-current-buffer (process-buffer (riece-server-process + (riece-identity-server + riece-current-channel))) + (riece-channel-get-users (riece-identity-prefix + riece-current-channel)))) + (inhibit-read-only t) + buffer-read-only) (erase-buffer) + (riece-kill-all-overlays) (while users - (if (member (car users) operators) - (insert "@" (car users) "\n") - (if (member (car users) speakers) - (insert "+" (car users) "\n") - (insert " " (car users) "\n"))) - (setq users (cdr users)))))))) + (insert (if (memq ?o (cdr (car users))) + "@" + (if (memq ?v (cdr (car users))) + "+" + " ")) + (riece-format-identity + (riece-make-identity (car (car users)) + (riece-identity-server + riece-current-channel)) + t) + "\n") + (setq users (cdr users))))))) (defun riece-update-channel-list-buffer () - (if riece-channel-list-changed - (save-excursion - (set-buffer riece-channel-list-buffer) - (let ((inhibit-read-only t) - buffer-read-only - (index 1) - (channels riece-current-channels)) - (erase-buffer) - (while channels - (if (car channels) - (let ((point (point))) - (insert (format "%2d: %s\n" index - (riece-format-identity (car channels)))) - (put-text-property point (point) 'riece-identity - (car channels)))) - (setq index (1+ index) - channels (cdr channels)))) - (setq riece-channel-list-changed nil)))) + (save-excursion + (set-buffer riece-channel-list-buffer) + (let ((inhibit-read-only t) + buffer-read-only + (index 1) + (channels riece-current-channels)) + (erase-buffer) + (riece-kill-all-overlays) + (while channels + (if (car channels) + (insert (riece-format-channel-list-line + index (car channels)))) + (setq index (1+ index) + channels (cdr channels)))))) + +(defun riece-format-channel-list-line (index channel) + (or (run-hook-with-args-until-success + 'riece-format-channel-list-line-functions index channel) + (concat (format "%2d:%c" index + (if (riece-identity-equal channel riece-current-channel) + ?* + ? )) + (riece-format-identity channel) + "\n"))) (defun riece-update-channel-indicator () (setq riece-channel-indicator + (if riece-current-channel + (riece-format-identity riece-current-channel) + "None"))) + +(defun riece-update-long-channel-indicator () + (setq riece-long-channel-indicator (if riece-current-channel (if (riece-channel-p (riece-identity-prefix riece-current-channel)) (riece-concat-channel-modes @@ -100,32 +118,25 @@ (riece-format-identity riece-current-channel)) "None"))) -(defun riece-update-short-channel-indicator () - (setq riece-short-channel-indicator - (if riece-current-channel - (riece-format-identity riece-current-channel) - "None"))) - (defun riece-update-channel-list-indicator () - (if riece-channel-list-changed - (if (and riece-current-channels - ;; There is at least one channel. - (delq nil (copy-sequence riece-current-channels))) - (let ((index 1)) - (setq riece-channel-list-indicator - (mapconcat - #'identity - (delq nil - (mapcar - (lambda (channel) - (prog1 - (if channel - (format "%d:%s" index - (riece-format-identity channel))) - (setq index (1+ index)))) - riece-current-channels)) - ","))) - (setq riece-channel-list-indicator "No channel")))) + (if (and riece-current-channels + ;; There is at least one channel. + (delq nil (copy-sequence riece-current-channels))) + (let ((index 1)) + (setq riece-channel-list-indicator + (mapconcat + #'identity + (delq nil + (mapcar + (lambda (channel) + (prog1 + (if channel + (format "%d:%s" index + (riece-format-identity channel))) + (setq index (1+ index)))) + riece-current-channels)) + ","))) + (setq riece-channel-list-indicator "No channel"))) (defun riece-update-status-indicators () (if riece-current-channel @@ -153,21 +164,35 @@ "F" "-"))))) -(defun riece-update-buffers () - (if riece-current-channel - (setq riece-channel-buffer (get-buffer (riece-channel-buffer-name - riece-current-channel)))) - (run-hooks 'riece-update-buffer-functions) - (force-mode-line-update t)) +(defun riece-update-buffers (&optional buffers) + (unless buffers + (setq buffers riece-buffer-list)) + (while buffers + (save-excursion + (set-buffer (car buffers)) + (run-hooks 'riece-update-buffer-functions)) + (setq buffers (cdr buffers))) + (run-hooks 'riece-update-indicator-functions) + (force-mode-line-update t) + (run-hooks 'riece-update-buffer-hook)) (defun riece-channel-buffer-name (identity) - (format riece-channel-buffer-format (riece-format-identity identity))) + (let ((channels (riece-identity-member identity riece-current-channels))) + (if channels + (setq identity (car channels)) + (if riece-debug + (message "%S is not a member of riece-current-channels" identity))) + (format riece-channel-buffer-format (riece-format-identity identity)))) (eval-when-compile (autoload 'riece-channel-mode "riece")) (defun riece-channel-buffer-create (identity) (with-current-buffer - (riece-get-buffer-create (riece-channel-buffer-name identity)) + (riece-get-buffer-create (riece-channel-buffer-name identity) + 'riece-channel-mode) + (setq riece-channel-buffer-alist + (cons (cons identity (current-buffer)) + riece-channel-buffer-alist)) (unless (eq major-mode 'riece-channel-mode) (riece-channel-mode) (let (buffer-read-only) @@ -179,9 +204,13 @@ (run-hook-with-args 'riece-channel-buffer-create-functions identity))) (current-buffer))) +(defun riece-channel-buffer (identity) + (cdr (riece-identity-assoc identity riece-channel-buffer-alist))) + (defun riece-switch-to-channel (identity) (let ((last riece-current-channel)) - (setq riece-current-channel identity) + (setq riece-current-channel identity + riece-channel-buffer (riece-channel-buffer riece-current-channel)) (run-hook-with-args 'riece-after-switch-to-channel-functions last))) (defun riece-join-channel (identity) @@ -194,8 +223,7 @@ (if channel (riece-parse-identity channel))) riece-default-channel-binding))) - (riece-channel-buffer-create identity) - (setq riece-channel-list-changed t))) + (riece-channel-buffer-create identity))) (defun riece-switch-to-nearest-channel (pointer) (let ((start riece-current-channels) @@ -220,8 +248,7 @@ (if pointer (setcar pointer nil)) (if (riece-identity-equal identity riece-current-channel) - (riece-switch-to-nearest-channel pointer)) - (setq riece-channel-list-changed t))) + (riece-switch-to-nearest-channel pointer)))) (defun riece-redisplay-buffers (&optional force) (riece-update-buffers)