(require 'riece-globals)
(require 'riece-misc)
-(autoload 'ring-empty-p "ring")
-(autoload 'ring-ref "ring")
-
(defgroup riece-layout nil
"Manage window layouts"
:prefix "riece-"
:group 'riece-layout)
(defcustom riece-layout-alist
- '(("default" riece-configure-windows riece-reconfigure-windows-predicate)
- ("top" riece-configure-windows-top riece-reconfigure-windows-predicate))
+ '(("middle-right" riece-configure-windows right middle)
+ ("middle-left" riece-configure-windows left middle)
+ ("top-right" riece-configure-windows right top)
+ ("top-left" riece-configure-windows left top)
+ ("bottom-right" riece-configure-windows right bottom)
+ ("bottom-left" riece-configure-windows left bottom)
+ ("top" riece-configure-windows-top)
+ ("default" . "middle-right"))
"An alist mapping the names to layout functions.
-An element of this alist is in the following form:
-(NAME CONFIGURE-FUNCTION RECONFIGURE-PREDICATE)
-NAME is a string which specifies the layout setting.
-CONFIGURE-FUNCTION is a function which does window splitting, etc.
-RECONFIGURE-PREDICATE is a function to examine whether windows
-reconfiguration is needed."
+An element of this alist is either in the following forms:
+
+\(NAME CONFIGURE-FUNCTION [PARAMETERS]\)
+\(NAME1 . NAME2\)
+
+In the first form, NAME is a string which specifies the layout
+setting, and CONFIGURE-FUNCTION is a function which does window
+splitting, etc. PARAMETERS are collected and passed to CONFIGURE-FUNCTION.
+In the second form, NAME1 is an alias for NAME2."
:type 'list
:group 'riece-layout)
(let ((layout (cdr (assoc riece-layout riece-layout-alist))))
(unless layout
(error "No such layout!"))
- (if (or force
- (funcall (nth 1 layout)))
- (funcall (car layout)))))
-
+ (if (stringp layout)
+ (let ((riece-layout layout))
+ (riece-redraw-layout force))
+ (if (or force
+ (riece-reconfigure-windows-predicate))
+ (apply (car layout) (cdr layout))))))
+
(defun riece-set-window-points ()
(if (get-buffer-window riece-user-list-buffer)
(with-current-buffer riece-user-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))))))
+ (point-min)))))
+ (if (and riece-channel-buffer
+ (get-buffer-window riece-channel-buffer))
+ (with-current-buffer riece-channel-buffer
+ (if (riece-frozen riece-channel-buffer)
+ (if riece-channel-buffer-window-point
+ (set-window-point (get-buffer-window riece-channel-buffer)
+ riece-channel-buffer-window-point))
+ (set-window-point (get-buffer-window riece-channel-buffer)
+ (point-max)))))
+ (if (get-buffer-window riece-others-buffer)
+ (with-current-buffer riece-others-buffer
+ (unless (riece-frozen riece-others-buffer)
+ (set-window-point (get-buffer-window riece-others-buffer)
+ (point-max)))))
+ (if (get-buffer-window riece-dialogue-buffer)
+ (with-current-buffer riece-dialogue-buffer
+ (unless (riece-frozen riece-dialogue-buffer)
+ (set-window-point (get-buffer-window riece-dialogue-buffer)
+ (point-max))))))
-(defun riece-configure-windows ()
- "Configure windows.
+(defun riece-reconfigure-windows-predicate ()
+ "Return t, if window reconfiguration is needed.
This function is used by \"default\" layout."
+ (memq (window-buffer (selected-window))
+ riece-buffer-list))
+
+(defun riece-configure-windows (hpos vpos)
(let ((buffer (window-buffer))
(show-user-list
(and riece-user-list-buffer-mode
(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 (eq hpos 'left)
+ (- (window-width)
+ (/ (window-width) 5))
+ (/ (window-width) 5))
+ t)))
+ (when (eq hpos 'left)
+ (setq rest-window (selected-window))
+ (other-window 1))
(if (and show-user-list riece-channel-list-buffer-mode)
(progn
(set-window-buffer (split-window)
(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))
+ (progn
+ (if (eq vpos 'top)
+ (let ((rest-window (split-window nil 4)))
+ (set-window-buffer (selected-window)
+ riece-command-buffer)
+ (select-window rest-window)
+ (set-window-buffer (split-window rest-window)
+ riece-others-buffer)
+ (set-window-buffer (selected-window)
+ riece-channel-buffer))
+ (if (eq vpos 'middle)
+ (let ((rest-window (split-window)))
+ (set-window-buffer (selected-window)
+ riece-channel-buffer)
+ (set-window-buffer (split-window rest-window 4)
+ riece-others-buffer)
+ (set-window-buffer rest-window
+ riece-command-buffer))
+ (let ((rest-window (split-window nil (- (window-height) 4))))
+ (set-window-buffer (selected-window)
+ riece-others-buffer)
+ (set-window-buffer (split-window)
+ riece-channel-buffer)
+ (set-window-buffer rest-window
+ riece-command-buffer)))))
+ (if (eq vpos 'bottom)
+ (progn
+ (set-window-buffer (selected-window)
+ riece-command-buffer)
+ (set-window-buffer (split-window (selected-window) 4)
+ riece-dialogue-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-reconfigure-windows-predicate ()
- "Return t, if window reconfiguration is needed.
-This function is used by \"default\" layout."
- ;; The current channel is changed, and some buffers are visible.
- (unless (or (ring-empty-p riece-channel-history)
- (equal (ring-ref riece-channel-history 0)
- 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))))))))
-
-(defun riece-configure-windows-top (&optional plist)
+(defun riece-configure-windows-top (&rest plist)
"Candidate of `riece-configure-windows-function'.
PLIST accept :command-height, :user-list-width, and :channel-list-width."
(let ((command-height (or (plist-get plist :command-height) 4))
(set-window-buffer (selected-window) riece-channel-buffer)
(set-window-buffer user-list-window riece-user-list-buffer)
(select-window user-list-window)
- (shrink-window-horizontally (- (window-width) user-list-width))
- (setq truncate-partial-width-windows nil)))
+ (shrink-window-horizontally (- (window-width) user-list-width))))
;; only user-list
(show-user-list
(set-window-buffer (selected-window) riece-user-list-buffer))
(set-window-buffer (selected-window) riece-others-buffer)
(set-window-buffer channel-list-window riece-channel-list-buffer)
(select-window channel-list-window)
- (shrink-window-horizontally (- (window-width) channel-list-width))
- (setq truncate-partial-width-windows nil))
+ (shrink-window-horizontally (- (window-width) channel-list-width)))
(set-window-buffer (selected-window) riece-dialogue-buffer))
(riece-set-window-points)
(select-window (or (get-buffer-window buffer)
projects / riece / blobdiff