X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece.el;h=aeaea1955b9bb239b42ca504533e34fe8504a2e2;hp=7c91272d19f543c0aa5f9386f2126513ce1e5a99;hb=dd2936994700757c159f4a5686d76dd24d320c69;hpb=968710bea42c3cb88abe375241404d7a4fef379a

diff --git a/lisp/riece.el b/lisp/riece.el
index 7c91272..aeaea19 100644
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -24,17 +24,14 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
-(if (featurep 'xemacs)
-    (require 'riece-xemacs)
-  (require 'riece-emacs))
-
 (require 'riece-filter)
 (require 'riece-display)
 (require 'riece-server)
 (require 'riece-compat)
 (require 'riece-commands)
+(require 'riece-addon)
+
+(autoload 'derived-mode-class "derived")
 
 (defvar riece-channel-list-mode-map (make-sparse-keymap))
 (defvar riece-user-list-mode-map (make-sparse-keymap))
@@ -51,20 +48,26 @@
 
 (put 'riece-command-mode 'mode-class 'special)
 (put 'riece-dialogue-mode 'mode-class 'special)
+(put 'riece-others-mode 'derived-mode-parent 'riece-dialogue-mode)
 (put 'riece-channel-list-mode 'mode-class 'special)
 (put 'riece-user-list-mode 'mode-class 'special)
 (put 'riece-channel-mode 'derived-mode-parent 'riece-dialogue-mode)
-(put 'riece-others-mode 'derived-mode-parent 'riece-dialogue-mode)
 
-(defvar riece-buffer-mode-alist
-  '((riece-dialogue-buffer . riece-dialogue-mode)
-    (riece-others-buffer . riece-others-mode)
-    (riece-channel-list-buffer . riece-channel-list-mode)
-    (riece-private-buffer . riece-dialogue-mode)
-    (riece-wallops-buffer)))
-    
+(defvar riece-buffer-alist
+  '((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-addons-insinuated nil
+  "Non nil if add-ons are already insinuated.")
+
 (defvar riece-select-keys
-  '("1" riece-command-switch-to-channel-by-number-1
+  `("1" riece-command-switch-to-channel-by-number-1
     "2" riece-command-switch-to-channel-by-number-2
     "3" riece-command-switch-to-channel-by-number-3
     "4" riece-command-switch-to-channel-by-number-4
@@ -74,16 +77,26 @@
     "8" riece-command-switch-to-channel-by-number-8
     "9" riece-command-switch-to-channel-by-number-9
     "0" riece-command-switch-to-channel-by-number-10
-    "\C-c1" riece-command-switch-to-channel-by-number-11
-    "\C-c2" riece-command-switch-to-channel-by-number-12
-    "\C-c3" riece-command-switch-to-channel-by-number-13
-    "\C-c4" riece-command-switch-to-channel-by-number-14
-    "\C-c5" riece-command-switch-to-channel-by-number-15
-    "\C-c6" riece-command-switch-to-channel-by-number-16
-    "\C-c7" riece-command-switch-to-channel-by-number-17
-    "\C-c8" riece-command-switch-to-channel-by-number-18
-    "\C-c9" riece-command-switch-to-channel-by-number-19
-    "\C-c0" riece-command-switch-to-channel-by-number-20))
+    ,(concat riece-command-prefix "1")
+    riece-command-switch-to-channel-by-number-11
+    ,(concat riece-command-prefix "2")
+    riece-command-switch-to-channel-by-number-12
+    ,(concat riece-command-prefix "3")
+    riece-command-switch-to-channel-by-number-13
+    ,(concat riece-command-prefix "4")
+    riece-command-switch-to-channel-by-number-14
+    ,(concat riece-command-prefix "5")
+    riece-command-switch-to-channel-by-number-15
+    ,(concat riece-command-prefix "6")
+    riece-command-switch-to-channel-by-number-16
+    ,(concat riece-command-prefix "7")
+    riece-command-switch-to-channel-by-number-17
+    ,(concat riece-command-prefix "8")
+    riece-command-switch-to-channel-by-number-18
+    ,(concat riece-command-prefix "9")
+    riece-command-switch-to-channel-by-number-19
+    ,(concat riece-command-prefix "0")
+    riece-command-switch-to-channel-by-number-20))
 
 ;;; Keymap macros. -- borrowed from `gnus-util.el'.
 (defmacro riece-local-set-keys (&rest plist)
@@ -114,7 +127,11 @@ If optional argument SAFE is nil, overwrite previous definitions."
    ((listp keymap)
     (set (car keymap) nil)
     (define-prefix-command (car keymap))
-    (define-key (symbol-value (nth 2 keymap)) (nth 1 keymap) (car keymap))
+    (define-key (symbol-value (nth 2 keymap))
+      (if (symbolp (nth 1 keymap))
+	  (symbol-value (nth 1 keymap))
+	(nth 1 keymap))
+      (car keymap))
     (setq keymap (symbol-value (car keymap)))))
   (let (key)
     (while plist
@@ -138,6 +155,7 @@ If optional argument SAFE is nil, overwrite previous definitions."
     "/" riece-command-raw
     ">" end-of-buffer
     "<" beginning-of-buffer
+    "^" riece-command-list-addons
     "\C-ta" riece-command-toggle-away
     "c" riece-command-select-command-buffer
     "f" riece-command-finger
@@ -146,18 +164,19 @@ If optional argument SAFE is nil, overwrite previous definitions."
     "\C-tu" riece-command-toggle-user-list-buffer-mode
     "\C-tc" riece-command-toggle-channel-buffer-mode
     "\C-tC" riece-command-toggle-channel-list-buffer-mode
+    "\C-tl" riece-command-change-layout
     "i" riece-command-invite
     "j" riece-command-join
     "\C-k" riece-command-kick
     "l" riece-command-list
-    "m" riece-dialogue-enter-message
     "M" riece-command-change-mode
     "n" riece-command-change-nickname
-    "\C-n" riece-command-names
+    "N" riece-command-names
     "o" other-window
     "O" riece-command-open-server
     "C" riece-command-close-server
     "M" riece-command-universal-server-name-argument
+    "p" riece-command-enter-message-to-user
     "q" riece-command-quit
     "r" riece-command-configure-windows
     "x" riece-command-copy-region
@@ -166,9 +185,11 @@ If optional argument SAFE is nil, overwrite previous definitions."
 
   (riece-define-keys riece-command-mode-map
     "\r" riece-command-enter-message
-    [(control return)] riece-command-enter-message-as-notice)
+    [(control return)] riece-command-enter-message-as-notice
+    [tab] riece-command-complete-user)
 
-  (riece-define-keys (riece-command-map "\C-c" riece-command-mode-map)
+  (riece-define-keys (riece-command-map riece-command-prefix
+					riece-command-mode-map)
     "\177" riece-command-scroll-down
     [delete] riece-command-scroll-down
     [backspace] riece-command-scroll-down
@@ -183,23 +204,23 @@ If optional argument SAFE is nil, overwrite previous definitions."
     "o" riece-command-set-operators
     "\C-p" riece-command-part
     "r" riece-command-configure-windows
-    "v" riece-command-set-speakers)
+    "v" riece-command-set-speakers
+    "V" riece-version)
   (set-keymap-parent riece-command-map riece-dialogue-mode-map)
 
   (riece-define-keys riece-user-list-mode-map
     "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
     ">" riece-command-next-channel
     "<" riece-command-previous-channel
-    "u" riece-command-unread-channel
     "o" other-window
     "c" riece-command-select-command-buffer)
 
@@ -242,41 +263,96 @@ If optional argument SAFE is nil, overwrite previous definitions."
 ;;;###autoload
 (defun riece (&optional confirm)
   "Connect to the IRC server and start chatting.
-If optional argument CONFIRM is non-nil, ask which IRC server to connect.
-If already connected, just pop up the windows."
+If optional argument CONFIRM is non-nil, ask which IRC server to connect."
   (interactive "P")
   (riece-read-variables-files (if noninteractive
 				  (car command-line-args-left)))
-  (riece-insinuate-addons riece-addons)
   (run-hooks 'riece-after-load-startup-hook)
   (if (riece-server-opened)
-      (riece-configure-windows)
-    (switch-to-buffer (riece-get-buffer-create riece-command-buffer))
-    (unless (eq major-mode 'riece-command-mode)
-      (riece-command-mode))
-    (let ((server-name
-	   (if (or confirm (null riece-server))
-	       (completing-read "Server: " riece-server-alist)
-	     riece-server)))
-      (riece-open-server (riece-server-name-to-server server-name)))
+      (riece-command-configure-windows)
+    (unless riece-addons-insinuated
+      (setq riece-addons (riece-resolve-addons riece-addons))
+      (let ((pointer riece-addons))
+	(while pointer
+	  (riece-insinuate-addon (car pointer) riece-debug)
+	  (setq pointer (cdr pointer))))
+      (setq riece-addons-insinuated t))
+    (if (or confirm (null riece-server))
+	(setq riece-server (completing-read "Server: " riece-server-alist)))
+    (if (stringp riece-server)
+	(setq riece-server (riece-server-name-to-server riece-server)))
     (riece-create-buffers)
-    (riece-configure-windows)
-    (let ((channel-list riece-startup-channel-list))
-      (while channel-list
-	(if (listp (car channel-list))
-	    (riece-command-join (car (car channel-list))
-				(cadr (car channel-list)))
-	  (riece-command-join (car channel-list)))
-	(setq channel-list (cdr channel-list))))
+    (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))))
+    (let ((pointer riece-addons))
+      (while pointer
+	(unless (get (car pointer) 'riece-addon-default-disabled)
+	  (riece-enable-addon (car pointer) riece-debug))
+	(setq pointer (cdr pointer))))
     (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 ()
-  (setq riece-server nil)
+  (let ((pointer riece-addons))
+    (while pointer
+      (riece-disable-addon (car pointer) riece-debug)
+      (setq pointer (cdr pointer))))
   (if riece-save-variables-are-dirty
       (riece-save-variables-files))
-  (riece-clear-system)
+  (while riece-buffer-list
+    (if (and (get-buffer (car riece-buffer-list))
+	     (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"
+	riece-channel-list-indicator "No channel"
+	riece-away-indicator "-"
+	riece-operator-indicator "-"
+	riece-freeze-indicator "-")
+  (delete-other-windows)
   (run-hooks 'riece-exit-hook))
 
 (defun riece-command-mode ()
@@ -288,17 +364,19 @@ For a list of the generic commands type \\[riece-command-generic] ? RET.
   (interactive)
   (kill-all-local-variables)
 
-  (setq major-mode 'riece-command-mode
-	mode-name "Commands"
-	riece-away-indicator "-"
-	riece-freeze-indicator "-"
-	riece-own-freeze-indicator "-"
+  (setq riece-away-indicator "-"
+	riece-operator-indicator "-"
+	major-mode 'riece-command-mode
+	mode-name "Command"
 	mode-line-buffer-identification
 	(riece-mode-line-buffer-identification
 	 '("Riece: "
-	   mode-line-modified
 	   riece-away-indicator
-	   "-- " riece-current-channel " " riece-real-nickname)))
+	   riece-operator-indicator
+	   " "
+	   riece-user-indicator
+	   " "
+	   riece-channel-indicator)))
   (riece-simplify-mode-line-format)
   (use-local-map riece-command-mode-map)
 
@@ -318,30 +396,22 @@ All normal editing commands are turned off.
 Instead, these commands are available:
 \\{riece-dialogue-mode-map}"
   (kill-all-local-variables)
-
   (make-local-variable 'riece-freeze)
   (make-local-variable 'riece-freeze-indicator)
-  (make-local-variable 'riece-own-freeze)
-  (make-local-variable 'riece-own-freeze-indicator)
-  (make-local-variable 'tab-stop-list)
-
   (setq riece-freeze riece-default-freeze
-	riece-freeze-indicator (if riece-freeze "F" "-")
-	riece-own-freeze riece-default-own-freeze
-	riece-own-freeze-indicator (if riece-own-freeze "M" "-")
-
+	riece-away-indicator "-"
+	riece-operator-indicator "-"
 	major-mode 'riece-dialogue-mode
 	mode-name "Dialogue"
 	mode-line-buffer-identification
 	(riece-mode-line-buffer-identification
 	 '("Riece: "
-	   mode-line-modified
 	   riece-away-indicator
+	   riece-operator-indicator
 	   riece-freeze-indicator
-	   riece-own-freeze-indicator
-	   " " riece-channel-list-indicator " "))
-	buffer-read-only t
-	tab-stop-list riece-tab-stop-list)
+	   " "
+	   riece-channel-list-indicator " "))
+	buffer-read-only t)
   (riece-simplify-mode-line-format)
   (use-local-map riece-dialogue-mode-map)
   (buffer-disable-undo)
@@ -363,23 +433,26 @@ Instead, these commands are available:
   (setq mode-line-buffer-identification
 	(riece-mode-line-buffer-identification
 	 '("Riece: "
-	   mode-line-modified
 	   riece-away-indicator
+	   riece-operator-indicator
 	   riece-freeze-indicator
-	   riece-own-freeze-indicator
 	   " "
-	   riece-channel-indicator))))
+	   riece-long-channel-indicator))))
 
 (defun riece-channel-list-mode ()
   "Major mode for displaying channel list.
 All normal editing commands are turned off."
   (kill-all-local-variables)
+  (buffer-disable-undo)
   (setq major-mode 'riece-channel-list-mode
         mode-name "Channels"
 	mode-line-buffer-identification
 	(riece-mode-line-buffer-identification '("Riece: "))
 	truncate-lines t
 	buffer-read-only t)
+  (make-local-hook 'riece-update-buffer-functions)
+  (add-hook 'riece-update-buffer-functions
+	    'riece-update-channel-list-buffer nil t)
   (use-local-map riece-channel-list-mode-map)
   (run-hooks 'riece-channel-list-mode-hook))
 
@@ -389,96 +462,34 @@ All normal editing commands are turned off.
 Instead, these commands are available:
 \\{riece-user-list-mode-map}"
   (kill-all-local-variables)
-  (setq mode-line-modified "--- "
-        major-mode 'riece-user-list-mode
-        mode-name "Riece Channel member"
+  (buffer-disable-undo)
+  (setq major-mode 'riece-user-list-mode
+        mode-name "Users"
 	mode-line-buffer-identification
 	(riece-mode-line-buffer-identification
-	 '("Riece: " riece-channel-indicator " "))
+	 '("Riece: " riece-long-channel-indicator " "))
 	truncate-lines t
 	buffer-read-only t)
   (if (boundp 'transient-mark-mode)
       (set (make-local-variable 'transient-mark-mode) t))
+  (make-local-hook 'riece-update-buffer-functions)
+  (add-hook 'riece-update-buffer-functions
+	    'riece-update-user-list-buffer nil t)
   (use-local-map riece-user-list-mode-map)
   (run-hooks 'riece-user-list-mode-hook))
 
 (defun riece-create-buffers ()
-  (let ((alist riece-buffer-mode-alist))
+  (let ((alist riece-buffer-alist))
     (while alist
       (save-excursion
-	(set-buffer (riece-get-buffer-create
-		     (symbol-value (car (car alist)))))
-	(unless (or (null (cdr (car alist)))
-		    (eq major-mode (cdr (car alist))))
-	  (funcall (cdr (car alist))))
+	(set-buffer (apply #'riece-get-buffer-create
+			   (cdr (car alist))))
+	(set (car (car alist)) (current-buffer))
+	(unless (or (null (nth 2 (car alist)))
+		    (eq major-mode (nth 2 (car alist))))
+	  (funcall (nth 2 (car alist))))
 	(setq alist (cdr alist))))))
-
-(defun riece-load-and-build-addon-dependencies (addons)
-  (let ((load-path (cons riece-addon-directory load-path))
-	dependencies
-	pointer)
-    (while addons
-      (require (car addons))		;error will be reported here
-      (let* ((requires
-	      (funcall (or (intern-soft
-			    (concat (symbol-name (car addons)) "-requires"))
-			   #'ignore)))
-	     (pointer requires)
-	     entry)
-	;; Increment succs' pred count.
-	(if (setq entry (assq (car addons) dependencies))
-	    (setcar (cdr entry) (+ (length requires) (nth 1 entry)))
-	  (setq dependencies (cons (list (car addons) (length requires))
-				   dependencies)))
-	;; Merge pred's succs.
-	(while pointer
-	  (if (setq entry (assq (car pointer) dependencies))
-	      (setcdr (cdr entry)
-		      (cons (car addons) (nthcdr 2 entry)))
-	    (setq dependencies (cons (list (car pointer) 0 (car addons))
-				     dependencies)))
-	  (setq pointer (cdr pointer))))
-      (setq addons (cdr addons)))
-    dependencies))
-
-(defun riece-insinuate-addons (addons)
-  (let ((pointer addons)
-	dependencies queue)
-    ;; Uniquify, first.
-    (while pointer
-      (if (memq (car pointer) (cdr pointer))
-	  (setcar pointer nil))
-      (setq pointer (cdr pointer)))
-    (setq dependencies (riece-load-and-build-addon-dependencies
-			(delq nil addons))
-	  pointer dependencies)
-    ;; Sort them.
-    (while pointer
-      (if (zerop (nth 1 (car pointer)))
-	  (setq dependencies (delq (car pointer) dependencies)
-		queue (cons (car pointer) queue)))
-      (setq pointer (cdr pointer)))
-    (setq addons nil)
-    (while queue
-      (setq addons (cons (car (car queue)) addons)
-	    pointer (nthcdr 2 (car queue)))
-      (while pointer
-	(let* ((entry (assq (car pointer) dependencies))
-	       (count (1- (nth 1 entry))))
-	  (if (zerop count)
-	      (progn
-		(setq dependencies (delq entry dependencies)
-		      queue (nconc queue (list entry))))
-	    (setcar (cdr entry) count)))
-	(setq pointer (cdr pointer)))
-      (setq queue (cdr queue)))
-    (if dependencies
-	(error "Circular add-on dependency found"))
-    (while addons
-      (require (car addons))		;implicit dependency
-      (funcall (intern (concat (symbol-name (car addons)) "-insinuate")))
-      (setq addons (cdr addons)))))
-
+      
 (provide 'riece)
 
 ;;; riece.el ends here