;;; 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")
(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)
- (riece-user-list-buffer " *Users*" riece-user-list-mode)))
+ (riece-user-list-buffer " *Users*" riece-user-list-mode)
+ (riece-temp-buffer " *Temp*")
+ (riece-debug-buffer " *Debug*")))
(defvar riece-shrink-buffer-idle-timer nil
"Timer object to periodically shrink channel buffers.")
(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
[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
"\C-tf" riece-command-toggle-freeze
"\C-to" riece-command-toggle-own-freeze
+ "\C-tO" riece-command-toggle-others-buffer-mode
"\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
"r" riece-command-configure-windows
"x" riece-command-copy-region
"t" riece-command-topic
- "w" riece-command-who)
+ "w" riece-command-who
+ "z" riece-command-suspend-resume)
(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)
[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
(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)
+ (modify-frame-parameters (selected-frame)
+ (list (cons 'riece-window-configuration
+ (current-window-configuration))))
+ (setq riece-addon-dependencies (riece-resolve-addons
+ (copy-sequence riece-addons)))
+ (let ((pointer riece-addon-dependencies))
+ (while pointer
+ (riece-insinuate-addon (car (car pointer)) riece-debug)
+ (setq pointer (cdr pointer))))
(if (or confirm (null riece-server))
(setq riece-server (completing-read "Server: " riece-server-alist)))
(if (stringp riece-server)
(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)))
+ (if (buffer-live-p (car buffers))
+ (if (eq (derived-mode-class
+ (with-current-buffer (car buffers)
+ major-mode))
+ 'riece-dialogue-mode)
+ (riece-shrink-buffer (car buffers)))
+ (delq (car buffers) riece-buffer-list))
(setq buffers (cdr buffers))))))))
(switch-to-buffer riece-command-buffer)
+ (riece-display-connect-signals)
(riece-redisplay-buffers)
(riece-open-server riece-server "")
- (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-addon-dependencies))
+ (while pointer
+ (unless (get (car (car pointer)) 'riece-addon-default-disabled)
+ (riece-enable-addon (car (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
(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)))
+ (end (progn
+ (goto-char riece-shrink-buffer-remove-chars)
+ (beginning-of-line 2)
+ (point)))
+ (overlays (riece-overlays-in (point-min) end)))
(while overlays
(riece-delete-overlay (car overlays))
(setq overlays (cdr overlays)))
- (delete-region start end)))))
+ (delete-region (point-min) end)))))
(defun riece-exit ()
(if riece-save-variables-are-dirty
(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 "-")
+ (modify-frame-parameters (selected-frame)
+ (list (list 'riece-window-configuration)))
(delete-other-windows)
(run-hooks 'riece-exit-hook))
(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)
+
+ (make-local-variable 'riece-mode-line-buffer-identification)
(setq riece-away-indicator "-"
riece-operator-indicator "-"
+ riece-channel-status-indicator "-"
major-mode 'riece-command-mode
- mode-name "Commands"
+ mode-name "Command"
+ riece-mode-line-buffer-identification
+ '("Riece: "
+ riece-away-indicator
+ riece-operator-indicator
+ riece-channel-status-indicator
+ " "
+ riece-user-indicator
+ " "
+ riece-channel-indicator)
mode-line-buffer-identification
(riece-mode-line-buffer-identification
- '("Riece: "
- riece-away-indicator
- riece-operator-indicator
- riece-freeze-indicator
- " "
- riece-user-indicator
- " "
- riece-channel-indicator)))
+ riece-mode-line-buffer-identification)
+ truncate-lines nil)
(riece-simplify-mode-line-format)
(use-local-map riece-command-mode-map)
"^[]{}'`"))
(run-hooks 'riece-command-mode-hook))
-
+
(defun riece-dialogue-mode ()
"Major mode for displaying the IRC dialogue.
All normal editing commands are turned off.
\\{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)
+
+ (make-local-variable 'riece-mode-line-buffer-identification)
(setq riece-freeze riece-default-freeze
riece-away-indicator "-"
riece-operator-indicator "-"
+ riece-channel-status-indicator "-"
major-mode 'riece-dialogue-mode
mode-name "Dialogue"
+ riece-mode-line-buffer-identification
+ '("Riece: "
+ riece-away-indicator
+ riece-operator-indicator
+ riece-freeze-indicator
+ riece-channel-status-indicator
+ " "
+ riece-channel-list-indicator " ")
mode-line-buffer-identification
(riece-mode-line-buffer-identification
- '("Riece: "
- riece-away-indicator
- riece-operator-indicator
- riece-freeze-indicator
- " "
- riece-channel-list-indicator " "))
+ riece-mode-line-buffer-identification)
+ truncate-lines nil
buffer-read-only t)
(riece-simplify-mode-line-format)
(use-local-map riece-dialogue-mode-map)
All normal editing commands are turned off.
Instead, these commands are available:
\\{riece-channel-mode-map}"
- (setq mode-line-buffer-identification
+ (make-local-variable 'riece-channel-buffer-window-point)
+ (make-local-variable 'riece-mode-line-buffer-identification)
+ (setq riece-mode-line-buffer-identification
+ '("Riece: "
+ riece-away-indicator
+ riece-operator-indicator
+ riece-freeze-indicator
+ riece-channel-status-indicator
+ " "
+ riece-long-channel-indicator)
+ mode-line-buffer-identification
(riece-mode-line-buffer-identification
- '("Riece: "
- riece-away-indicator
- riece-operator-indicator
- riece-freeze-indicator
- " "
- riece-long-channel-indicator))))
+ riece-mode-line-buffer-identification)))
(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)
+
+ (make-local-variable 'riece-mode-line-buffer-identification)
(setq major-mode 'riece-channel-list-mode
- mode-name "Channels"
+ mode-name "Channels"
+ riece-mode-line-buffer-identification '("Riece: ")
mode-line-buffer-identification
- (riece-mode-line-buffer-identification '("Riece: "))
+ (riece-mode-line-buffer-identification
+ riece-mode-line-buffer-identification)
truncate-lines t
buffer-read-only t)
(make-local-hook 'riece-update-buffer-functions)
\\{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)
+
+ (make-local-variable 'riece-mode-line-buffer-identification)
(setq major-mode 'riece-user-list-mode
- mode-name "Users"
+ mode-name "Users"
+ riece-mode-line-buffer-identification
+ '("Riece: " riece-long-channel-indicator " ")
mode-line-buffer-identification
(riece-mode-line-buffer-identification
- '("Riece: " riece-long-channel-indicator " "))
+ riece-mode-line-buffer-identification)
truncate-lines t
buffer-read-only t)
(if (boundp 'transient-mark-mode)
(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.
+(defvar reporter-prompt-for-summary-p)
+(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
+ (when (riece-server-process-opened (cdr (car pointer)))
+ (process-send-string (cdr (car pointer)) "VERSION\r\n")
+ (if (setq nickname
+ (with-current-buffer (process-buffer (cdr (car pointer)))
+ riece-real-nickname))
+ (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.")
+ (delete-other-windows)
+ (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
- (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)))
+ (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))))
- (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)))))
+ (insert "\n\nRecent debug messages:\n"
+ "-----------------------------------\n"
+ (with-current-buffer riece-debug-buffer
+ (buffer-string)))
+ ;; 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)
projects / riece / blobdiff