X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece.el;h=d6994bb226355b6633efe8fb0eb405be6dca1324;hp=4401c66dba86f47ec64e70bc14979941d4970712;hb=e02a6cbc010c18b7e536530f04f6e0bc4430c5c4;hpb=d44bc59776f059686a3588f8a99be255d606c9e4 diff --git a/lisp/riece.el b/lisp/riece.el index 4401c66..d6994bb 100644 --- a/lisp/riece.el +++ b/lisp/riece.el @@ -45,22 +45,20 @@ (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-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))) - +(defvar riece-buffer-alist + '((riece-command-buffer "*Commands*" 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-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 @@ -70,16 +68,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) @@ -110,7 +118,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 @@ -147,10 +159,9 @@ If optional argument SAFE is nil, overwrite previous definitions." "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 @@ -165,7 +176,8 @@ If optional argument SAFE is nil, overwrite previous definitions." "\r" riece-command-enter-message [(control return)] riece-command-enter-message-as-notice) - (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 @@ -180,7 +192,8 @@ 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 @@ -268,8 +281,9 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect." (setq riece-server nil riece-current-channels nil riece-current-channel nil + riece-channel-buffer-alist nil riece-user-indicator nil - riece-channel-indicator "None" + riece-long-channel-indicator "None" riece-channel-list-indicator "No channel" riece-away-indicator "-" riece-operator-indicator "-" @@ -299,7 +313,7 @@ For a list of the generic commands type \\[riece-command-generic] ? RET. " " riece-user-indicator " " - riece-short-channel-indicator))) + riece-channel-indicator))) (riece-simplify-mode-line-format) (use-local-map riece-command-mode-map) @@ -320,7 +334,6 @@ Instead, these commands are available: \\{riece-dialogue-mode-map}" (kill-all-local-variables) (make-local-variable 'riece-freeze) - (make-local-variable 'tab-stop-list) (setq riece-freeze riece-default-freeze riece-away-indicator "-" riece-operator-indicator "-" @@ -334,8 +347,7 @@ Instead, these commands are available: riece-freeze-indicator " " riece-channel-list-indicator " ")) - buffer-read-only t - tab-stop-list riece-tab-stop-list) + buffer-read-only t) (riece-simplify-mode-line-format) (use-local-map riece-dialogue-mode-map) (buffer-disable-undo) @@ -361,20 +373,22 @@ Instead, these commands are available: riece-operator-indicator riece-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) - (make-local-variable 'riece-redisplay-buffer) (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)) @@ -385,28 +399,31 @@ Instead, these commands are available: \\{riece-user-list-mode-map}" (kill-all-local-variables) (buffer-disable-undo) - (make-local-variable 'riece-redisplay-buffer) (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)) (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) @@ -469,9 +486,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)