* riece-layout.el: No longer provided as an add-on.

* riece-display.el: Remove window configuration stuff.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1773b36..b34a40f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-25  Daiki Ueno  <ueno@unixuser.org>
+
+       * riece-layout.el: No longer provided as an add-on.
+       * riece-display.el: Remove window configuration stuff.
+
 2003-08-24  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-rdcc.el (riece-command-dcc-send): Bind

diff --git a/lisp/riece-display.el b/lisp/riece-display.el
index 964de45..9a2400e 100644 (file)
--- a/lisp/riece-display.el
+++ b/lisp/riece-display.el
@@ -27,17 +27,7 @@
 (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
@@ -51,127 +41,6 @@
   "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-configure-windows-top (&optional 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))
-       (user-list-width (or (plist-get plist :user-list-width) (+ 9 1 1)))
-       (channel-list-width (or (plist-get plist :channel-list-width) 18))
-       (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.
-    (when (eq (selected-window) (minibuffer-window))
-      (other-window 1))
-    (delete-other-windows)
-    ;; top of frame
-    (let ((rest-window (split-window (selected-window) command-height)))
-      (set-window-buffer (selected-window)
-                        riece-command-buffer)
-      (select-window rest-window))
-    ;; middle of frame (vertical-spilit when need)
-    (when (or (and riece-current-channel riece-channel-buffer-mode)
-             show-user-list)
-      (let ((rest-window
-            (split-window (selected-window)
-                          (/ (* 5 (+ (window-height) command-height)) 8))))
-       (cond
-        ;; channel-buffer + user-list
-        ((and show-user-list
-              (and riece-current-channel riece-channel-buffer-mode))
-         (let ((user-list-window (split-window (selected-window) nil t)))
-           (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)))
-        ;; only user-list
-        (show-user-list
-         (set-window-buffer (selected-window) riece-user-list-buffer))
-        ;; only channel-buffer
-        (riece-channel-buffer-mode
-         (set-window-buffer (selected-window) riece-channel-buffer)))
-       (select-window rest-window)))
-    ;; bottom of frame
-    (if (and riece-current-channel
-            riece-channel-list-buffer-mode)
-       (let ((channel-list-window (split-window (selected-window) nil t)))
-         (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))
-      (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)))))
-
-(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))))))
-
 (defun riece-update-user-list-buffer ()
   (save-excursion
     (set-buffer riece-user-list-buffer)
@@ -354,22 +223,9 @@ PLIST accept :command-height, :user-list-width, and :channel-list-width."
     (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))))))))
-
 (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)

diff --git a/lisp/riece-layout.el b/lisp/riece-layout.el
index f36960b..0d6ffbd 100644 (file)
--- a/lisp/riece-layout.el
+++ b/lisp/riece-layout.el
@@ -1,7 +1,8 @@
-;;; riece-layout.el --- layout manager add-on
+;;; riece-layout.el --- layout management
 ;; Copyright (C) 1998-2003 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
+;;     TAKAHASHI "beatmaria" Kaoru <kaoru@kaisei.org>
 ;; Keywords: IRC, riece
 
 ;; This file is part of Riece.
@@ -21,62 +22,180 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
-;; This add-on allows you to switch window configurations by their names.
-
-;; To use, add the following line to your ~/.riece/init.el:
-;; (add-to-list 'riece-addons 'riece-layout)
-
 ;;; Code:
 
-(require 'riece-display)
+(require 'riece-globals)
+(require 'riece-misc)
 
 (defgroup riece-layout nil
   "Manage window layouts"
   :prefix "riece-"
   :group 'riece)
 
-(defcustom riece-default-layout "default"
-  "The default layout name."
-  :type 'string
-  :group 'riece-layout)
-
-(defcustom riece-layout riece-default-layout
+(defcustom riece-layout "default"
   "Current layout setting."
   :type 'string
   :group 'riece-layout)
 
 (defcustom riece-layout-alist
-  '(("default" riece-configure-windows riece-configure-windows-predicate)
-    ("top" riece-configure-windows-top riece-configure-windows-predicate))
-  "An alist mapping the names to configure/predicate functions."
+  '(("default" riece-configure-windows riece-reconfigure-windows-predicate)
+    ("top" riece-configure-windows-top riece-reconfigure-windows-predicate))
+  "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."
   :type 'list
   :group 'riece-layout)
 
-(defun riece-layout-option-set-function (symbol value)
-  "Function called when setting `riece-layout'."
-  (let ((layout (cdr (assoc value riece-layout-alist))))
+(defun riece-redraw-layout (&optional force)
+  "Reconfigure windows with the current layout.
+If optional argument FORCE is non-nil, window reconfiguration will
+happen unconditionally."
+  (let ((layout (cdr (assoc riece-layout riece-layout-alist))))
     (unless layout
       (error "No such layout!"))
-    (setq riece-configure-windows-function (car layout)
-         riece-configure-windows-predicate (nth 1 layout))
-    (riece-redisplay-buffers t)))
-
-(defun riece-command-change-layout (name)
-  "Select a layout-name from all current available layouts and change
-the layout to the selected layout-name."
-  (interactive (list (completing-read "Layout: " riece-layout-alist)))
-  (customize-set-variable 'riece-layout name))
-
-(defvar riece-dialogue-mode-map)
-
-(defun riece-layout-insinuate ()
-  (define-key riece-dialogue-mode-map "\C-tl" #'riece-command-change-layout)
-  ;; Delay setting `riece-layout' using riece-layout-option-set-function.
-  (add-hook 'riece-startup-hook
-           (lambda ()
-             (put 'riece-layout 'custom-set
-                  'riece-layout-option-set-function)
-             (riece-layout-option-set-function 'riece-layout riece-layout))))
+    (if (or force
+           (funcall (nth 1 layout)))
+       (funcall (car layout)))))
+  
+(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))))))
+
+(defun riece-configure-windows ()
+  "Configure windows.
+This function is used by \"default\" layout."
+  (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-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 (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))))))))
+
+(defun riece-configure-windows-top (&optional 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))
+       (user-list-width (or (plist-get plist :user-list-width) (+ 9 1 1)))
+       (channel-list-width (or (plist-get plist :channel-list-width) 18))
+       (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.
+    (when (eq (selected-window) (minibuffer-window))
+      (other-window 1))
+    (delete-other-windows)
+    ;; top of frame
+    (let ((rest-window (split-window (selected-window) command-height)))
+      (set-window-buffer (selected-window)
+                        riece-command-buffer)
+      (select-window rest-window))
+    ;; middle of frame (vertical-spilit when need)
+    (when (or (and riece-current-channel riece-channel-buffer-mode)
+             show-user-list)
+      (let ((rest-window
+            (split-window (selected-window)
+                          (/ (* 5 (+ (window-height) command-height)) 8))))
+       (cond
+        ;; channel-buffer + user-list
+        ((and show-user-list
+              (and riece-current-channel riece-channel-buffer-mode))
+         (let ((user-list-window (split-window (selected-window) nil t)))
+           (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)))
+        ;; only user-list
+        (show-user-list
+         (set-window-buffer (selected-window) riece-user-list-buffer))
+        ;; only channel-buffer
+        (riece-channel-buffer-mode
+         (set-window-buffer (selected-window) riece-channel-buffer)))
+       (select-window rest-window)))
+    ;; bottom of frame
+    (if (and riece-current-channel
+            riece-channel-list-buffer-mode)
+       (let ((channel-list-window (split-window (selected-window) nil t)))
+         (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))
+      (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)))))
 
 (provide 'riece-layout)