(require 'riece-options)
(require 'riece-channel)
(require 'riece-misc)
-
-(defcustom riece-configure-windows-function #'riece-configure-windows
- "Function to configure windows."
- :type 'function
- :group 'riece-looks)
-
-(defcustom riece-configure-windows-predicate
- #'riece-configure-windows-predicate
- "Function to check whether window reconfiguration is needed."
- :type 'function
- :group 'riece-looks)
+(require 'riece-layout)
(defvar riece-update-buffer-functions
'(riece-update-user-list-buffer
riece-update-short-channel-indicator
riece-update-channel-list-indicator))
-(defvar riece-redisplay-buffer nil
- "Non-nil means the buffer needs to be updated.
-Local to the buffers.")
-
-(defun riece-configure-windows ()
- (let ((buffer (window-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-identity-prefix
- riece-current-channel)))))
- ;; Can't expand minibuffer to full frame.
- (if (eq (selected-window) (minibuffer-window))
- (other-window 1))
- (delete-other-windows)
- (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 (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))))))
+(defvar riece-channel-list-changed nil)
(defun riece-update-user-list-buffer ()
(save-excursion
(set-buffer riece-user-list-buffer)
- (when (and riece-redisplay-buffer
- riece-current-channel
+ (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
(if (member (car users) speakers)
(insert "+" (car users) "\n")
(insert " " (car users) "\n")))
- (setq users (cdr users)))))
- (setq riece-redisplay-buffer nil))))
+ (setq users (cdr users))))))))
(defun riece-update-channel-list-buffer ()
- (save-excursion
- (set-buffer riece-channel-list-buffer)
- (when riece-redisplay-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-redisplay-buffer nil))))
+ (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: " index)
+ (riece-format-identity (car channels))
+ "\n")))
+ (setq index (1+ index)
+ channels (cdr channels)))))))
(defun riece-update-channel-indicator ()
(setq riece-channel-indicator
"None")))
(defun riece-update-channel-list-indicator ()
- (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 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"))))
(defun riece-update-status-indicators ()
(if riece-current-channel
(setq riece-channel-buffer (get-buffer (riece-channel-buffer-name
riece-current-channel))))
(run-hooks 'riece-update-buffer-functions)
+ (setq riece-channel-list-changed nil)
(force-mode-line-update t))
(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"))
(current-buffer)))
(defun riece-switch-to-channel (identity)
- (setq riece-last-channel riece-current-channel
- riece-current-channel identity)
- (with-current-buffer riece-user-list-buffer
- (setq riece-redisplay-buffer t))
- (run-hooks 'riece-channel-switch-hook))
+ (let ((last riece-current-channel))
+ (setq riece-current-channel identity)
+ (run-hook-with-args 'riece-after-switch-to-channel-functions last)))
(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
- riece-default-channel-binding))
+ (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)
- (with-current-buffer riece-channel-list-buffer
- (setq riece-redisplay-buffer t))))
+ (setq riece-channel-list-changed t)))
(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 (identity)
(let ((pointer (riece-identity-member identity riece-current-channels)))
(setcar pointer nil))
(if (riece-identity-equal identity riece-current-channel)
(riece-switch-to-nearest-channel pointer))
- (with-current-buffer riece-channel-list-buffer
- (setq riece-redisplay-buffer t))))
-
-(defun riece-configure-windows-predicate ()
- ;; 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))))))))
+ (setq riece-channel-list-changed t)))
(defun riece-redisplay-buffers (&optional force)
(riece-update-buffers)
- (if (or force
- (funcall riece-configure-windows-predicate))
- (funcall riece-configure-windows-function))
+ (riece-redraw-layout force)
(run-hooks 'riece-redisplay-buffers-hook))
(provide 'riece-display)
projects / riece / blobdiff