From b2b7e6079885655a3fb7de97e5cad76ab2226415 Mon Sep 17 00:00:00 2001
From: Vincent Zhang <seagle0128@gmail.com>
Date: Thu, 23 May 2019 16:35:15 +0800
Subject: [PATCH] [Optimize] Calculate font height.

Not use font-info which is slow and may hang.
Only create xpm images if available on GUI.

Close #176.
---
 doom-modeline-core.el     | 61 +++++++++++++++++++--------------------
 doom-modeline-segments.el | 15 ++++------
 2 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/doom-modeline-core.el b/doom-modeline-core.el
index 625121a..74647ec 100644
--- a/doom-modeline-core.el
+++ b/doom-modeline-core.el
@@ -485,14 +485,6 @@ If the actual char height is larger, it respects the actual char height.")
   "Whether is an active window."
   (eq (selected-window) doom-modeline-current-window))
 
-(defun doom-modeline--char-height ()
-  "Calculate the actual char height of the mode-line."
-  (or
-   (let ((font (face-font 'mode-line)))
-     (when (and font (fboundp 'font-info))
-       (* 2 (aref (font-info font) 2))))
-   (round (* 1.3 (frame-char-height)))))
-
 (defsubst doom-modeline-vspc ()
   "Text style with icons in mode-line."
   (propertize " " 'face (if (doom-modeline--active)
@@ -505,6 +497,10 @@ If the actual char height is larger, it respects the actual char height.")
                             'mode-line
                           'mode-line-inactive)))
 
+(defsubst doom-modeline--char-height ()
+  "Calculate the actual char height of the mode-line."
+  (ceiling (* 1.68 (frame-char-height))))
+
 (defun doom-modeline-icon-octicon (&rest args)
   "Display octicon via ARGS."
   (when doom-modeline-icon
@@ -558,30 +554,31 @@ If the actual char height is larger, it respects the actual char height.")
 
 (defun doom-modeline--make-xpm (face width height)
   "Create an XPM bitmap via FACE, WIDTH and HEIGHT. Inspired by `powerline''s `pl/make-xpm'."
-  (propertize
-   " " 'display
-   (let ((data (make-list height (make-list width 1)))
-         (color (or (face-background face nil t) "None")))
-     (ignore-errors
-       (create-image
-        (concat
-         (format "/* XPM */\nstatic char * percent[] = {\n\"%i %i 2 1\",\n\". c %s\",\n\"  c %s\","
-                 (length (car data))
-                 (length data)
-                 color
-                 color)
-         (apply #'concat
-                (cl-loop with idx = 0
-                         with len = (length data)
-                         for dl in data
-                         do (cl-incf idx)
-                         collect
-                         (concat "\""
-                                 (cl-loop for d in dl
-                                          if (= d 0) collect (string-to-char " ")
-                                          else collect (string-to-char "."))
-                                 (if (eq idx len) "\"};" "\",\n")))))
-  'xpm t :ascent 'center)))))
+  (when (and (display-graphic-p)
+             (image-type-available-p 'xpm))
+    (propertize
+     " " 'display
+     (let ((data (make-list height (make-list width 1)))
+           (color (or (face-background face nil t) "None")))
+       (ignore-errors
+         (create-image
+          (concat
+           (format
+            "/* XPM */\nstatic char * percent[] = {\n\"%i %i 2 1\",\n\". c %s\",\n\"  c %s\","
+            (length (car data)) (length data) color color)
+           (apply #'concat
+                  (cl-loop with idx = 0
+                           with len = (length data)
+                           for dl in data
+                           do (cl-incf idx)
+                           collect
+                           (concat
+                            "\""
+                            (cl-loop for d in dl
+                                     if (= d 0) collect (string-to-char " ")
+                                     else collect (string-to-char "."))
+                            (if (eq idx len) "\"};" "\",\n")))))
+          'xpm t :ascent 'center))))))
 
 ;; Fix: invalid-regexp "Trailing backslash" while handling $HOME on Windows
 (defun doom-modeline-shrink-path--dirs-internal (full-path &optional truncate-all)
diff --git a/doom-modeline-segments.el b/doom-modeline-segments.el
index bafab7a..f5551c3 100644
--- a/doom-modeline-segments.el
+++ b/doom-modeline-segments.el
@@ -1212,13 +1212,10 @@ of active `multiple-cursors'."
 (defvar doom-modeline--bar-active nil)
 (defvar doom-modeline--bar-inactive nil)
 (doom-modeline-def-segment bar
-  "The bar regulates the height of the mode-line in GUI Emacs.
-Returns \"\" to not break --no-window-system."
-  (if (display-graphic-p)
-      (if (doom-modeline--active)
-          doom-modeline--bar-active
-        doom-modeline--bar-inactive)
-    ""))
+  "The bar regulates the height of the mode-line in GUI."
+  (if (doom-modeline--active)
+      doom-modeline--bar-active
+    doom-modeline--bar-inactive))
 
 (defun doom-modeline-refresh-bars (&optional width height)
   "Refresh mode-line bars with `WIDTH' and `HEIGHT'."
@@ -1226,12 +1223,12 @@ Returns \"\" to not break --no-window-system."
         (doom-modeline--make-xpm 'doom-modeline-bar
                                  (or width doom-modeline-bar-width)
                                  (max (or height doom-modeline-height)
-                                      (doom-modeline--char-height)))
+                                      (doom-modeline--font-height)))
         doom-modeline--bar-inactive
         (doom-modeline--make-xpm 'doom-modeline-inactive-bar
                                  (or width doom-modeline-bar-width)
                                  (max (or height doom-modeline-height)
-                                      (doom-modeline--char-height)))))
+                                      (doom-modeline--font-height)))))
 
 (when (>= emacs-major-version 26)
   (add-variable-watcher