Simplify status indicator.

[riece] / lisp / riece.el

diff --git a/lisp/riece.el b/lisp/riece.el
index c6debe9..7fc969f 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -31,7 +31,6 @@
   (require 'riece-emacs))
 
 (require 'riece-filter)
-(require 'riece-highlight)
 (require 'riece-display)
 (require 'riece-server)
 (require 'riece-compat)
@@ -119,12 +118,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
@@ -165,9 +166,7 @@ If optional argument SAFE is nil, overwrite previous definitions."
 
   (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
@@ -184,7 +183,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
@@ -259,7 +258,7 @@ If already connected, just pop up the windows."
        (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-open-server riece-server)
     (riece-create-buffers)
     (riece-configure-windows)
     (let ((channel-list riece-startup-channel-list))
@@ -289,17 +288,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-channel-indicator)))
   (riece-simplify-mode-line-format)
   (use-local-map riece-command-mode-map)
 
@@ -321,28 +323,24 @@ Instead, these commands are available:
   (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-update-status-indicators)
   (riece-simplify-mode-line-format)
   (use-local-map riece-dialogue-mode-map)
   (buffer-disable-undo)
@@ -364,10 +362,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))))
 
@@ -390,9 +387,8 @@ 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"
+  (setq major-mode 'riece-user-list-mode
+        mode-name "User list"
        mode-line-buffer-identification
        (riece-mode-line-buffer-identification
         '("Riece: " riece-channel-indicator " "))
@@ -420,35 +416,48 @@ Instead, these commands are available:
     (while addons
       (require (car addons))           ;error will be reported here
       (let* ((requires
-             (funcall (or (intern-soft (concat (symbol-name (car addons))
-                                               "-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))
-             (setcar (cdr entry) (1+ (nth 1 entry)))
-           (push (list (car pointer) 1 nil) dependencies))
-         (setq pointer (cdr pointer)))
-       (if (setq entry (assq (car addons) dependencies))
-           (setcar (nthcdr 2 entry) requires)
-         (push (list (car addons) 0 requires) 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* ((dependencies (riece-load-and-build-addon-dependencies addons))
-        (pointer dependencies)
-        queue)
+  (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
-      (when (zerop (nth 1 (car pointer)))
-       (setq dependencies (delq (car pointer) dependencies))
-       (push (car pointer) queue))
+      (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
-      (push (car (car queue)) addons)
-      (setq pointer (nth 2 (car 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))))
@@ -460,7 +469,7 @@ Instead, these commands are available:
        (setq pointer (cdr pointer)))
       (setq queue (cdr queue)))
     (if dependencies
-       (error "Circular dependency found"))
+       (error "Circular add-on dependency found"))
     (while addons
       (require (car addons))           ;implicit dependency
       (funcall (intern (concat (symbol-name (car addons)) "-insinuate")))