X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-layout.el;h=33467aedd284de298c0aeacb48897a383687c95a;hb=31706b4880c38a94e5f762a482a559f1ba01d1d5;hp=ca463dc38995e142d2be1a9681078ece71d79c40;hpb=94931c0566611012f49aebb45a0116a1fc9eac7c;p=riece diff --git a/lisp/riece-layout.el b/lisp/riece-layout.el index ca463dc..33467ae 100644 --- a/lisp/riece-layout.el +++ b/lisp/riece-layout.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Code: @@ -28,7 +28,7 @@ (require 'riece-misc) (defgroup riece-layout nil - "Manage window layouts" + "Window layouts." :prefix "riece-" :group 'riece) @@ -45,18 +45,23 @@ ("bottom-right" riece-configure-windows right bottom) ("bottom-left" riece-configure-windows left bottom) ("top" riece-configure-windows-top) + ("spiral" riece-configure-windows-spiral) ("default" . "middle-right")) "An alist mapping the names to layout functions. An element of this alist is either in the following forms: -(NAME CONFIGURE-FUNCTION [PARAMETERS]) -(NAME1 . NAME2) +\(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 + :type '(repeat (choice (list :tag "Layout" + (string :tag "Name") + (function :tag "Configure function") + (repeat :tag "Parameters" :inline t symbol)) + (cons :tag "Alias" string string))) :group 'riece-layout) (defun riece-redraw-layout (&optional force) @@ -154,11 +159,13 @@ This function is used by \"default\" layout." (set-window-buffer (selected-window) riece-command-buffer) (select-window rest-window) - (set-window-buffer (split-window rest-window) - riece-others-buffer) + (if riece-others-buffer-mode + (set-window-buffer (split-window rest-window) + riece-others-buffer)) (set-window-buffer (selected-window) riece-channel-buffer)) - (if (eq vpos 'middle) + (if (and (eq vpos 'middle) + riece-others-buffer-mode) (let ((rest-window (split-window))) (set-window-buffer (selected-window) riece-channel-buffer) @@ -167,16 +174,16 @@ This function is used by \"default\" layout." (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) + (if riece-others-buffer-mode + (progn + (set-window-buffer (selected-window) + riece-others-buffer) + (set-window-buffer (split-window) + riece-channel-buffer)) + (set-window-buffer (selected-window) + riece-channel-buffer)) (set-window-buffer rest-window - riece-command-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))) + riece-command-buffer))))) (if (eq vpos 'bottom) (progn (set-window-buffer (selected-window) @@ -227,8 +234,7 @@ PLIST accept :command-height, :user-list-width, and :channel-list-width." (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)) @@ -243,13 +249,58 @@ PLIST accept :command-height, :user-list-width, and :channel-list-width." (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) (get-buffer-window riece-command-buffer))))) +;; +---+-------------------+---+ +;; | c | channel | u | +;; | h | | s | +;; | a | | e | +;; | n |-------------------+ r | | +---+ +;; | n | command | s | | | | +;; | e +-------------------+---+ | +-> | +;; | l | others | +-----+ +;; | s | | +;; +---+-----------------------+ +(defun riece-configure-windows-spiral () + "spiral placement of windows" +;; (interactive) + (let ((command-height 4) + (users-width 15) + (channels-width 30) + (buffer (window-buffer))) + (when (eq (selected-window) (minibuffer-window)) (other-window 1)) + (delete-other-windows) + + ;; (1) create channels window + (let ((rest (split-window (selected-window) channels-width t))) + (set-window-buffer (selected-window) riece-channel-list-buffer) + (select-window rest)) + + ;; (2) create others window + (set-window-buffer (split-window (selected-window) + (+ (/ (window-height) 2) + command-height)) + riece-others-buffer) + + ;; (3) create users window + (set-window-buffer (split-window (selected-window) + (- (window-width) users-width) t) + riece-user-list-buffer) + + ;; (4) create current channel window + (let ((rest (split-window (selected-window) + (- (window-height) command-height)))) + (set-window-buffer rest riece-command-buffer) + (set-window-buffer (selected-window) riece-channel-buffer)) + + (riece-set-window-points) + (select-window (or (get-buffer-window buffer) + (get-buffer-window riece-command-buffer))))) + (provide 'riece-layout) ;;; riece-layout.el ends here