Refactor ui/doom-modeline (remove powerline dependency)

modules/ui/doom-modeline/config.el

@@ -1,15 +1,12 @@
 ;;; ui/doom-modeline/config.el
 
-(eval-when-compile
-  (require 'powerline))
-
 ;; all-the-icons doesn't work in the terminal, so we "disable" it.
 (unless (display-graphic-p)
-  (defun all-the-icons-octicon (&rest _) "" "")
+  (defalias 'all-the-icons-octicon 'ignore)
-  (defun all-the-icons-faicon (&rest _) "" "")
+  (defalias 'all-the-icons-faicon 'ignore)
-  (defun all-the-icons-fileicon (&rest _) "" "")
+  (defalias 'all-the-icons-fileicon 'ignore)
-  (defun all-the-icons-wicon (&rest _) "" "")
+  (defalias 'all-the-icons-wicon 'ignore)
-  (defun all-the-icons-alltheicon (&rest _) "" ""))
+  (defalias 'all-the-icons-alltheicon 'ignore))
 
 (@def-package all-the-icons :demand t
   :when (display-graphic-p))
@@ -51,9 +48,8 @@
 
 
 ;; Don't show modeline in popup windows without a :modeline rule. If one exists
-;; and it's a symbol, use it to find the modeline format in
+;; and it's a symbol, use `doom-modeline' to grab the format. If nil, show the
-;; `doom-modeline-formats'. If nil, show the mode-line as normal. If t, then
+;; mode-line as normal. If t, then hide the modeline entirely.
-;; hide the modeline entirely.
 (@add-hook doom-popup-mode
   (if (and (not doom-popup-mode)
            doom-hide-modeline-mode)
@@ -66,6 +62,20 @@
                (doom-hide-modeline-mode +1)))))))
 
 
+;; Keep `+doom-modeline-current-window' up-to-date
+(defvar +doom-modeline-current-window (frame-selected-window))
+(defun +doom-modeline|set-selected-window (&rest _)
+  "sets the variable `+doom-modeline-current-window` appropriately"
+  (when (not (minibuffer-window-active-p (frame-selected-window)))
+    (setq +doom-modeline-current-window (frame-selected-window))))
+
+(add-hook 'window-configuration-change-hook '+doom-modeline|set-selected-window)
+(add-hook 'focus-in-hook '+doom-modeline|set-selected-window)
+(advice-add 'handle-switch-frame :after '+doom-modeline|set-selected-window)
+(advice-add 'select-window :after '+doom-modeline|set-selected-window)
+
+
+
 ;;
 ;; Variables
 ;;
@@ -85,52 +95,68 @@
 ;; Custom faces
 ;;
 
+(defgroup +doom-modeline nil
+  ""
+  :group 'doom)
+
 (defface doom-modeline-buffer-path
   '((t (:inherit mode-line :bold t)))
-  "Face used for the dirname part of the buffer path.")
+  "Face used for the dirname part of the buffer path."
+  :group '+doom-modeline)
 
 (defface doom-modeline-buffer-project
   '((t (:inherit doom-modeline-buffer-path :bold nil)))
-  "Face used for the filename part of the mode-line buffer path.")
+  "Face used for the filename part of the mode-line buffer path."
+  :group '+doom-modeline)
 
 (defface doom-modeline-buffer-modified
   '((t (:inherit highlight :background nil)))
-  "Face used for the 'unsaved' symbol in the mode-line.")
+  "Face used for the 'unsaved' symbol in the mode-line."
+  :group '+doom-modeline)
 
 (defface doom-modeline-buffer-major-mode
   '((t (:inherit mode-line :bold t)))
-  "Face used for the major-mode segment in the mode-line.")
+  "Face used for the major-mode segment in the mode-line."
+  :group '+doom-modeline)
 
 (defface doom-modeline-highlight
   '((t (:inherit mode-line)))
-  "Face for bright segments of the mode-line.")
+  "Face for bright segments of the mode-line."
+  :group '+doom-modeline)
 
 (defface doom-modeline-panel
   '((t (:inherit mode-line)))
   "Face for 'X out of Y' segments, such as `+doom-modeline--anzu', `+doom-modeline--evil-substitute' and
-`iedit'")
+`iedit'"
+  :group '+doom-modeline)
 
 (defface doom-modeline-info
   `((t (:inherit success)))
-  "Face for info-level messages in the modeline. Used by `*vc'.")
+  "Face for info-level messages in the modeline. Used by `*vc'."
+  :group '+doom-modeline)
 
 (defface doom-modeline-warning
   `((t (:inherit warning)))
-  "Face for warnings in the modeline. Used by `*flycheck'")
+  "Face for warnings in the modeline. Used by `*flycheck'"
+  :group '+doom-modeline)
 
 (defface doom-modeline-urgent `((t (:inherit error)))
-  "Face for errors in the modeline. Used by `*flycheck'")
+  "Face for errors in the modeline. Used by `*flycheck'"
+  :group '+doom-modeline)
 
 ;; Bar
 (defface doom-modeline-bar '((t (:inherit highlight :foreground nil)))
-  "The face used for the left-most bar on the mode-line of an active window.")
+  "The face used for the left-most bar on the mode-line of an active window."
+  :group '+doom-modeline)
 
 (defface doom-modeline-eldoc-bar '((t (:inherit shadow :foreground nil)))
   "The face used for the left-most bar on the mode-line when eldoc-eval is
-active.")
+active."
+  :group '+doom-modeline)
 
 (defface doom-modeline-inactive-bar '((t (:inherit mode-line-inactive)))
-  "The face used for the left-most bar on the mode-line of an inactive window.")
+  "The face used for the left-most bar on the mode-line of an inactive window."
+  :group '+doom-modeline)
 
 
 ;;
@@ -159,19 +185,43 @@ active.")
 ;; Modeline helpers
 ;;
 
-(defsubst active () (eq (selected-window) powerline-selected-window))
+(defsubst active ()
+  (eq (selected-window) +doom-modeline-current-window))
 
-(defun +doom-modeline--make-xpm (color height width)
+;; From from `powerline's `pl/make-xpm'.
+(@def-memoized +doom-modeline--make-xpm (color height width)
   "Create an XPM bitmap."
   (when (display-graphic-p)
     (propertize
      " " 'display
-     (let ((data nil)
+     (let ((data (make-list height (make-list width 1)))
-           (i 0))
+           (i 0)
-       (setq data (make-list height (make-list width 1)))
+           (color (or color "None")))
-       (pl/make-xpm "percent" color color data)))))
+       (create-image
-;; Definitely not premature optimization, I-I swear!
+        (concat
-(pl/memoize '+doom-modeline--make-xpm)
+         (format "/* XPM */\nstatic char * percent[] = {\n\"%i %i 2 1\",\n\". c %s\",\n\"  c %s\","
+                 (length (car data))
+                 (length data)
+                 color
+                 color)
+         (let ((len (length data))
+               (idx 0))
+           (apply 'concat
+                  (mapcar #'(lambda (dl)
+                              (setq idx (+ idx 1))
+                              (concat
+                               "\""
+                               (concat
+                                (mapcar #'(lambda (d)
+                                            (if (eq d 0)
+                                                (string-to-char " ")
+                                              (string-to-char ".")))
+                                        dl))
+                               (if (eq idx len)
+                                   "\"};"
+                                 "\",\n")))
+                          data))))
+        'xpm t :ascent 'center)))))
 
 (defun +doom-modeline--buffer-path ()
   "Displays the buffer's full path relative to the project root (includes the
@@ -224,8 +274,6 @@ project root). Excludes the file basename. See `doom-buffer-name' for that."
     (force-mode-line-update)))
 
 
-
-
 ;;
 ;; Segments
 ;;
@@ -436,8 +484,7 @@ lines are selected, or the NxM dimensions of a block selection."
            (pattern (car-safe (evil-delimited-arguments evil-ex-argument 2))))
        (if pattern
            (format " %s matches "
-                   (count-matches pattern (car range) (cdr range))
+                   (count-matches pattern (car range) (cdr range)))
-                   evil-ex-argument)
          " ... "))
      'face (if (active) 'doom-modeline-panel))))
 
@@ -479,6 +526,7 @@ lines are selected, or the NxM dimensions of a block selection."
   "TODO"
   (and (boundp 'str) str))
 
+;;
 (@def-modeline-segment bar
   (+doom-modeline--make-xpm
    (face-background (if (active)

modules/ui/doom-modeline/packages.el

@@ -18,7 +18,6 @@
 
 (@package all-the-icons)
 (@package eldoc-eval)
-(@package powerline)
 (when (@featurep :feature evil)
   (@package evil-anzu))
 

modules/ui/doom/autoload.el

@@ -15,7 +15,7 @@ use the current window."
         (new-buf (get-buffer-create " *doom:scratch*")))
     (with-current-buffer new-buf
       (setq default-directory old-project
-            mode-line-format (assq 'minimal doom-modeline-formats))
+            mode-line-format (doom-modeline 'minimal))
       (when (and (not (eq major-mode mode))
                  (functionp mode))
         (funcall mode))