acdw/emacs
acdw/emacs
1
2
Fork 0
Code Issues 4 Pull Requests Releases Activity

Further mode line changes

Browse Source
This commit is contained in:
Case Duckworth 2022-05-10 13:57:19 -05:00
parent a6085b58a2
commit 1492d153f0
1 changed files with 163 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
lisp/+modeline.el
View File

@ -51,8 +51,8 @@ This function makes a lambda, so you can throw it straight into
(not (equal (car result-list) "")))) (not (equal (car result-list) ""))))
(setq this-sep separator) (setq this-sep separator)
(setq this-sep nil))) (setq this-sep nil)))
(unless (seq-some #'null result-list) ;; (unless (seq-some #'null result-list)
(push +modeline-default-spacer result-list)) ;; (push +modeline-default-spacer result-list))
(nreverse result-list))))) (nreverse result-list)))))
(defun +modeline-spacer (&optional n spacer &rest strings) (defun +modeline-spacer (&optional n spacer &rest strings)
@ -65,10 +65,11 @@ should form a mode-line construct when `concat'ed."
(let ((spacer (or spacer +modeline-default-spacer)) (let ((spacer (or spacer +modeline-default-spacer))
(n (or n 1)) (n (or n 1))
(strings (cond((null strings) '("")) (strings (cond((null strings) '(""))
((equal strings '("")) nil)
((atom strings) (list strings)) ((atom strings) (list strings))
(t strings))) (t strings)))
r) r)
(dotimes (_ n) (push spacer r)) (when strings (dotimes (_ n) (push spacer r)))
(apply #'concat (apply #'concat r) strings))) (apply #'concat (apply #'concat r) strings)))
;;; Modeline segments ;;; Modeline segments
@ -96,7 +97,7 @@ and appended with `truncate-string-ellipsis'."
(defun +modeline-buffer-name (&optional spacer) ; gonsie (defun +modeline-buffer-name (&optional spacer) ; gonsie
"Display the buffer name." "Display the buffer name."
(let ((bufname (string-trim (string-replace "%" "" (buffer-name))))) (let ((bufname (string-trim (string-replace "%" "" (buffer-name)))))
(+modeline-spacer nil nil (+modeline-spacer nil spacer
(if (and +modeline-buffer-position (fboundp +modeline-buffer-position)) (if (and +modeline-buffer-position (fboundp +modeline-buffer-position))
(funcall +modeline-buffer-position) (funcall +modeline-buffer-position)
(propertize (cond (propertize (cond
@ -123,7 +124,7 @@ and appended with `truncate-string-ellipsis'."
(defun +modeline-minions (&optional spacer) (defun +modeline-minions (&optional spacer)
"Display a button for `minions-minor-modes-menu'." "Display a button for `minions-minor-modes-menu'."
(+modeline-spacer nil nil (+modeline-spacer nil spacer
(propertize (propertize
+modeline-minions-icon +modeline-minions-icon
'help-echo "Minor modes menu\nmouse-1: show menu." 'help-echo "Minor modes menu\nmouse-1: show menu."
@ -147,7 +148,7 @@ in the cdr will be applied to the major-mode in the mode line."
(defun +modeline-major-mode (&optional spacer) (defun +modeline-major-mode (&optional spacer)
"Display the current `major-mode'." "Display the current `major-mode'."
(+modeline-spacer nil nil (+modeline-spacer nil spacer
"(" "("
(propertize ;; (+string-truncate (format-mode-line mode-name) 16) (propertize ;; (+string-truncate (format-mode-line mode-name) 16)
(format-mode-line mode-name) (format-mode-line mode-name)
@ -160,7 +161,7 @@ in the cdr will be applied to the major-mode in the mode line."
(when (derived-mode-p (car cel)) (when (derived-mode-p (car cel))
(throw :done (cdr cel)))) (throw :done (cdr cel))))
(alist-get t +modeline-major-mode-faces)) (alist-get t +modeline-major-mode-faces))
'mode-line-inactive) 'unspecified)
'keymap (let ((map (make-sparse-keymap))) 'keymap (let ((map (make-sparse-keymap)))
(bindings--define-key map [mode-line down-mouse-1] (bindings--define-key map [mode-line down-mouse-1]
`(menu-item "Menu Bar" ignore `(menu-item "Menu Bar" ignore
@ -216,7 +217,7 @@ The order of elements matters: whichever one matches first is applied."
('t t) ('t t)
(_ nil)) (_ nil))
(throw :icon cell)))))) (throw :icon cell))))))
(+modeline-spacer nil nil (+modeline-spacer nil spacer
(propertize (or (cdr-safe icon) "") (propertize (or (cdr-safe icon) "")
'help-echo (format "Buffer \"%s\" is %s." 'help-echo (format "Buffer \"%s\" is %s."
(buffer-name) (buffer-name)
@ -228,7 +229,7 @@ The order of elements matters: whichever one matches first is applied."
(defun +modeline-narrowed (&optional spacer) (defun +modeline-narrowed (&optional spacer)
"Display an indication that the buffer is narrowed." "Display an indication that the buffer is narrowed."
(when (buffer-narrowed-p) (when (buffer-narrowed-p)
(+modeline-spacer nil nil (+modeline-spacer nil spacer
(propertize "N" (propertize "N"
'help-echo (format "%s\n%s" 'help-echo (format "%s\n%s"
"Buffer is narrowed." "Buffer is narrowed."
@ -241,7 +242,7 @@ The order of elements matters: whichever one matches first is applied."
(defun +modeline-reading-mode (&optional spacer) (defun +modeline-reading-mode (&optional spacer)
"Display an indication that the buffer is in `reading-mode'." "Display an indication that the buffer is in `reading-mode'."
(when reading-mode (when reading-mode
(+modeline-spacer nil nil (+modeline-spacer nil spacer
(propertize (propertize
(concat "R" (when (bound-and-true-p +eww-readable-p) "w")) (concat "R" (when (bound-and-true-p +eww-readable-p) "w"))
'help-echo (format "%s\n%s" 'help-echo (format "%s\n%s"
@ -279,7 +280,7 @@ The order of elements matters: whichever one matches first is applied."
"Display the position in the current file." "Display the position in the current file."
(when file-percentage-mode (when file-percentage-mode
;; (let ((perc (+modeline--percentage))) ;; (let ((perc (+modeline--percentage)))
;; (propertize (+modeline-spacer nil nil ;; (propertize (+modeline-spacer nil spacer
;; (cond ;; (cond
;; ((+modeline--buffer-contained-in-window-p) "All") ;; ((+modeline--buffer-contained-in-window-p) "All")
;; ((= (line-number-at-pos) (line-number-at-pos (point-min))) "Top") ;; ((= (line-number-at-pos) (line-number-at-pos (point-min))) "Top")
@ -293,16 +294,18 @@ The order of elements matters: whichever one matches first is applied."
;; ;; TODO: add scroll-up and scroll-down bindings. ;; ;; TODO: add scroll-up and scroll-down bindings.
;; )) ;; ))
(let ((perc (format-mode-line '(-3 "%p")))) (let ((perc (format-mode-line '(-3 "%p"))))
(+modeline-spacer nil nil (+modeline-spacer nil spacer
(pcase perc (pcase perc
((or "Top" "Bot" "All") perc) ("Top" ".^^")
("Bot" ".__")
("All" ".::")
(_ (format ".%02d" (string-to-number (substring perc 0 2))))))))) (_ (format ".%02d" (string-to-number (substring perc 0 2)))))))))
(defun +modeline-file-percentage-icon (&optional spacer) (defun +modeline-file-percentage-icon (&optional spacer)
"Display the position in the current file as an icon." "Display the position in the current file as an icon."
(when file-percentage-mode (when file-percentage-mode
(let ((perc (+modeline--percentage))) (let ((perc (+modeline--percentage)))
(propertize (+modeline-spacer nil nil (propertize (+modeline-spacer nil spacer
(cond (cond
((+modeline--buffer-contained-in-window-p) "⏹") ((+modeline--buffer-contained-in-window-p) "⏹")
((= perc 0) "▇") ((= perc 0) "▇")
@ -321,31 +324,29 @@ The order of elements matters: whichever one matches first is applied."
(defun +modeline-region (&optional spacer) (defun +modeline-region (&optional spacer)
"Display an indicator if the region is active." "Display an indicator if the region is active."
(if (and region-indicator-mode (when (and region-indicator-mode
(region-active-p)) (region-active-p))
(format "%s%s" (+modeline-spacer nil spacer
(or spacer +modeline-default-spacer)
(propertize (format "%s%d" (propertize (format "%s%d"
(if (and (< (point) (mark))) "-" "+") (if (and (< (point) (mark))) "-" "+")
(apply '+ (mapcar (lambda (pos) (apply '+ (mapcar (lambda (pos)
(- (cdr pos) (- (cdr pos)
(car pos))) (car pos)))
(region-bounds)))) (region-bounds))))
'font-lock-face 'font-lock-variable-name-face)) 'font-lock-face 'font-lock-variable-name-face))))
""))
(defun +modeline-line (&optional spacer) (defun +modeline-line (&optional spacer)
(when line-number-mode (when line-number-mode
(+modeline-spacer nil nil "%2l"))) (+modeline-spacer nil spacer "%2l")))
(defun +modeline-column (&optional spacer) (defun +modeline-column (&optional spacer)
(when column-number-mode (when column-number-mode
(+modeline-spacer nil nil (+modeline-spacer nil spacer
(if column-number-indicator-zero-based "%2c" "%2C")))) (if column-number-indicator-zero-based "%2c" "%2C"))))
(defun +modeline-line-column (&optional spacer) ; adapted from `simple-modeline' (defun +modeline-line-column (&optional spacer) ; adapted from `simple-modeline'
"Display the current cursor line and column depending on modes." "Display the current cursor line and column depending on modes."
(+modeline-spacer nil nil (+modeline-spacer nil spacer
(+modeline-line "") (+modeline-line "")
"|" "|"
(+modeline-column ""))) (+modeline-column "")))
@ -361,7 +362,7 @@ The order of elements matters: whichever one matches first is applied."
See `line-number-mode', `column-number-mode', and See `line-number-mode', `column-number-mode', and
`file-percentage-mode'. If `+modeline-position-function' is set `file-percentage-mode'. If `+modeline-position-function' is set
to a function in the current buffer, call that function instead." to a function in the current buffer, call that function instead."
(+modeline-spacer nil nil (+modeline-spacer nil spacer
(cond ((functionp +modeline-position-function) (cond ((functionp +modeline-position-function)
(funcall +modeline-position-function)) (funcall +modeline-position-function))
(t (concat (+modeline-region) (t (concat (+modeline-region)
@ -371,7 +372,7 @@ to a function in the current buffer, call that function instead."
"Display the version control branch of the current buffer in the modeline." "Display the version control branch of the current buffer in the modeline."
;; from https://www.gonsie.com/blorg/modeline.html, from Doom ;; from https://www.gonsie.com/blorg/modeline.html, from Doom
(if-let ((backend (vc-backend buffer-file-name))) (if-let ((backend (vc-backend buffer-file-name)))
(+modeline-spacer nil nil (+modeline-spacer nil spacer
(substring vc-mode (+ (if (eq backend 'Hg) 2 3) 2))) (substring vc-mode (+ (if (eq backend 'Hg) 2 3) 2)))
"")) ""))
@ -382,7 +383,7 @@ to a function in the current buffer, call that function instead."
(defun +modeline-anzu (&optional spacer) (defun +modeline-anzu (&optional spacer)
"Display `anzu--update-mode-line'." "Display `anzu--update-mode-line'."
(+modeline-spacer nil nil (+modeline-spacer nil spacer
(anzu--update-mode-line))) (anzu--update-mode-line)))
(defun +modeline-text-scale (&optional spacer) (defun +modeline-text-scale (&optional spacer)
@ -398,13 +399,13 @@ to a function in the current buffer, call that function instead."
"Display `ace-window-display-mode' information in the modeline." "Display `ace-window-display-mode' information in the modeline."
(when (and +ace-window-display-mode (when (and +ace-window-display-mode
ace-window-mode) ace-window-mode)
(+modeline-spacer nil nil (+modeline-spacer nil spacer
(window-parameter (selected-window) 'ace-window-path)))) (window-parameter (selected-window) 'ace-window-path))))
(defun +modeline-god-mode (&optional spacer) (defun +modeline-god-mode (&optional spacer)
"Display an icon when `god-mode' is active." "Display an icon when `god-mode' is active."
(when (and (boundp 'god-local-mode) god-local-mode) (when (and (boundp 'god-local-mode) god-local-mode)
(+modeline-spacer nil nil (+modeline-spacer nil spacer
(propertize "Ω" (propertize "Ω"
'help-echo (concat "God mode is active." 'help-echo (concat "God mode is active."
"\nmouse-1: exit God mode.") "\nmouse-1: exit God mode.")
@ -422,7 +423,7 @@ to a function in the current buffer, call that function instead."
(defun +modeline-input-method (&optional spacer) (defun +modeline-input-method (&optional spacer)
"Display which input method is active." "Display which input method is active."
(when current-input-method (when current-input-method
(+modeline-spacer nil nil (+modeline-spacer nil spacer
(propertize current-input-method-title (propertize current-input-method-title
'help-echo (format 'help-echo (format
(concat "Current input method: %s\n" (concat "Current input method: %s\n"
@ -450,7 +451,7 @@ to a function in the current buffer, call that function instead."
(defun +modeline-kmacro-indicator (&optional spacer) (defun +modeline-kmacro-indicator (&optional spacer)
"Display an indicator when recording a kmacro." "Display an indicator when recording a kmacro."
(when defining-kbd-macro (when defining-kbd-macro
(+modeline-spacer nil nil (+modeline-spacer nil spacer
(propertize "●" (propertize "●"
'face '+modeline-kmacro-indicator 'face '+modeline-kmacro-indicator
'help-echo (format (concat "Defining a macro\n" 'help-echo (format (concat "Defining a macro\n"