X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-addon.el;h=a2a6bc326eeb7fd16293a4fe6fc97384f6a30397;hp=c5fb4e10d708e827ddf5be8cea3f425d8503d5f4;hb=8f85eb7ad3c09298932116b76d2ee6ad415a354c;hpb=d9cce67ff213635129df36a38ca1a29cc5fe4a52 diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el index c5fb4e1..a2a6bc3 100644 --- a/lisp/riece-addon.el +++ b/lisp/riece-addon.el @@ -55,7 +55,7 @@ '((((class color) (background dark)) (:foreground "PaleTurquoise" :italic t)) (t - (:italic t))) + ())) "Face used for displaying the disabled addon." :group 'riece-addon-list-faces) (defvar riece-addon-list-disabled-face 'riece-addon-list-disabled-face) @@ -69,12 +69,12 @@ :group 'riece-addon-list-faces) (defvar riece-addon-list-unsupported-face 'riece-addon-list-unsupported-face) -(defface riece-addon-list-unknown-face +(defface riece-addon-list-uninstalled-face '((t - (:foreground "red"))) - "Face used for displaying the unknown addon." + (:italic t))) + "Face used for displaying the uninstalled addon." :group 'riece-addon-list-faces) -(defvar riece-addon-list-unknown-face 'riece-addon-list-unknown-face) +(defvar riece-addon-list-uninstalled-face 'riece-addon-list-uninstalled-face) (defface riece-addon-list-description-face '((((class color) @@ -93,13 +93,13 @@ '((?+ . riece-addon-list-enabled-face) (?- . riece-addon-list-disabled-face) (?! . riece-addon-list-unsupported-face) - (?? . riece-addon-list-unknown-face)) + (? . riece-addon-list-uninstalled-face)) "An alist mapping marks on riece-addon-list-buffer to faces." :type 'list :group 'riece-addon-list) (defcustom riece-addon-list-font-lock-keywords - '(("^\\([-+!?] [^:]+\\): \\(.*\\)" + '(("^\\([-+! ] [^:]+\\): \\(.*\\)" (1 (cdr (assq (aref (match-string 1) 0) riece-addon-list-mark-face-alist))) (2 riece-addon-list-description-face))) @@ -111,6 +111,9 @@ (let ((keymap (make-sparse-keymap))) (define-key keymap "+" 'riece-command-enable-addon) (define-key keymap "-" 'riece-command-disable-addon) + (define-key keymap "i" 'riece-command-insinuate-addon) + (define-key keymap "u" 'riece-command-uninstall-addon) + (define-key keymap "U" 'riece-command-unload-addon) (define-key keymap "n" 'next-line) (define-key keymap "p" 'previous-line) (define-key keymap " " 'scroll-up) @@ -194,14 +197,30 @@ (riece-sort-addon-dependencies (riece-load-and-build-addon-dependencies addons))) -(defun riece-insinuate-addon (addon &optional verbose) +(defun riece-insinuate-addon-1 (addon verbose) (if (get addon 'riece-addon-insinuated) (if verbose (message "Add-on %S is already insinuated" addon)) + (require addon) (funcall (intern (concat (symbol-name addon) "-insinuate"))) (put addon 'riece-addon-insinuated t) (if verbose - (message "Add-on %S is insinuated" addon)))) + (message "Add-on %S is insinuated" addon)) + (unless (get addon 'riece-addon-default-disabled) + (riece-enable-addon addon t)))) + +(defun riece-insinuate-addon (addon &optional verbose) + (unless (assq addon riece-addon-dependencies) + (setq riece-addons (cons addon riece-addons) + riece-addon-dependencies (riece-resolve-addons + (copy-sequence riece-addons)))) + (let ((pointer riece-addon-dependencies)) + (while pointer + (unless (get (car (car pointer)) 'riece-addon-insinuated) + (riece-insinuate-addon-1 (car (car pointer)) verbose)) + (if (eq (car (car pointer)) addon) + (setq pointer nil) + (setq pointer (cdr pointer)))))) (defun riece-uninstall-addon (addon &optional verbose) (if (not (get addon 'riece-addon-insinuated)) @@ -212,8 +231,9 @@ (if entry (if (cdr entry) (if (= (length (cdr entry)) 1) - (error "%S depends %S" (car (cdr entry)) addon) - (error "%s depends %S" (mapconcat #'identity (cdr entry) ",") + (error "%S depends on %S" (car (cdr entry)) addon) + (error "%s depend on %S" + (mapconcat #'symbol-name (cdr entry) ", ") addon)) (if (and enabled (symbol-value enabled)) @@ -223,11 +243,16 @@ #'ignore)) (setq riece-addon-dependencies (delq entry riece-addon-dependencies)) - (put addon 'riece-addon-insinuated nil))) + (remprop addon 'riece-addon-insinuated) + (setq riece-addons (delq addon riece-addons) + riece-addon-dependencies (riece-resolve-addons + (copy-sequence riece-addons))))) (if verbose (message "Add-on %S is uninstalled" addon))))) (defun riece-enable-addon (addon &optional verbose) + (unless (get addon 'riece-addon-insinuated) + (error "Add-on %S is not insinuated" addon)) (let ((enabled (intern-soft (concat (symbol-name addon) "-enabled")))) (if (null enabled) (if verbose @@ -240,6 +265,8 @@ (message "Add-on %S enabled" addon)))))) (defun riece-disable-addon (addon &optional verbose) + (unless (get addon 'riece-addon-insinuated) + (error "Add-on %S is not insinuated" addon)) (let ((enabled (intern-soft (concat (symbol-name addon) "-enabled")))) (if (null enabled) (if verbose @@ -276,7 +303,7 @@ All normal editing commands are turned off." (defun riece-command-list-addons () (interactive) - (set-buffer (riece-get-buffer-create "*AddOns*" 'riece-addon-list-mode)) + (set-buffer (riece-get-buffer-create "*AddOn*" 'riece-addon-list-mode)) (riece-addon-list-mode) (let ((inhibit-read-only t) buffer-read-only @@ -284,7 +311,6 @@ All normal editing commands are turned off." module-description-alist description enabled point) (while pointer - (setq description (intern-soft (concat (symbol-name (car (car pointer))) "-description")) module-description-alist @@ -303,21 +329,25 @@ All normal editing commands are turned off." (setq pointer (cdr pointer))) (erase-buffer) (riece-kill-all-overlays) - (setq pointer module-description-alist) + (setq pointer (sort module-description-alist + (lambda (entry1 entry2) + (string-lessp (symbol-name (car entry1)) + (symbol-name (car entry2)))))) (while pointer (setq enabled (intern-soft (concat (symbol-name (car (car pointer))) "-enabled"))) (setq point (point)) (insert (format "%c %S: %s\n" - (if (not (featurep (car (car pointer)))) - ?? + (if (not (get (car (car pointer)) + 'riece-addon-insinuated)) + ? (if (null enabled) ?! (if (symbol-value enabled) ?+ ?-))) (car (car pointer)) - description)) + (cdr (car pointer)))) (put-text-property point (point) 'riece-addon (car (car pointer))) (setq pointer (cdr pointer))) (insert " @@ -326,7 +356,7 @@ Symbols in the leftmost column: + The add-on is enabled. - The add-on is disabled. ! The add-on doesn't support enable/disable operation. - ? The add-on status is unknown. + The add-on is not insinuated. ") (insert (substitute-command-keys " Useful keys: @@ -338,6 +368,14 @@ Useful keys: (pop-to-buffer (current-buffer)) (delete-other-windows))) +(defun riece-addon-list-set-point (addon) + (let ((point (point-min))) + (while (and (not (eq (get-text-property point 'riece-addon) addon)) + (setq point (next-single-property-change point + 'riece-addon)))) + (if point + (goto-char point)))) + (defun riece-command-enable-addon (addon) (interactive (list @@ -358,12 +396,7 @@ Useful keys: (riece-enable-addon addon t) (when (eq major-mode 'riece-addon-list-mode) (riece-command-list-addons) - (let ((point (point-min))) - (while (and (not (eq (get-text-property point 'riece-addon) addon)) - (setq point (next-single-property-change point - 'riece-addon)))) - (if point - (goto-char point))))) + (riece-addon-list-set-point addon))) (defun riece-command-disable-addon (addon) (interactive @@ -385,12 +418,65 @@ Useful keys: (riece-disable-addon addon t) (when (eq major-mode 'riece-addon-list-mode) (riece-command-list-addons) - (let ((point (point-min))) - (while (and (not (eq (get-text-property point 'riece-addon) addon)) - (setq point (next-single-property-change point - 'riece-addon)))) - (if point - (goto-char point))))) + (riece-addon-list-set-point addon))) + +(defun riece-command-insinuate-addon (addon) + (interactive + (list + (or (if (eq major-mode 'riece-addon-list-mode) + (get-text-property (point) 'riece-addon)) + (intern-soft + (completing-read "Add-on: " + (mapcar (lambda (dependency) + (list (symbol-name (car dependency)))) + riece-addon-modules) + (lambda (pointer) + (not (get (car pointer) 'riece-addon-insinuated))) + t))))) + (riece-insinuate-addon addon t) + (when (eq major-mode 'riece-addon-list-mode) + (riece-command-list-addons) + (riece-addon-list-set-point addon))) + +(defun riece-command-uninstall-addon (addon) + (interactive + (list + (or (if (eq major-mode 'riece-addon-list-mode) + (get-text-property (point) 'riece-addon)) + (intern-soft + (completing-read "Add-on: " + (mapcar (lambda (dependency) + (list (symbol-name (car dependency)))) + riece-addon-dependencies) + (lambda (pointer) + (get (car pointer) 'riece-addon-insinuated)) + t))))) + (riece-uninstall-addon addon t) + (when (eq major-mode 'riece-addon-list-mode) + (riece-command-list-addons) + (riece-addon-list-set-point addon))) + +(defun riece-command-unload-addon (addon) + (interactive + (list + (or (if (eq major-mode 'riece-addon-list-mode) + (get-text-property (point) 'riece-addon)) + (intern-soft + (completing-read "Add-on: " + (mapcar (lambda (dependency) + (list (symbol-name (car dependency)))) + riece-addon-dependencies) + (lambda (pointer) + (get (car pointer) 'riece-addon-insinuated)) + t))))) + (riece-uninstall-addon addon t) + (if (get addon 'riece-addon-not-unloadable) + (message "Add-on %S is not allowed to unload" addon) + (unload-feature addon) + (message "Add-on %S is unloaded" addon)) + (when (eq major-mode 'riece-addon-list-mode) + (riece-command-list-addons) + (riece-addon-list-set-point addon))) (provide 'riece-addon)