X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece.el;h=86c1d624c14399beb9e188a9cdc15c422bbe9a42;hp=40353b97171f56660114adf93a00368b9b426d3b;hb=3276fa825b97be2c62eb6fe0691b706fd5344ed9;hpb=9f0f8e8f7c1fefd0ae6712872f9dcb78ae3ea11c diff --git a/lisp/riece.el b/lisp/riece.el index 40353b9..86c1d62 100644 --- a/lisp/riece.el +++ b/lisp/riece.el @@ -24,11 +24,14 @@ ;;; Code: -(require 'riece-filter) (require 'riece-display) (require 'riece-server) (require 'riece-compat) (require 'riece-commands) +(require 'riece-addon) +(require 'riece-signal) + +(autoload 'derived-mode-class "derived") (defvar riece-channel-list-mode-map (make-sparse-keymap)) (defvar riece-user-list-mode-map (make-sparse-keymap)) @@ -45,22 +48,27 @@ (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 "*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 + `("#" riece-command-switch-to-channel-by-number + "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 +78,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 +128,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 @@ -130,10 +152,13 @@ If optional argument SAFE is nil, overwrite previous definitions." [backspace] scroll-down [return] scroll-up " " scroll-up + [home] beginning-of-buffer "$" end-of-buffer + [end] end-of-buffer "/" 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 @@ -149,11 +174,12 @@ If optional argument SAFE is nil, overwrite previous definitions." "l" riece-command-list "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 @@ -162,14 +188,18 @@ 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 " " riece-command-scroll-up + [home] riece-command-beginning-of-buffer "$" riece-command-end-of-buffer + [end] riece-command-end-of-buffer ">" riece-command-next-channel "<" riece-command-previous-channel "\C-j" riece-command-next-channel @@ -179,17 +209,18 @@ 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 @@ -241,20 +272,76 @@ 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) - (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"))) + (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) + (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 "") + ;; If no server process is available, exit. + (if (null riece-server-process-alist) + (riece-exit) + (let ((server-list riece-startup-server-list)) + (while server-list + (riece-command-open-server (car server-list)) + (setq server-list (cdr server-list)))) + (let ((channel-list riece-startup-channel-list) + server) + (while channel-list + (setq server (riece-identity-server + (riece-parse-identity (car channel-list)))) + (unless (riece-server-opened server) + (riece-command-open-server server)) + (setq channel-list (cdr channel-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 () (if riece-save-variables-are-dirty @@ -264,14 +351,20 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect." (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)) + (riece-clear-signal-slots) (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-channel-indicator "None" + riece-long-channel-indicator "None" riece-channel-list-indicator "No channel" riece-away-indicator "-" riece-operator-indicator "-" + riece-channel-status-indicator "-" riece-freeze-indicator "-") (delete-other-windows) (run-hooks 'riece-exit-hook)) @@ -285,20 +378,28 @@ For a list of the generic commands type \\[riece-command-generic] ? RET. (interactive) (kill-all-local-variables) + ;; Make `truncate-partial-width-windows' buffer local and set it to + ;; nil. This causes `truncate-lines' to directly control line + ;; truncation. + (make-local-variable 'truncate-partial-width-windows) + (setq truncate-partial-width-windows nil) + (setq riece-away-indicator "-" riece-operator-indicator "-" + riece-channel-status-indicator "-" major-mode 'riece-command-mode - mode-name "Commands" + mode-name "Command" mode-line-buffer-identification (riece-mode-line-buffer-identification '("Riece: " riece-away-indicator riece-operator-indicator - riece-freeze-indicator + riece-channel-status-indicator " " riece-user-indicator " " - riece-short-channel-indicator))) + riece-channel-indicator)) + truncate-lines nil) (riece-simplify-mode-line-format) (use-local-map riece-command-mode-map) @@ -311,7 +412,7 @@ For a list of the generic commands type \\[riece-command-generic] ? RET. "^[]{}'`")) (run-hooks 'riece-command-mode-hook)) - + (defun riece-dialogue-mode () "Major mode for displaying the IRC dialogue. All normal editing commands are turned off. @@ -319,10 +420,17 @@ Instead, these commands are available: \\{riece-dialogue-mode-map}" (kill-all-local-variables) (make-local-variable 'riece-freeze) - (make-local-variable 'tab-stop-list) + (make-local-variable 'riece-freeze-indicator) + + ;; Make `truncate-partial-width-windows' buffer local and set it to + ;; nil. This causes `truncate-lines' to directly control line truncation. + (make-local-variable 'truncate-partial-width-windows) + (setq truncate-partial-width-windows nil) + (setq riece-freeze riece-default-freeze riece-away-indicator "-" riece-operator-indicator "-" + riece-channel-status-indicator "-" major-mode 'riece-dialogue-mode mode-name "Dialogue" mode-line-buffer-identification @@ -331,10 +439,11 @@ Instead, these commands are available: riece-away-indicator riece-operator-indicator riece-freeze-indicator + riece-channel-status-indicator " " riece-channel-list-indicator " ")) - buffer-read-only t - tab-stop-list riece-tab-stop-list) + truncate-lines nil + buffer-read-only t) (riece-simplify-mode-line-format) (use-local-map riece-dialogue-mode-map) (buffer-disable-undo) @@ -353,26 +462,37 @@ Instead, these commands are available: All normal editing commands are turned off. Instead, these commands are available: \\{riece-channel-mode-map}" + (make-local-variable 'riece-channel-buffer-window-point) (setq mode-line-buffer-identification (riece-mode-line-buffer-identification '("Riece: " riece-away-indicator riece-operator-indicator riece-freeze-indicator + riece-channel-status-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 `truncate-partial-width-windows' buffer local and set it to + ;; nil. This causes `truncate-lines' to directly control line truncation. + (make-local-variable 'truncate-partial-width-windows) + (setq truncate-partial-width-windows nil) + (setq major-mode 'riece-channel-list-mode - mode-name "Channels" + 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)) @@ -383,96 +503,129 @@ Instead, these commands are available: \\{riece-user-list-mode-map}" (kill-all-local-variables) (buffer-disable-undo) + + ;; Make `truncate-partial-width-windows' buffer local and set it to + ;; nil. This causes `truncate-lines' to directly control line truncation. + (make-local-variable 'truncate-partial-width-windows) + (setq truncate-partial-width-windows nil) + (setq major-mode 'riece-user-list-mode - mode-name "User list" + 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) - (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. +(defun riece-submit-bug-report (&optional recent-messages recent-keys) + "Submit via mail a bug report on Riece." + ;; This strange form ensures that (recent-keys) is the value before + ;; the bug subject string is read. + (interactive (list (riece-recent-messages 20) (recent-keys))) + (message "Querying server version...") + (let ((pointer riece-server-process-alist) + nickname) (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))))) + (if (and (riece-server-process-opened (cdr (car pointer))) + (setq nickname + (with-current-buffer (process-buffer (cdr (car pointer))) + riece-real-nickname))) + (process-send-string + (cdr (car pointer)) + "VERSION") + (process-send-string + (cdr (car pointer)) + (format "PRIVMSG %s :\1VERSION\1\r\n" nickname))) + (setq pointer (cdr pointer)))) + (sit-for 3) + (message "Querying server version...done") + (require 'reporter) + (let ((reporter-prompt-for-summary-p t)) + (unless riece-debug + (error "Please turn on riece-debug and restart Riece.")) + (reporter-submit-bug-report + "liece@unixuser.org" + (riece-version) + '(riece-debug) + nil + nil + "This bug report will be sent to the Riece Development Team, +not to your local site managers!! + +Please write in Japanese or English, because the Riece maintainers do +not have translators to read other languages for them. + +Please describe as succinctly as possible: +\t- What happened. +\t- What you thought should have happened. +\t- Precisely what you were doing at the time. + +Also include a reliable recipe for triggering the bug, as well as +any lisp back-traces that you may have. +\(setq stack-trace-on-error t\), or \(setq debug-on-error t\) if you +are familiar with the debugger, to get a lisp back-trace.") + (save-excursion + (goto-char (point-max)) + (insert + "\nAdd-on state:\n" + "------------\n" + (save-window-excursion + (save-excursion + (riece-command-list-addons) + (search-forward "\n\n") + (buffer-substring (point-min) (point))))) + (insert "Recent messages from servers:\n" + "--------------------------") + (let ((pointer riece-server-process-alist)) + (while pointer + (insert "\n- \"" (car (car pointer)) "\", \n" + (format "%S" (if (equal (car (car pointer)) "") + riece-server + (cdr (assoc (car (car pointer)) + riece-server-alist)))) + "\n" + (if (riece-server-process-opened (cdr (car pointer))) + (save-excursion + (set-buffer (process-buffer (cdr (car pointer)))) + (goto-char (point-max)) + (beginning-of-line -60) + (buffer-substring (point) (point-max))) + "(closed server)")) + (setq pointer (cdr pointer)))) + ;; Insert recent keystrokes. + (insert "\n\nRecent keystrokes:\n" + "-----------------\n\n") + (let ((before-keys (point))) + (insert (key-description recent-keys)) + (save-restriction + (narrow-to-region before-keys (point)) + (goto-char before-keys) + (while (progn (move-to-column 50) (not (eobp))) + (search-forward " " nil t) + (insert "\n")))) + ;; Insert recent minibuffer messages. + (insert "\n\nRecent messages (most recent first):\n" + "-----------------------------------\n" + recent-messages)))) (provide 'riece)