X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-hello.el;h=2849fc6ffdaae40d7c7eb83585a9332a17e27ee7;hb=b5c71adc8fb1098c4ce2577b21a662fae346570f;hp=13de6f8150e9c93d21ca1addf50e9cde7deddf69;hpb=e9394932f7ccf71755faed8965876e6869e0eacb;p=notmuch diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el index 13de6f81..2849fc6f 100644 --- a/emacs/notmuch-hello.el +++ b/emacs/notmuch-hello.el @@ -24,9 +24,9 @@ (require 'cl) (require 'notmuch-lib) -(require 'notmuch) +(require 'notmuch-mua) -(declare-function notmuch-search "notmuch" (query &optional oldest-first target-thread target-line)) +(declare-function notmuch-search "notmuch" (query &optional oldest-first target-thread target-line continuation)) (declare-function notmuch-folder-count "notmuch" (search)) (defcustom notmuch-hello-recent-searches-max 10 @@ -54,15 +54,14 @@ :type 'boolean :group 'notmuch) -(defcustom notmuch-hello-logo-background "#5f5f5f" +(defface notmuch-hello-logo-background + '((((class color) + (background dark)) + (:background "#5f5f5f")) + (((class color) + (background light)) + (:background "white"))) "Background colour for the notmuch logo." - :type 'color - :group 'notmuch) - -(defcustom notmuch-hello-jump-to-search nil - "Whether `notmuch-hello' should always jump to the search -field." - :type 'boolean :group 'notmuch) (defvar notmuch-hello-url "http://notmuchmail.org" @@ -71,7 +70,7 @@ field." (defvar notmuch-hello-recent-searches nil) (defun notmuch-hello-remember-search (search) - (if (not (memq search notmuch-hello-recent-searches)) + (if (not (member search notmuch-hello-recent-searches)) (push search notmuch-hello-recent-searches)) (if (> (length notmuch-hello-recent-searches) notmuch-hello-recent-searches-max) @@ -142,9 +141,8 @@ diagonal." notmuch-search-oldest-first nil nil #'notmuch-hello-search-continuation)) -(defun notmuch-hello-insert-tags (tag-alist widest) - (let* ((tag-format-string (format "%%-%ds " widest)) - (tags-per-line (max 1 +(defun notmuch-hello-insert-tags (tag-alist widest target) + (let* ((tags-per-line (max 1 (/ (- (window-width) notmuch-hello-indent) ;; Count is 7 wide, 1 for the space ;; after the name. @@ -153,7 +151,8 @@ diagonal." (reordered-list (notmuch-hello-reflect tag-alist tags-per-line)) ;; Hack the display of the buttons used. (widget-push-button-prefix "") - (widget-push-button-suffix "")) + (widget-push-button-suffix "") + (found-target-pos nil)) ;; dme: It feels as though there should be a better way to ;; implement this loop than using an incrementing counter. (loop for elem in reordered-list @@ -161,10 +160,14 @@ diagonal." ;; (not elem) indicates an empty slot in the matrix. (when elem (widget-insert (format "%6s " (notmuch-folder-count (cdr elem)))) + (if (string= (car elem) target) + (progn + (setq found-target-pos (point-marker)))) (widget-create 'push-button :notify #'notmuch-hello-widget-search :notmuch-search-terms (cdr elem) - (format tag-format-string (car elem)))) + (car elem)) + (insert (make-string (- widest (length (car elem))) ? ))) (setq count (1+ count)) (if (eq (% count tags-per-line) 0) (widget-insert "\n")))) @@ -172,7 +175,8 @@ diagonal." ;; If the last line was not full (and hence did not include a ;; carriage return), insert one now. (if (not (eq (% count tags-per-line) 0)) - (widget-insert "\n")))) + (widget-insert "\n")) + found-target-pos)) (defun notmuch-hello-goto-search () "Put point inside the `search' widget, which we know is first." @@ -183,14 +187,19 @@ diagonal." (defimage notmuch-hello-logo ((:type png :file "notmuch-logo.png"))) (defun notmuch-hello-search-continuation() - (notmuch-hello t)) + (notmuch-hello-update t)) (defun notmuch-hello-update (&optional no-display) ;; Lazy - rebuild everything. (interactive) - (notmuch-hello no-display)) - -(defun notmuch-hello (&optional no-display) + (let ((target (if (widget-at) + (widget-value (widget-at)) + (progn + (widget-forward 1) + (widget-value (widget-at)))))) + (notmuch-hello no-display target))) + +(defun notmuch-hello (&optional no-display target) (interactive) (if no-display @@ -208,12 +217,16 @@ diagonal." (when notmuch-hello-show-logo (let ((image notmuch-hello-logo)) - ;; dme: Sorry, I don't know any other way to achieve this :-( The - ;; notmuch logo uses transparency. That works out badly when - ;; inserting the image into an emacs buffer, so force the - ;; background colour of the image. - (setq image (cons 'image (append (cdr image) - `(:background ,notmuch-hello-logo-background)))) + ;; The notmuch logo uses transparency. That can display poorly + ;; when inserting the image into an emacs buffer (black logo on + ;; a black background), so force the background colour of the + ;; image. We use a face to represent the colour so that + ;; `defface' can be used to declare the different possible + ;; colours, which depend on whether the frame has a light or + ;; dark background. + (setq image (cons 'image + (append (cdr image) + (list :background (face-background 'notmuch-hello-logo-background))))) (insert-image image)) (widget-insert " ")) @@ -235,124 +248,125 @@ diagonal." (car (process-lines notmuch-command "count"))) (widget-insert " messages (that's not much mail).\n\n")) - (let ((start (point))) - (widget-insert "Search: ") - (widget-create 'editable-field - ;; Leave some space at the start and end of the - ;; search boxes. - :size (max 8 (- (window-width) (* 2 notmuch-hello-indent) - (length "Search: "))) - :action (lambda (widget &rest ignore) - (notmuch-hello-search (widget-value widget)))) - (widget-insert "\n") - (indent-rigidly start (point) notmuch-hello-indent)) - - (when notmuch-hello-recent-searches - (widget-insert "\nRecent searches: ") - (widget-create 'push-button - :notify (lambda (&rest ignore) - (setq notmuch-hello-recent-searches nil) - (notmuch-hello-update)) - "clear") - (widget-insert "\n\n") - (let ((start (point)) - (key 0)) - (mapc '(lambda (search) - (widget-insert (format "%2d: " key)) - (let ((widget-symbol (intern (format "notmuch-hello-search-%d" key)))) - (set widget-symbol - (widget-create 'editable-field - ;; Leave some space at the start - ;; and end of the search boxes. 4 - ;; for the accelerator key. 1 for - ;; the space before the `save' - ;; button. 6 for the `save' - ;; button. - :size (max 8 (- (window-width) (* 2 notmuch-hello-indent) - 4 1 6)) - :action (lambda (widget &rest ignore) - (notmuch-hello-search (widget-value widget))) - search)) - (widget-insert " ") - (widget-create 'push-button - :notify (lambda (widget &rest ignore) - (notmuch-hello-add-saved-search widget)) - :notmuch-saved-search-widget widget-symbol - "save")) - (widget-insert "\n") - (setq key (1+ key))) - notmuch-hello-recent-searches) - (indent-rigidly start (point) notmuch-hello-indent))) - - (let* ((saved-alist - ;; Filter out empty saved seaches if required. - (if notmuch-hello-show-empty-saved-searches - notmuch-hello-saved-searches - (loop for elem in notmuch-hello-saved-searches - if (> (string-to-number (notmuch-folder-count (cdr elem))) 0) - collect elem))) - (saved-widest (notmuch-hello-longest-label saved-alist)) - (alltags-alist (mapcar '(lambda (tag) (cons tag (concat "tag:" tag))) - (process-lines notmuch-command "search-tags"))) - (alltags-widest (notmuch-hello-longest-label alltags-alist)) - (widest (max saved-widest alltags-widest))) - - (when saved-alist - (widget-insert "\nSaved searches: ") - (widget-create 'push-button - :notify (lambda (&rest ignore) - (customize-variable 'notmuch-hello-saved-searches)) - "edit") - (widget-insert "\n\n") - (let ((start (point))) - (notmuch-hello-insert-tags saved-alist widest) - (indent-rigidly start (point) notmuch-hello-indent))) + (let ((found-target-pos nil) + (final-target-pos nil)) + (let* ((saved-alist + ;; Filter out empty saved seaches if required. + (if notmuch-hello-show-empty-saved-searches + notmuch-hello-saved-searches + (loop for elem in notmuch-hello-saved-searches + if (> (string-to-number (notmuch-folder-count (cdr elem))) 0) + collect elem))) + (saved-widest (notmuch-hello-longest-label saved-alist)) + (alltags-alist (mapcar '(lambda (tag) (cons tag (concat "tag:" tag))) + (process-lines notmuch-command "search-tags"))) + (alltags-widest (notmuch-hello-longest-label alltags-alist)) + (widest (max saved-widest alltags-widest))) + + (when saved-alist + (widget-insert "Saved searches: ") + (widget-create 'push-button + :notify (lambda (&rest ignore) + (customize-variable 'notmuch-hello-saved-searches)) + "edit") + (widget-insert "\n\n") + (let ((start (point))) + (setq found-target-pos (notmuch-hello-insert-tags saved-alist widest target)) + (if (not final-target-pos) + (setq final-target-pos found-target-pos)) + (indent-rigidly start (point) notmuch-hello-indent))) - (when alltags-alist - (widget-insert "\nAll tags:\n\n") (let ((start (point))) - (notmuch-hello-insert-tags alltags-alist widest) - (indent-rigidly start (point) notmuch-hello-indent)))) - - (let ((start (point))) - (widget-insert "\n\n") - (widget-insert "Type a search query and hit RET to view matching threads.\n") - (when notmuch-hello-recent-searches - (widget-insert "Hit RET to re-submit a previous search. Edit it first if you like.\n") - (let ((searches (length notmuch-hello-recent-searches))) - (widget-insert - (if (eq 1 searches) - "Key 0 acts as an accelerator for the previous query.\n" - (format "Keys 0-%d act as accelerators for the previous queries.\n" - (- searches 1))))) - (widget-insert "Save recent searches with the `save' button.\n")) - (when notmuch-hello-saved-searches - (widget-insert "Edit saved searches with the `edit' button.\n")) - (widget-insert "Hit RET or click on a saved search or tag name to view matching threads.\n") - (widget-insert "`=' refreshes this screen. `s' jumps to the search box. `q' to quit.\n") - (let ((fill-column (- (window-width) notmuch-hello-indent))) - (center-region start (point)))) - - (use-local-map widget-keymap) - (local-set-key "=" 'notmuch-hello-update) - (local-set-key "q" '(lambda () (interactive) (kill-buffer (current-buffer)))) - (local-set-key "s" 'notmuch-hello-goto-search) - (local-set-key "v" '(lambda () (interactive) - (message "notmuch version %s" (notmuch-version)))) - - (loop for key from 0 to (- (length notmuch-hello-recent-searches) 1) - do (let ((widget-symbol (intern (format "notmuch-hello-search-%d" key)))) - (local-set-key (number-to-string key) - `(lambda () - (interactive) - (notmuch-search (widget-value ,widget-symbol) - notmuch-search-oldest-first - nil nil #'notmuch-hello-search-continuation))))) - (widget-setup) - - (if notmuch-hello-jump-to-search - (notmuch-hello-goto-search) - (goto-char (point-min)))) + (widget-insert "\nSearch: ") + (widget-create 'editable-field + ;; Leave some space at the start and end of the + ;; search boxes. + :size (max 8 (- (window-width) (* 2 notmuch-hello-indent) + (length "Search: "))) + :action (lambda (widget &rest ignore) + (notmuch-hello-search (widget-value widget)))) + (widget-insert "\n") + (indent-rigidly start (point) notmuch-hello-indent)) + + (when notmuch-hello-recent-searches + (widget-insert "\nRecent searches: ") + (widget-create 'push-button + :notify (lambda (&rest ignore) + (setq notmuch-hello-recent-searches nil) + (notmuch-hello-update)) + "clear") + (widget-insert "\n\n") + (let ((start (point)) + (nth 0)) + (mapc '(lambda (search) + (let ((widget-symbol (intern (format "notmuch-hello-search-%d" nth)))) + (set widget-symbol + (widget-create 'editable-field + ;; Don't let the search boxes be + ;; less than 8 characters wide. + :size (max 8 + (- (window-width) + ;; Leave some space + ;; at the start and + ;; end of the + ;; boxes. + (* 2 notmuch-hello-indent) + ;; 1 for the space + ;; before the + ;; `[save]' button. 6 + ;; for the `[save]' + ;; button. + 1 6)) + :action (lambda (widget &rest ignore) + (notmuch-hello-search (widget-value widget))) + search)) + (widget-insert " ") + (widget-create 'push-button + :notify (lambda (widget &rest ignore) + (notmuch-hello-add-saved-search widget)) + :notmuch-saved-search-widget widget-symbol + "save")) + (widget-insert "\n") + (setq nth (1+ nth))) + notmuch-hello-recent-searches) + (indent-rigidly start (point) notmuch-hello-indent))) + + (when alltags-alist + (widget-insert "\nAll tags:\n\n") + (let ((start (point))) + (setq found-target-pos (notmuch-hello-insert-tags alltags-alist widest target)) + (if (not final-target-pos) + (setq final-target-pos found-target-pos)) + (indent-rigidly start (point) notmuch-hello-indent)))) + + (let ((start (point))) + (widget-insert "\n\n") + (widget-insert "Type a search query and hit RET to view matching threads.\n") + (when notmuch-hello-recent-searches + (widget-insert "Hit RET to re-submit a previous search. Edit it first if you like.\n") + (widget-insert "Save recent searches with the `save' button.\n")) + (when notmuch-hello-saved-searches + (widget-insert "Edit saved searches with the `edit' button.\n")) + (widget-insert "Hit RET or click on a saved search or tag name to view matching threads.\n") + (widget-insert "`=' refreshes this screen. `s' jumps to the search box. `q' to quit.\n") + (let ((fill-column (- (window-width) notmuch-hello-indent))) + (center-region start (point)))) + + (use-local-map widget-keymap) + (local-set-key "=" 'notmuch-hello-update) + (local-set-key "m" 'notmuch-mua-mail) + (local-set-key "q" '(lambda () (interactive) (kill-buffer (current-buffer)))) + (local-set-key "s" 'notmuch-hello-goto-search) + (local-set-key "v" '(lambda () (interactive) + (message "notmuch version %s" (notmuch-version)))) + + (widget-setup) + + (if final-target-pos + (goto-char final-target-pos) + (progn + (goto-char (point-min)) + (widget-forward 1))))) ;;