X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece.el;h=3cf1ef3cfa907e3c5373072385656a8c39c4b8b6;hp=bfa411fa558f87de749e47a507b467c95c715bd1;hb=5901546a661306549fa68865552a4309b9998fd0;hpb=ea4ed7adeca7ad0236ba08a54eb299e72095e3d9 diff --git a/lisp/riece.el b/lisp/riece.el index bfa411f..3cf1ef3 100644 --- a/lisp/riece.el +++ b/lisp/riece.el @@ -24,12 +24,6 @@ ;;; 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) @@ -57,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))) @@ -146,14 +142,14 @@ 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 @@ -166,9 +162,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 @@ -185,7 +179,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 @@ -201,7 +195,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) @@ -244,41 +237,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 (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-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 () @@ -290,17 +285,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) @@ -320,28 +318,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) @@ -365,23 +356,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)) @@ -391,16 +385,19 @@ 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 " ")) + '("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)) @@ -417,8 +414,7 @@ Instead, these commands are available: (defun riece-load-and-build-addon-dependencies (addons) (let ((load-path (cons riece-addon-directory load-path)) - dependencies - pointer) + dependencies) (while addons (require (car addons)) ;error will be reported here (let* ((requires @@ -476,9 +472,12 @@ Instead, these commands are available: (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)