X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece.el;h=0e674118c41c7dc1fe4cdcc420f454b0e10866ab;hp=dd7e2c97747de6058ac460443987f0f897ada688;hb=66cb75216d39717d46b679ebe978976f6892b094;hpb=fe7ce5e9a344721b1ecdd4d9ec1adce5dc908a49;ds=sidebyside

diff --git a/lisp/riece.el b/lisp/riece.el
index dd7e2c9..0e67411 100644
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -24,14 +24,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
-(if (featurep 'xemacs)
-    (require 'riece-xemacs)
-  (require 'riece-emacs))
-
 (require 'riece-filter)
-(require 'riece-highlight)
 (require 'riece-display)
 (require 'riece-server)
 (require 'riece-compat)
@@ -58,8 +51,10 @@
 (put 'riece-others-mode 'derived-mode-parent 'riece-dialogue-mode)
 
 (defvar riece-buffer-mode-alist
-  '((riece-dialogue-buffer . riece-dialogue-mode)
+  '((riece-command-buffer . riece-command-mode)
+    (riece-dialogue-buffer . riece-dialogue-mode)
     (riece-others-buffer . riece-others-mode)
+    (riece-user-list-buffer . riece-user-list-mode)
     (riece-channel-list-buffer . riece-channel-list-mode)
     (riece-private-buffer . riece-dialogue-mode)
     (riece-wallops-buffer)))
@@ -119,12 +114,14 @@ If optional argument SAFE is nil, overwrite previous definitions."
     (setq keymap (symbol-value (car keymap)))))
   (let (key)
     (while plist
-      (when (symbolp (setq key (pop plist)))
-	(setq key (symbol-value key)))
+      (if (symbolp (setq key (car plist)))
+	  (setq key (symbol-value key)))
+      (setq plist (cdr plist))
       (if (or (not safe)
 	      (eq (lookup-key keymap key) 'undefined))
-	  (define-key keymap key (pop plist))
-	(pop plist)))))
+	  (define-key keymap key (car plist))
+	(car plist))
+      (setq plist (cdr plist)))))
 
 (when t
   (riece-define-keys riece-dialogue-mode-map
@@ -144,6 +141,8 @@ If optional argument SAFE is nil, overwrite previous definitions."
     "\C-to" riece-command-toggle-own-freeze
     "\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
@@ -151,6 +150,7 @@ If optional argument SAFE is nil, overwrite previous definitions."
     "m" riece-dialogue-enter-message
     "M" riece-command-change-mode
     "n" riece-command-change-nickname
+    "\C-n" riece-command-names
     "o" other-window
     "O" riece-command-open-server
     "C" riece-command-close-server
@@ -158,13 +158,12 @@ If optional argument SAFE is nil, overwrite previous definitions."
     "q" riece-command-quit
     "r" riece-command-configure-windows
     "x" riece-command-copy-region
-    "t" riece-command-topic)
+    "t" riece-command-topic
+    "w" riece-command-who)
 
   (riece-define-keys riece-command-mode-map
     "\r" riece-command-enter-message
-    [tab] riece-command-complete
-    [(meta control c) >] riece-command-push
-    [(meta control c) <] riece-command-pop)
+    [(control return)] riece-command-enter-message-as-notice)
 
   (riece-define-keys (riece-command-map "\C-c" riece-command-mode-map)
     "\177" riece-command-scroll-down
@@ -181,7 +180,7 @@ 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-voices)
+    "v" riece-command-set-speakers)
   (set-keymap-parent riece-command-map riece-dialogue-mode-map)
 
   (riece-define-keys riece-user-list-mode-map
@@ -197,7 +196,6 @@ If optional argument SAFE is nil, overwrite previous definitions."
   (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)
 
@@ -240,41 +238,43 @@ 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
-   (car command-line-args-left))
-  (pop command-line-args-left)
+  (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))
-    (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)))
-    (setq riece-server-process (riece-start-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))))
-    (run-hooks 'riece-startup-hook)
-    (message "%s" (substitute-command-keys
-		   "Type \\[describe-mode] for help"))))
+      (error "Already running"))
+  (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)
+  (switch-to-buffer riece-command-buffer)
+  (riece-redisplay-buffers)
+  (riece-open-server riece-server "")
+  (run-hooks 'riece-startup-hook)
+  (message "%s" (substitute-command-keys "Type \\[describe-mode] for help")))
 
 (defun riece-exit ()
-  (setq riece-server nil)
   (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)))
+  (setq riece-server nil
+	riece-current-channels nil
+	riece-current-channel nil
+	riece-user-indicator nil
+	riece-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 ()
@@ -286,17 +286,20 @@ For a list of the generic commands type \\[riece-command-generic] ? RET.
   (interactive)
   (kill-all-local-variables)
 
-  (setq major-mode 'riece-command-mode
+  (setq riece-away-indicator "-"
+	riece-operator-indicator "-"
+	major-mode 'riece-command-mode
 	mode-name "Commands"
-	riece-away-indicator "-"
-	riece-freeze-indicator "-"
-	riece-own-freeze-indicator "-"
 	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-freeze-indicator
+	   " "
+	   riece-user-indicator
+	   " "
+	   riece-short-channel-indicator)))
   (riece-simplify-mode-line-format)
   (use-local-map riece-command-mode-map)
 
@@ -316,28 +319,21 @@ 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 " "))
+	   " "
+	   riece-channel-list-indicator " "))
 	buffer-read-only t
 	tab-stop-list riece-tab-stop-list)
   (riece-simplify-mode-line-format)
@@ -361,10 +357,9 @@ 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))))
 
@@ -372,6 +367,7 @@ Instead, these commands are available:
   "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
@@ -387,9 +383,9 @@ 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 "User list"
 	mode-line-buffer-identification
 	(riece-mode-line-buffer-identification
 	 '("Riece: " riece-channel-indicator " "))
@@ -411,6 +407,74 @@ Instead, these commands are available:
 	  (funcall (cdr (car alist))))
 	(setq alist (cdr alist))))))
 
+(defun riece-load-and-build-addon-dependencies (addons)
+  (let ((load-path (cons riece-addon-directory load-path))
+	dependencies)
+    (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"))
+    (setq addons (nreverse addons))
+    (while addons
+      (require (car addons))		;implicit dependency
+      (funcall (intern (concat (symbol-name (car addons)) "-insinuate")))
+      (if riece-debug
+	  (message "Add-on %S is loaded" (car addons)))
+      (setq addons (cdr addons)))))
+
 (provide 'riece)
 
 ;;; riece.el ends here