hiro/doom-modeline
1
0
Fork 0
mirror of https://github.com/vale981/doom-modeline synced 2025-03-05 09:21:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #257: segment--battery: signaled (wrong-type-argument stringp nil).

Browse source 
Also add battery faces.
This commit is contained in:
Vincent Zhang 2019-11-15 19:38:11 +08:00
parent ede1c34716
commit 3d096a572c
2 changed files with 63 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
doom-modeline-core.el
View file

@ -476,22 +476,52 @@ It requires `circe' or `erc' package."
(defface doom-modeline-lsp-success
'((t (:inherit success)))
"Face for success state in LSP."
"Face for LSP success state."
:group 'doom-modeline-faces)
(defface doom-modeline-lsp-warning
'((t (:inherit warning)))
"Face for warning state in LSP."
"Face for LSP warning state."
:group 'doom-modeline-faces)
(defface doom-modeline-lsp-error
'((t (:inherit error)))
"Face for error state in LSP."
"Face for LSP error state."
:group 'doom-modeline-faces)
(defface doom-modeline-lsp-running
'((t (:inherit compilation-mode-line-run)))
"Face for running state in LSP."
"Face for LSP running state."
:group 'doom-modeline-faces)
(defface doom-modeline-battery-charging
'((t (:inherit success)))
"Face for battery charging statues."
:group 'doom-modeline-faces)
(defface doom-modeline-battery-full
'((t (:inherit success)))
"Face for battery full statues."
:group 'doom-modeline-faces)
(defface doom-modeline-battery-normal
'((t (:inherit mode-line)))
"Face for battery normal statues."
:group 'doom-modeline-faces)
(defface doom-modeline-battery-warning
'((t (:inherit warning)))
"Face for battery warning statues."
:group 'doom-modeline-faces)
(defface doom-modeline-battery-critical
'((t (:inherit error)))
"Face for battery critical statues."
:group 'doom-modeline-faces)
(defface doom-modeline-battery-error
'((t (:inherit error)))
"Face for battery error statues."
:group 'doom-modeline-faces)

86
doom-modeline-segments.el
View file

@ -2182,68 +2182,40 @@ we don't want to remove that so we just return the original."
(when (bound-and-true-p display-battery-mode)
(let* ((data (and (bound-and-true-p battery-status-function)
(funcall battery-status-function)))
(charging? (string-equal "AC" (cdr (assoc ?L data))))
(percentage (min (car (read-from-string (cdr (assq ?p data))))
battery-mode-line-limit))
(face (when (numberp percentage)
(cond (charging? 'success)
((< percentage battery-load-critical) 'error)
((< percentage 25) 'warning)
((< percentage 95) 'mode-line)
(t 'success))))
(icon (if (numberp percentage)
(charging? (string-equal "AC" (cdr (assoc ?L data))))
(percentage (car (read-from-string (or (cdr (assq ?p data)) "ERR"))))
(valid-percentage? (and (numberp percentage)
(>= percentage 0)
(<= percentage battery-mode-line-limit)))
(face (if valid-percentage?
(cond (charging? 'doom-modeline-battery-charging)
((< percentage battery-load-critical) 'doom-modeline-battery-critical)
((< percentage 25) 'doom-modeline-battery-warning)
((< percentage 95) 'doom-modeline-battery-normal)
(t 'doom-modeline-battery-full))
'doom-modeline-battery-error))
(icon (if valid-percentage?
(cond (charging?
(doom-modeline-icon 'alltheicon
"battery-charging"
"🔋"
"+"
face
:height 1.4
:v-adjust -0.1))
(doom-modeline-icon 'alltheicon "battery-charging" "🔋" "+"
face :height 1.4 :v-adjust -0.1))
((> percentage 95)
(doom-modeline-icon 'faicon
"battery-full"
"🔋"
"-"
face
:v-adjust -0.0575))
(doom-modeline-icon 'faicon "battery-full" "🔋" "-"
face :v-adjust -0.0575))
((> percentage 70)
(doom-modeline-icon 'faicon
"battery-three-quarters"
"🔋"
"-"
face
:v-adjust -0.0575))
(doom-modeline-icon 'faicon "battery-three-quarters" "🔋" "-"
face :v-adjust -0.0575))
((> percentage 40)
(doom-modeline-icon 'faicon
"battery-half"
"🔋"
"-"
face
:v-adjust -0.0575))
(doom-modeline-icon 'faicon "battery-half" "🔋" "-"
face :v-adjust -0.0575))
((> percentage battery-load-critical)
(doom-modeline-icon 'faicon
"battery-quarter"
"🔋"
"-"
face
:v-adjust -0.0575))
(t (doom-modeline-icon 'faicon
"battery-empty"
"🔋"
"!"
face
:v-adjust -0.0575)))
(doom-modeline-icon 'faicon
"battery-empty"
"⚠"
"N/A"
'error
:v-adjust -0.0575)))
(text (if (numberp percentage)
(format "%d%%%%" percentage)
""))
(help-echo (if (and battery-echo-area-format (numberp percentage))
(doom-modeline-icon 'faicon "battery-quarter" "🔋" "-"
face :v-adjust -0.0575))
(t (doom-modeline-icon 'faicon "battery-empty" "🔋" "!"
face :v-adjust -0.0575)))
(doom-modeline-icon 'faicon "battery-empty" "⚠" "N/A"
face :v-adjust -0.0575)))
(text (if valid-percentage? (format "%d%%%%" percentage) ""))
(help-echo (if (and battery-echo-area-format data valid-percentage?)
(battery-format battery-echo-area-format data)
"Battery status not available")))
(concat (doom-modeline-spc)