jessieh/mood-line
jessieh/mood-line
1
Fork 1
Code Issues 4 Pull Requests Releases Activity

Rework mood-line-defformat macro to use plist

Browse Source
This commit is contained in:
Jessie Hildebrandt 2023-11-21 16:45:34 -05:00
parent 78925bdb72
commit b5551105d4
2 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -60,17 +60,15 @@ mood-line uses a modular segment format, and it is easy to reconfigure:
;; * init.el : ELisp Top 4:32 | ! Issues: 2 ;; * init.el : ELisp Top 4:32 | ! Issues: 2
(setq mood-line-format (setq mood-line-format
(mood-line-defformat (mood-line-defformat
;; Left side :left
(" " (((mood-line-segment-buffer-status) . " ")
((mood-line-segment-buffer-status) . " ")
((mood-line-segment-buffer-name) . " : ") ((mood-line-segment-buffer-name) . " : ")
(mood-line-segment-major-mode)) (mood-line-segment-major-mode))
;; Right side :right
(((mood-line-segment-scroll) . " ") (((mood-line-segment-scroll) . " ")
((mood-line-segment-cursor-position) . " ") ((mood-line-segment-cursor-position) . " ")
((when (mood-line-segment-checker) "|") . " ") ((when (mood-line-segment-checker) "|") . " ")
((mood-line-segment-checker) . " ") ((mood-line-segment-checker) . " "))))
" ")))
``` ```
More information on the format specification is available in the documentation: \ More information on the format specification is available in the documentation: \

48
mood-line.el
View File

@ -92,8 +92,8 @@ If NAME is already bound, this does nothing."
(require (quote ,module)) (require (quote ,module))
(apply (function ,name) args)))) (apply (function ,name) args))))
(defmacro mood-line-defformat (left &optional right) (defmacro mood-line-defformat (&rest spec)
"Format LEFT and RIGHT segment lists as a `mood-line-format' sequence. "Format :left and :right segment lists of plist SPEC for `mood-line-format'.
A segment may be a string, a cons cell of the form (FUNCTION . SEPARATOR), A segment may be a string, a cons cell of the form (FUNCTION . SEPARATOR),
or any expression that evaluates to a string or nil. or any expression that evaluates to a string or nil.
@ -105,14 +105,22 @@ Cons cells of the form (FUNCTION . SEPARATOR) will expand into the format
All other expressions will expand into the format sequence unaltered, All other expressions will expand into the format sequence unaltered,
followed by an empty string. This prevents accidental elision of the followed by an empty string. This prevents accidental elision of the
following segment should the expression evaluate to nil." following segment should the expression evaluate to nil.
`(quote ,(mapcar
(lambda (segments) An optional key :padding may be provided, the value of which will be used as
(cl-loop for seg in segments the padding for either side of the mode line. If :padding is nil, \"\s\" will
if (cdr-safe seg) append `(,(car seg) ,(cdr seg)) be used as a default."
else if (stringp seg) collect seg (let* ((padding (or (plist-get spec :padding) "\s"))
else append `(,seg ""))) (left (append (list padding) (plist-get spec :left)))
`(,left ,right)))) (right (append (plist-get spec :right) (list padding))))
`(quote ,(mapcar
(lambda (segments)
(cl-loop for seg in segments
if (nlistp (cdr-safe seg)) append (list (car seg)
(cdr seg))
else if (stringp seg) collect seg
else append (list seg "")))
(list left right)))))
;; -------------------------------------------------------------------------- ;; ;; -------------------------------------------------------------------------- ;;
;; ;;
@ -185,29 +193,26 @@ All other expressions will expand into the format sequence unaltered,
(defconst mood-line-format-default (defconst mood-line-format-default
(mood-line-defformat (mood-line-defformat
;; Left :left
(" " (((mood-line-segment-modal) . " ")
((mood-line-segment-modal) . " ")
((mood-line-segment-buffer-status) . " ") ((mood-line-segment-buffer-status) . " ")
((mood-line-segment-buffer-name) . " ") ((mood-line-segment-buffer-name) . " ")
((mood-line-segment-anzu) . " ") ((mood-line-segment-anzu) . " ")
((mood-line-segment-multiple-cursors) . " ") ((mood-line-segment-multiple-cursors) . " ")
((mood-line-segment-cursor-position) . " ") ((mood-line-segment-cursor-position) . " ")
(mood-line-segment-scroll)) (mood-line-segment-scroll))
;; Right :right
(((mood-line-segment-vc) . " ") (((mood-line-segment-vc) . " ")
((mood-line-segment-major-mode) . " ") ((mood-line-segment-major-mode) . " ")
((mood-line-segment-misc-info) . " ") ((mood-line-segment-misc-info) . " ")
((mood-line-segment-checker) . " ") ((mood-line-segment-checker) . " ")
((mood-line-segment-process) . " ") ((mood-line-segment-process) . " ")))
" "))
"Default format for mood-line.") "Default format for mood-line.")
(defconst mood-line-format-default-extended (defconst mood-line-format-default-extended
(mood-line-defformat (mood-line-defformat
;; Left :left
(" " (((mood-line-segment-modal) . " ")
((mood-line-segment-modal) . " ")
((mood-line-segment-buffer-status) . " ") ((mood-line-segment-buffer-status) . " ")
((mood-line-segment-buffer-name) . " ") ((mood-line-segment-buffer-name) . " ")
((mood-line-segment-anzu) . " ") ((mood-line-segment-anzu) . " ")
@ -217,7 +222,7 @@ All other expressions will expand into the format sequence unaltered,
((mood-line-segment-cursor-point) . " ") ((mood-line-segment-cursor-point) . " ")
((mood-line-segment-region) . " ") ((mood-line-segment-region) . " ")
(mood-line-segment-scroll)) (mood-line-segment-scroll))
;; Right :right
(((mood-line-segment-indentation) . " ") (((mood-line-segment-indentation) . " ")
((mood-line-segment-eol) . " ") ((mood-line-segment-eol) . " ")
((mood-line-segment-encoding) . " ") ((mood-line-segment-encoding) . " ")
@ -225,8 +230,7 @@ All other expressions will expand into the format sequence unaltered,
((mood-line-segment-major-mode) . " ") ((mood-line-segment-major-mode) . " ")
((mood-line-segment-misc-info) . " ") ((mood-line-segment-misc-info) . " ")
((mood-line-segment-checker) . " ") ((mood-line-segment-checker) . " ")
((mood-line-segment-process) . " ") ((mood-line-segment-process) . " ")))
" "))
"Extended default format for mood-line showcasing all included segments.") "Extended default format for mood-line showcasing all included segments.")
;; -------------------------------------------------------------------------- ;; ;; -------------------------------------------------------------------------- ;;