emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

core-ui: simplify @def-modeline-segment, @def-modeline & doom-modeline

Browse source
This commit is contained in:
Henrik Lissner 2017-02-13 04:52:44 -05:00
parent 13a8901b20
commit 63380ebfe1
1 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

36
core/core-ui.el
View file

@ -206,30 +206,18 @@ file."
;; Modeline ;; Modeline
;; ;;
(defvar doom-modeline-segments '()
"An alist of mode-line segments. Use `@def-modeline-segment' to define them.")
(defvar doom-modeline-formats '()
"An alist of mode-line formats. Use `@def-modeline' to define them and
`doom-modeline' to retrieve them.")
;; TODO Improve docstrings ;; TODO Improve docstrings
(defmacro @def-modeline-segment (name &rest forms) (defmacro @def-modeline-segment (name &rest forms)
"Defines a modeline segment function and byte compiles it." "Defines a modeline segment function and byte compiles it."
(declare (indent defun) (doc-string 2)) (declare (indent defun) (doc-string 2))
(let ((sym (intern (format "doom-modeline-segment--%s" name)))) `(defun ,(intern (format "doom-modeline-segment--%s" name)) ()
(prog1 ,@forms))
`(progn
(defun ,sym () ,@forms)
(push (cons ',name ',sym) doom-modeline-segments))
(let (byte-compile-warnings)
(byte-compile ',sym)))))
(defsubst doom--prepare-modeline-segments (segments) (defsubst doom--prepare-modeline-segments (segments)
(-non-nil (-non-nil
(--map (if (stringp it) (--map (if (stringp it)
it it
(list (cdr (assq it doom-modeline-segments)))) (list (intern (format "doom-modeline-segment--%s" (symbol-name it)))))
segments))) segments)))
(defmacro @def-modeline (name lhs &optional rhs) (defmacro @def-modeline (name lhs &optional rhs)
@ -240,7 +228,7 @@ Example:
(bar matches \" \" buffer-info) (bar matches \" \" buffer-info)
(media-info major-mode)) (media-info major-mode))
(setq-default mode-line-format (doom-modeline 'minimal))" (setq-default mode-line-format (doom-modeline 'minimal))"
(let ((sym (intern (format "doom-modeline--%s" name))) (let ((sym (intern (format "doom-modeline-format--%s" name)))
(lhs-forms (doom--prepare-modeline-segments lhs)) (lhs-forms (doom--prepare-modeline-segments lhs))
(rhs-forms (doom--prepare-modeline-segments rhs))) (rhs-forms (doom--prepare-modeline-segments rhs)))
(prog1 (prog1
@ -254,18 +242,16 @@ Example:
`((space :align-to (- (+ right right-fringe right-margin) `((space :align-to (- (+ right right-fringe right-margin)
,(+ 1 (string-width (format-mode-line rhs))))))) ,(+ 1 (string-width (format-mode-line rhs)))))))
rhs))) rhs)))
(push (cons ',name ',sym) doom-modeline-formats)) ,(unless (bound-and-true-p byte-compile-current-file)
(let (byte-compile-warnings) `(let (byte-compile-warnings)
(byte-compile ',sym))))) (byte-compile ',sym)))))))
(defun doom-modeline (key) (defun doom-modeline (key)
"Fetch the forms for the mode line format named KEY from "TODO"
`doom-modeline-formats'. KEY is a symbol, and should be the name of a mode line (let ((fn (intern (format "doom-modeline-format--%s" key))))
defined with `@def-modeline'." (unless (functionp fn)
(let ((modeline (assq key doom-modeline-formats)))
(unless modeline
(error "Modeline format doesn't exist: %s" key)) (error "Modeline format doesn't exist: %s" key))
`(:eval (,(cdr modeline))))) `(:eval (,fn))))
(provide 'core-ui) (provide 'core-ui)
;;; core-ui.el ends here ;;; core-ui.el ends here