(require 'notmuch-mua)
(declare-function notmuch-search "notmuch" (query &optional oldest-first target-thread target-line continuation))
-(declare-function notmuch-folder-count "notmuch" (search))
+(declare-function notmuch-poll "notmuch" ())
(defvar notmuch-hello-search-bar-marker nil
"The position of the search bar within the notmuch-hello buffer.")
-(defcustom notmuch-hello-recent-searches-max 10
+(defcustom notmuch-recent-searches-max 10
"The number of recent searches to store and display."
:type 'integer
:group 'notmuch)
-(defcustom notmuch-hello-show-empty-saved-searches nil
+(defcustom notmuch-show-empty-saved-searches nil
"Should saved searches with no messages be listed?"
:type 'boolean
:group 'notmuch)
-(defcustom notmuch-hello-indent 4
- "How much to indent non-headers."
- :type 'integer
- :group 'notmuch)
+(defvar notmuch-hello-indent 4
+ "How much to indent non-headers.")
-(defcustom notmuch-hello-saved-searches notmuch-folders
- "A list of saved searches to display."
- :type '(alist :key-type string :value-type string)
- :group 'notmuch)
-
-(defcustom notmuch-hello-show-logo t
+(defcustom notmuch-show-logo t
"Should the notmuch logo be shown?"
:type 'boolean
:group 'notmuch)
-(defcustom notmuch-hello-show-tags nil
+(defcustom notmuch-show-all-tags-list nil
"Should all tags be shown in the notmuch-hello view?"
:type 'boolean
:group 'notmuch)
(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)
+ notmuch-recent-searches-max)
(setq notmuch-hello-recent-searches (butlast notmuch-hello-recent-searches))))
(defun notmuch-hello-trim (search)
(symbol-value
(widget-get widget :notmuch-saved-search-widget))))
(name (completing-read "Name for saved search: "
- notmuch-hello-saved-searches)))
+ notmuch-saved-searches)))
;; If an existing saved search with this name exists, remove it.
- (setq notmuch-hello-saved-searches
- (loop for elem in notmuch-hello-saved-searches
+ (setq notmuch-saved-searches
+ (loop for elem in notmuch-saved-searches
if (not (equal name
(car elem)))
collect elem))
;; Add the new one.
- (customize-save-variable 'notmuch-hello-saved-searches
+ (customize-save-variable 'notmuch-saved-searches
(push (cons name search)
- notmuch-hello-saved-searches))
+ notmuch-saved-searches))
(message "Saved '%s' as '%s'." search name)
(notmuch-hello-update)))
(+ (/ dividend divisor)
(if (> (% dividend divisor) 0) 1 0)))
-(defun notmuch-hello-reflect (list width)
- "Reflect a `width' wide matrix represented by `list' along the
+(defun notmuch-hello-reflect-generate-row (ncols nrows row list)
+ (let ((len (length list)))
+ (loop for col from 0 to (- ncols 1)
+ collect (let ((offset (+ (* nrows col) row)))
+ (if (< offset len)
+ (nth offset list)
+ ;; Don't forget to insert an empty slot in the
+ ;; output matrix if there is no corresponding
+ ;; value in the input matrix.
+ nil)))))
+
+(defun notmuch-hello-reflect (list ncols)
+ "Reflect a `ncols' wide matrix represented by `list' along the
diagonal."
;; Not very lispy...
- (let* ((len (length list))
- (nrows (notmuch-hello-roundup len width)))
+ (let ((nrows (notmuch-hello-roundup (length list) ncols)))
(loop for row from 0 to (- nrows 1)
- append (loop for col from 0 to (- width 1)
- ;; How could we calculate the offset just once
- ;; per inner-loop?
- if (< (+ (* nrows col) row) len)
- collect (nth (+ (* nrows col) row) list)
- else
- ;; Don't forget to insert an empty slot in the
- ;; output matrix if there is no corresponding
- ;; value in the input matrix.
- collect nil))))
+ append (notmuch-hello-reflect-generate-row ncols nrows row list))))
(defun notmuch-hello-widget-search (widget &rest ignore)
(notmuch-search (widget-get widget
notmuch-search-oldest-first
nil nil #'notmuch-hello-search-continuation))
+(defun notmuch-saved-search-count (search)
+ (car (process-lines notmuch-command "count" search)))
+
(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.
+ ;; Count is 7 wide (6 digits plus
+ ;; space), 1 for the space after the
+ ;; name.
(+ 7 1 widest))))
(count 0)
(reordered-list (notmuch-hello-reflect tag-alist tags-per-line))
(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
- do (progn
- ;; (not elem) indicates an empty slot in the matrix.
- (when elem
- (widget-insert (format "%6s " (notmuch-folder-count (cdr elem))))
- (if (string= (format "%s " (car elem)) target)
- (setq found-target-pos (point-marker)))
- (widget-create 'push-button
- :notify #'notmuch-hello-widget-search
- :notmuch-search-terms (cdr elem)
- (format "%s " (car elem)))
- (insert (make-string (1- (- widest (length (car elem)))) ? )))
- (setq count (1+ count))
- (if (eq (% count tags-per-line) 0)
- (widget-insert "\n"))))
+ (mapc (lambda (elem)
+ ;; (not elem) indicates an empty slot in the matrix.
+ (when elem
+ (let* ((name (car elem))
+ (query (cdr elem))
+ (formatted-name (format "%s " name)))
+ (widget-insert (format "%6s " (notmuch-saved-search-count query)))
+ (if (string= formatted-name target)
+ (setq found-target-pos (point-marker)))
+ (widget-create 'push-button
+ :notify #'notmuch-hello-widget-search
+ :notmuch-search-terms query
+ formatted-name)
+ ;; Insert enough space to consume the rest of the
+ ;; column. Because the button for the name is `(1+
+ ;; (length name))' long (due to the trailing space) we
+ ;; can just insert `(- widest (length name))' spaces -
+ ;; the column separator is included in the button if
+ ;; `(equal widest (length name)'.
+ (widget-insert (make-string (- widest (length name)) ? ))))
+ (setq count (1+ count))
+ (if (eq (% count tags-per-line) 0)
+ (widget-insert "\n")))
+ reordered-list)
;; If the last line was not full (and hence did not include a
;; carriage return), insert one now.
(interactive)
(notmuch-hello no-display))
+(defun notmuch-hello-poll-and-update ()
+ "Invoke `notmuch-poll' to import mail, then refresh the current view."
+ (interactive)
+ (notmuch-poll)
+ (notmuch-hello-update))
+
(defun notmuch-hello (&optional no-display)
(interactive)
+ ; Jump through a hoop to get this value from the deprecated variable
+ ; name (`notmuch-folders') or from the default value.
+ (if (not notmuch-saved-searches)
+ (setq notmuch-saved-searches (notmuch-saved-searches)))
+
(if no-display
(set-buffer "*notmuch-hello*")
(switch-to-buffer "*notmuch-hello*"))
(mapc 'delete-overlay (car all))
(mapc 'delete-overlay (cdr all)))
- (when notmuch-hello-show-logo
+ (when notmuch-show-logo
(let ((image notmuch-hello-logo))
;; The notmuch logo uses transparency. That can display poorly
;; when inserting the image into an emacs buffer (black logo on
(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)
+ (if notmuch-show-empty-saved-searches
+ notmuch-saved-searches
+ (loop for elem in notmuch-saved-searches
+ if (> (string-to-number (notmuch-saved-search-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-alist (if notmuch-show-all-tags-list
+ (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)))
(widget-insert "Saved searches: ")
(widget-create 'push-button
:notify (lambda (&rest ignore)
- (customize-variable 'notmuch-hello-saved-searches))
+ (customize-variable 'notmuch-saved-searches))
"edit")
(widget-insert "\n\n")
(setq final-target-pos (point-marker))
(indent-rigidly start (point) notmuch-hello-indent)))
(when alltags-alist
- (if notmuch-hello-show-tags
- (progn
- (widget-insert "\nAll tags: ")
- (widget-create 'push-button
- :notify (lambda (widget &rest ignore)
- (setq notmuch-hello-show-tags nil)
- (notmuch-hello-update))
- "hide")
- (widget-insert "\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)))
- (widget-insert "\n")
+ (widget-insert "\nAll tags: ")
+ (widget-create 'push-button
+ :notify (lambda (widget &rest ignore)
+ (setq notmuch-show-all-tags-list nil)
+ (notmuch-hello-update))
+ "hide")
+ (widget-insert "\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)))
+
+ (widget-insert "\n")
+
+ (if (not notmuch-show-all-tags-list)
(widget-create 'push-button
:notify (lambda (widget &rest ignore)
- (setq notmuch-hello-show-tags t)
+ (setq notmuch-show-all-tags-list t)
(notmuch-hello-update))
- "Show all tags"))))
+ "Show all tags")))
(let ((start (point)))
(widget-insert "\n\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
+ (when notmuch-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")
(use-local-map widget-keymap)
(local-set-key "=" 'notmuch-hello-update)
+ (local-set-key "G" 'notmuch-hello-poll-and-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)
(if (not (widget-at))
(widget-forward 1)))))
+;;;###autoload
+(defun notmuch-folder ()
+ "Deprecated function for invoking notmuch---calling `notmuch' is preferred now."
+ (interactive)
+ (notmuch-hello))
+
;;
(provide 'notmuch-hello)
projects / notmuch / blobdiff