(require 'riece-options)
(require 'riece-channel)
(require 'riece-misc)
+(require 'riece-layout)
-(defvar riece-update-buffer-functions
- '(riece-user-list-update-buffer
- riece-channel-list-update-buffer
- riece-update-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.")
-(defcustom riece-configure-windows-function #'riece-configure-windows
- "Function to configure windows."
- :type 'function
- :group 'riece-looks)
+(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-configure-windows ()
- (let ((buffer (current-buffer))
- (show-user-list
- (and riece-user-list-buffer-mode
- riece-current-channel
- ;; User list buffer is nuisance for private conversation.
- (riece-channel-p riece-current-channel))))
- (delete-other-windows)
+(defun riece-update-user-list-buffer ()
+ (save-excursion
+ (set-buffer riece-user-list-buffer)
(if (and riece-current-channel
- (or show-user-list riece-channel-list-buffer-mode))
- (let ((rest-window (split-window (selected-window)
- (/ (window-width) 5) t)))
- (if (and show-user-list riece-channel-list-buffer-mode)
- (progn
- (set-window-buffer (split-window)
- riece-channel-list-buffer)
- (set-window-buffer (selected-window)
- riece-user-list-buffer))
- (if show-user-list
- (set-window-buffer (selected-window)
- riece-user-list-buffer)
- (if riece-channel-list-buffer-mode
- (set-window-buffer (selected-window)
- riece-channel-list-buffer))))
- (select-window rest-window)))
- (if (and riece-current-channel
- riece-channel-buffer-mode)
- (let ((rest-window (split-window)))
- (set-window-buffer (selected-window)
- riece-channel-buffer)
- (set-window-buffer (split-window rest-window 4)
- riece-others-buffer)
- (with-current-buffer riece-channel-buffer
- (setq truncate-partial-width-windows nil))
- (with-current-buffer riece-others-buffer
- (setq truncate-partial-width-windows nil))
- (set-window-buffer rest-window
- riece-command-buffer))
- (set-window-buffer (split-window (selected-window) 4)
- riece-dialogue-buffer)
- (set-window-buffer (selected-window)
- riece-command-buffer))
- (riece-set-window-points)
- (select-window (or (get-buffer-window buffer)
- (get-buffer-window riece-command-buffer)))))
-
-(defun riece-set-window-points ()
- (if (and riece-user-list-buffer
- (get-buffer-window riece-user-list-buffer))
- (with-current-buffer riece-user-list-buffer
- (unless (riece-frozen riece-user-list-buffer)
- (set-window-start (get-buffer-window riece-user-list-buffer)
- (point-min)))))
- (if (get-buffer-window riece-channel-list-buffer)
- (with-current-buffer riece-channel-list-buffer
- (unless (riece-frozen riece-channel-list-buffer)
- (set-window-start (get-buffer-window riece-channel-list-buffer)
- (point-min))))))
+ (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)
+ (while 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-user-list-update-buffer ()
- (if (get-buffer riece-user-list-buffer)
- (save-excursion
- (set-buffer riece-user-list-buffer)
- (when (and riece-current-channel
- (riece-channel-p riece-current-channel))
- (let ((inhibit-read-only t)
- buffer-read-only
- (users (riece-channel-get-users riece-current-channel))
- (operators (riece-channel-get-operators riece-current-channel))
- (speakers (riece-channel-get-speakers riece-current-channel)))
- (erase-buffer)
- (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))))))))
+(defun riece-update-channel-list-buffer ()
+ (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)
+ (insert (riece-format-channel-list-line
+ index (car channels))))
+ (setq index (1+ index)
+ channels (cdr channels))))))
-(defun riece-channel-list-update-buffer ()
- (if (get-buffer riece-channel-list-buffer)
- (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)
- (insert (format "%2d:%s\n" 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")))
-(defsubst riece-update-channel-indicator ()
+(defun riece-update-channel-indicator ()
(setq riece-channel-indicator
(if riece-current-channel
- (riece-concat-current-channel-modes
- (if (and riece-current-channel
- (riece-channel-p riece-current-channel)
- (riece-channel-get-topic riece-current-channel))
- (concat riece-current-channel ": "
- (riece-channel-get-topic riece-current-channel))
- riece-current-channel))
- "None"))
- (with-current-buffer riece-command-buffer
- (force-mode-line-update)))
+ (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
+ riece-current-channel
+ (riece-concat-channel-topic
+ riece-current-channel
+ (riece-format-identity riece-current-channel)))
+ (riece-format-identity riece-current-channel))
+ "None")))
(defun riece-update-channel-list-indicator ()
(if (and riece-current-channels
(delq nil
(mapcar
(lambda (channel)
- (prog1 (if channel
- (format "%d:%s" index 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-buffers ()
- (run-hooks 'riece-update-buffer-functions)
- (force-mode-line-update t))
+(defun riece-update-status-indicators ()
+ (if riece-current-channel
+ (with-current-buffer riece-command-buffer
+ (riece-with-server-buffer (riece-identity-server riece-current-channel)
+ (setq riece-away-indicator
+ (if (and riece-real-nickname
+ (riece-user-get-away riece-real-nickname))
+ "A"
+ "-")
+ riece-operator-indicator
+ (if (and riece-real-nickname
+ (riece-user-get-operator riece-real-nickname))
+ "O"
+ "-")
+ riece-user-indicator riece-real-nickname))))
+ (setq riece-freeze-indicator
+ (with-current-buffer (if (and riece-channel-buffer-mode
+ riece-channel-buffer)
+ riece-channel-buffer
+ riece-dialogue-buffer)
+ (if (eq riece-freeze 'own)
+ "f"
+ (if riece-freeze
+ "F"
+ "-")))))
+
+(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)
+ (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 (format riece-channel-buffer-format 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)
(concat "Created on "
(funcall riece-format-time-function
(current-time))
- "\n"))))
+ "\n"))
+ (run-hook-with-args 'riece-channel-buffer-create-functions identity)))
(current-buffer)))
-(eval-when-compile
- (autoload 'riece-user-list-mode "riece"))
-(defun riece-user-list-buffer-create (identity)
- (with-current-buffer
- (riece-get-buffer-create (format riece-user-list-buffer-format identity))
- (unless (eq major-mode 'riece-user-list-mode)
- (riece-user-list-mode))
- (current-buffer)))
+(defun riece-channel-buffer (identity)
+ (cdr (riece-identity-assoc identity riece-channel-buffer-alist)))
(defun riece-switch-to-channel (identity)
- (setq riece-last-channel riece-current-channel
- riece-current-channel identity
- riece-channel-buffer
- (cdr (riece-identity-assoc-no-server
- identity riece-channel-buffer-alist))
- riece-user-list-buffer
- (cdr (riece-identity-assoc-no-server
- identity riece-user-list-buffer-alist))))
+ (let ((last riece-current-channel))
+ (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 (channel-name)
- (let ((identity (riece-make-identity channel-name)))
- (unless (riece-identity-member-no-server
- identity riece-current-channels)
- (setq riece-current-channels
- (riece-identity-assign-binding
- identity riece-current-channels
- riece-default-channel-binding)))
- (unless (riece-identity-assoc-no-server
- identity riece-channel-buffer-alist)
- (let ((buffer (riece-channel-buffer-create identity)))
- (setq riece-channel-buffer-alist
- (cons (cons identity buffer)
- riece-channel-buffer-alist))))
- (unless (riece-identity-assoc-no-server
- identity riece-user-list-buffer-alist)
- (let ((buffer (riece-user-list-buffer-create identity)))
- (setq riece-user-list-buffer-alist
- (cons (cons identity buffer)
- riece-user-list-buffer-alist))))))
+(defun riece-join-channel (identity)
+ (unless (riece-identity-member identity riece-current-channels)
+ (setq riece-current-channels
+ (riece-identity-assign-binding
+ identity riece-current-channels
+ (mapcar
+ (lambda (channel)
+ (if channel
+ (riece-parse-identity channel)))
+ riece-default-channel-binding)))
+ (riece-channel-buffer-create identity)))
(defun riece-switch-to-nearest-channel (pointer)
(let ((start riece-current-channels)
(setq identity (car pointer)))
(if identity
(riece-switch-to-channel identity)
- (setq riece-last-channel riece-current-channel
- riece-current-channel nil))))
+ (let ((last riece-current-channel))
+ (run-hook-with-args 'riece-after-switch-to-channel-functions last)
+ (setq riece-current-channel nil)))))
-(defun riece-part-channel (channel-name)
- (let* ((identity (riece-make-identity channel-name))
- (pointer (riece-identity-member-no-server
- identity riece-current-channels)))
+(defun riece-part-channel (identity)
+ (let ((pointer (riece-identity-member identity riece-current-channels)))
(if pointer
(setcar pointer nil))
- ;;XXX
- (if (riece-identity-equal-no-server identity riece-current-channel)
+ (if (riece-identity-equal identity riece-current-channel)
(riece-switch-to-nearest-channel pointer))))
(defun riece-redisplay-buffers (&optional force)
(riece-update-buffers)
- (if (or force
- ;; The current channel is changed, and some buffers are visible.
- (unless (equal riece-last-channel riece-current-channel)
- (let ((buffers riece-buffer-list))
- (catch 'found
- (while buffers
- (if (and (buffer-live-p (car buffers))
- (get-buffer-window (car buffers)))
- (throw 'found t)
- (setq buffers (cdr buffers))))))))
- (funcall riece-configure-windows-function)))
+ (riece-redraw-layout force)
+ (run-hooks 'riece-redisplay-buffers-hook))
(provide 'riece-display)
+
+;;; riece-display.el ends here
projects / riece / blobdiff