* riece.el (riece-buffer-alist): Rename *Commands* -> *Command*.

[riece] / lisp / riece.el

diff --git a/lisp/riece.el b/lisp/riece.el
index 72e53cb..afd6780 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -30,6 +30,8 @@
 (require 'riece-compat)
 (require 'riece-commands)
 
+(autoload 'derived-mode-class "derived")
+
 (defvar riece-channel-list-mode-map (make-sparse-keymap))
 (defvar riece-user-list-mode-map (make-sparse-keymap))
 
@@ -51,12 +53,15 @@
 (put 'riece-channel-mode 'derived-mode-parent 'riece-dialogue-mode)
 
 (defvar riece-buffer-alist
-  '((riece-command-buffer "*Commands*" riece-command-mode)
+  '((riece-command-buffer "*Command*" riece-command-mode)
     (riece-dialogue-buffer "*Dialogue*" riece-dialogue-mode)
     (riece-others-buffer "*Others*" riece-others-mode)
     (riece-channel-list-buffer "*Channels*" riece-channel-list-mode)
     (riece-user-list-buffer " *Users*" riece-user-list-mode)))
 
+(defvar riece-shrink-buffer-idle-timer nil
+  "Timer object to periodically shrink channel buffers.")
+
 (defvar riece-select-keys
   `("1" riece-command-switch-to-channel-by-number-1
     "2" riece-command-switch-to-channel-by-number-2
@@ -201,10 +206,10 @@ If optional argument SAFE is nil, overwrite previous definitions."
     "o" riece-command-set-operators
     "v" riece-command-set-voices
     "f" riece-command-finger
-    " " riece-command-nick-scroll-up
-    "\177" riece-command-nick-scroll-down
-    [delete] riece-command-nick-scroll-down
-    [backspace] riece-command-nick-scroll-down
+    " " riece-command-user-list-scroll-up
+    "\177" riece-command-user-list-scroll-down
+    [delete] riece-command-user-list-scroll-down
+    [backspace] riece-command-user-list-scroll-down
     "c" riece-command-select-command-buffer)
 
   (riece-define-keys riece-channel-list-mode-map
@@ -265,13 +270,46 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
     (if (stringp riece-server)
        (setq riece-server (riece-server-name-to-server riece-server)))
     (riece-create-buffers)
+    (if riece-max-buffer-size
+       (setq riece-shrink-buffer-idle-timer
+             (riece-run-with-idle-timer
+              riece-shrink-buffer-idle-time-delay t
+              (lambda ()
+                (let ((buffers riece-buffer-list))
+                  (while buffers
+                    (if (eq (derived-mode-class
+                             (with-current-buffer (car buffers)
+                               major-mode))
+                            'riece-dialogue-mode)
+                        (riece-shrink-buffer (car buffers)))
+                    (setq buffers (cdr buffers))))))))
     (switch-to-buffer riece-command-buffer)
+    (riece-display-connect-signals)
     (riece-redisplay-buffers)
     (riece-open-server riece-server "")
+    (let ((server-list riece-startup-server-list))
+      (while server-list
+       (riece-command-open-server (car server-list))
+       (setq server-list (cdr server-list))))
     (run-hooks 'riece-startup-hook)
     (message "%s" (substitute-command-keys
                   "Type \\[describe-mode] for help"))))
 
+(defun riece-shrink-buffer (buffer)
+  (save-excursion
+    (set-buffer buffer)
+    (goto-char (point-min))
+    (while (> (buffer-size) riece-max-buffer-size)
+      (let* ((inhibit-read-only t)
+            buffer-read-only
+            (start (point))
+            (end (progn (beginning-of-line 2) (point)))
+            (overlays (riece-overlays-in start end)))
+       (while overlays
+         (riece-delete-overlay (car overlays))
+         (setq overlays (cdr overlays)))
+       (delete-region start end)))))
+
 (defun riece-exit ()
   (if riece-save-variables-are-dirty
       (riece-save-variables-files))
@@ -280,9 +318,12 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
             (buffer-live-p (car riece-buffer-list)))
        (funcall riece-buffer-dispose-function (car riece-buffer-list)))
     (setq riece-buffer-list (cdr riece-buffer-list)))
+  (if riece-shrink-buffer-idle-timer
+      (riece-cancel-timer riece-shrink-buffer-idle-timer))
   (setq riece-server nil
        riece-current-channels nil
        riece-current-channel nil
+       riece-channel-buffer nil
        riece-channel-buffer-alist nil
        riece-user-indicator nil
        riece-long-channel-indicator "None"
@@ -305,13 +346,12 @@ For a list of the generic commands type \\[riece-command-generic] ? RET.
   (setq riece-away-indicator "-"
        riece-operator-indicator "-"
        major-mode 'riece-command-mode
-       mode-name "Commands"
+       mode-name "Command"
        mode-line-buffer-identification
        (riece-mode-line-buffer-identification
         '("Riece: "
           riece-away-indicator
           riece-operator-indicator
-          riece-freeze-indicator
           " "
           riece-user-indicator
           " "
@@ -336,6 +376,7 @@ Instead, these commands are available:
 \\{riece-dialogue-mode-map}"
   (kill-all-local-variables)
   (make-local-variable 'riece-freeze)
+  (make-local-variable 'riece-freeze-indicator)
   (setq riece-freeze riece-default-freeze
        riece-away-indicator "-"
        riece-operator-indicator "-"
@@ -402,7 +443,7 @@ Instead, these commands are available:
   (kill-all-local-variables)
   (buffer-disable-undo)
   (setq major-mode 'riece-user-list-mode
-        mode-name "User list"
+        mode-name "Users"
        mode-line-buffer-identification
        (riece-mode-line-buffer-identification
         '("Riece: " riece-long-channel-indicator " "))