X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece.el;h=4f646db5be6024b882d5af6ab79d64cf9719c301;hp=997db0a13f38841ab67d5538221020517024a78b;hb=1b78545e7589bafe056d3eb41117d78c249e0133;hpb=19ff075fe8afeb2e5c2bfe2f05ea02c67c3c79cc;ds=sidebyside diff --git a/lisp/riece.el b/lisp/riece.el index 997db0a..4f646db 100644 --- a/lisp/riece.el +++ b/lisp/riece.el @@ -24,11 +24,12 @@ ;;; 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") @@ -53,7 +54,7 @@ (put 'riece-channel-mode 'derived-mode-parent 'riece-dialogue-mode) (defvar riece-buffer-alist - '((riece-command-buffer "*Commands*" riece-command-mode) + '((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) @@ -62,8 +63,12 @@ (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 @@ -147,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 @@ -180,7 +188,8 @@ 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 riece-command-prefix riece-command-mode-map) @@ -188,7 +197,9 @@ If optional argument SAFE is nil, overwrite previous definitions." [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 @@ -261,10 +272,16 @@ 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-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) @@ -284,15 +301,32 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect." (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 "") - (let ((server-list riece-startup-server-list)) - (while server-list - (riece-command-open-server (car server-list)) - (setq server-list (cdr server-list)))) - (run-hooks 'riece-startup-hook) - (message "%s" (substitute-command-keys - "Type \\[describe-mode] for help")))) + ;; 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 @@ -319,15 +353,18 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect." (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-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)) @@ -341,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-channel-indicator))) + riece-channel-indicator)) + truncate-lines nil) (riece-simplify-mode-line-format) (use-local-map riece-command-mode-map) @@ -367,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. @@ -375,9 +420,17 @@ 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 `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 @@ -386,8 +439,10 @@ Instead, these commands are available: riece-away-indicator riece-operator-indicator riece-freeze-indicator + riece-channel-status-indicator " " riece-channel-list-indicator " ")) + truncate-lines nil buffer-read-only t) (riece-simplify-mode-line-format) (use-local-map riece-dialogue-mode-map) @@ -407,12 +462,14 @@ 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-long-channel-indicator)))) @@ -421,8 +478,14 @@ Instead, these commands are available: 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 @@ -440,8 +503,14 @@ 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 "Users" + mode-name "Users" mode-line-buffer-identification (riece-mode-line-buffer-identification '("Riece: " riece-long-channel-indicator " ")) @@ -467,73 +536,79 @@ Instead, these commands are available: (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. - (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))))) +(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))) + (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 (process-live-p (cdr (car pointer))) + (save-excursion + (set-buffer (process-buffer (cdr (car pointer)))) + (goto-char (point-max)) + (beginning-of-line -20) + (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)