X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece.el;h=373afff7d2b0f699da3d83a68b012a56839b455e;hp=5ffc199f062902fb6ea45059e5ce6256f6e40e44;hb=f9a1124de09f7131e989729aac4f4ed052890989;hpb=be2acc33c38d2001a6e0342de584dfb361bb4f65;ds=sidebyside diff --git a/lisp/riece.el b/lisp/riece.el index 5ffc199..373afff 100644 --- a/lisp/riece.el +++ b/lisp/riece.el @@ -29,6 +29,7 @@ (require 'riece-server) (require 'riece-compat) (require 'riece-commands) +(require 'riece-addon) (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,6 +63,9 @@ (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 "2" riece-command-switch-to-channel-by-number-2 @@ -147,10 +151,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 +187,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 +196,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 +271,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) @@ -291,6 +307,11 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect." (while server-list (riece-command-open-server (car server-list)) (setq server-list (cdr server-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")))) @@ -346,7 +367,7 @@ For a list of the generic commands type \\[riece-command-generic] ? RET. (setq riece-away-indicator "-" riece-operator-indicator "-" major-mode 'riece-command-mode - mode-name "Commands" + mode-name "Command" mode-line-buffer-identification (riece-mode-line-buffer-identification '("Riece: " @@ -368,7 +389,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. @@ -409,6 +430,7 @@ 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: " @@ -424,7 +446,7 @@ 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-name "Channels" mode-line-buffer-identification (riece-mode-line-buffer-identification '("Riece: ")) truncate-lines t @@ -443,7 +465,7 @@ Instead, these commands are available: (kill-all-local-variables) (buffer-disable-undo) (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 " ")) @@ -469,74 +491,6 @@ 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))))) - (provide 'riece) ;;; riece.el ends here