From 3da469be5c9526d4219ce4469e3a1e3fd7685b88 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 30 Mar 2020 18:38:53 +0200
Subject: battery: fix Full battery bug on Linux; force 1-char-width on
 charging symbol

---
 plugins/battery/battery.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/battery')

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 4c4d0d4fc..f84793b7d 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -118,7 +118,7 @@ elif [[ "$OSTYPE" = linux*  ]]; then
 
   function battery_pct() {
     if (( $+commands[acpi] )); then
-      acpi 2>/dev/null | command grep -v "rate information unavailable" | command grep -E '^Battery.*(Disc|C)harging' | cut -f2 -d ',' | tr -cd '[:digit:]'
+      acpi 2>/dev/null | command grep -v "rate information unavailable" | command grep -E '^Battery.*(Full|(Disc|C)harging)' | cut -f2 -d ',' | tr -cd '[:digit:]'
     fi
   }
 
@@ -175,7 +175,7 @@ function battery_level_gauge() {
   local filled_symbol=${BATTERY_GAUGE_FILLED_SYMBOL:-'▶'}
   local empty_symbol=${BATTERY_GAUGE_EMPTY_SYMBOL:-'▷'}
   local charging_color=${BATTERY_CHARGING_COLOR:-$color_yellow}
-  local charging_symbol=${BATTERY_CHARGING_SYMBOL:-'⚡'}
+  local charging_symbol=${BATTERY_CHARGING_SYMBOL:-'%%{%%G⚡%%}'}
 
   local battery_remaining_percentage=$(battery_pct)
   local filled empty gauge_color
-- 
cgit v1.2.3-70-g09d2


From 2a081d6e5e39887dc6b051fdcddfc9cb39aa856f Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 30 Mar 2020 18:49:01 +0200
Subject: battery: remove printf usage where possible

Spares us of the need to quote % symbols
---
 plugins/battery/battery.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins/battery')

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index f84793b7d..99dee656b 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -175,7 +175,7 @@ function battery_level_gauge() {
   local filled_symbol=${BATTERY_GAUGE_FILLED_SYMBOL:-'▶'}
   local empty_symbol=${BATTERY_GAUGE_EMPTY_SYMBOL:-'▷'}
   local charging_color=${BATTERY_CHARGING_COLOR:-$color_yellow}
-  local charging_symbol=${BATTERY_CHARGING_SYMBOL:-'%%{%%G⚡%%}'}
+  local charging_symbol=${BATTERY_CHARGING_SYMBOL:-'%{%G⚡%}'}
 
   local battery_remaining_percentage=$(battery_pct)
   local filled empty gauge_color
@@ -201,11 +201,11 @@ function battery_level_gauge() {
   battery_is_charging && charging=$charging_symbol
 
   # Charging status and prefix
-  printf ${charging_color//\%/\%\%}$charging${color_reset//\%/\%\%}${battery_prefix//\%/\%\%}${gauge_color//\%/\%\%}
+  print -n ${charging_color}${charging}${color_reset}${battery_prefix}${gauge_color}
   # Filled slots
   [[ $filled -gt 0 ]] && printf ${filled_symbol//\%/\%\%}'%.0s' {1..$filled}
   # Empty slots
   [[ $filled -lt $gauge_slots ]] && printf ${empty_symbol//\%/\%\%}'%.0s' {1..$empty}
   # Suffix
-  printf ${color_reset//\%/\%\%}${battery_suffix//\%/\%\%}${color_reset//\%/\%\%}
+  print -n ${color_reset}${battery_suffix}${color_reset}
 }
-- 
cgit v1.2.3-70-g09d2


From d6474237b823448b3a1dd176a246ed73a30494f9 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 5 Apr 2020 21:58:47 +0200
Subject: battery: revert battery charging symbol 1-character-width hack

Fixes #8804
---
 plugins/battery/battery.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/battery')

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 99dee656b..755ec8d64 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -175,7 +175,7 @@ function battery_level_gauge() {
   local filled_symbol=${BATTERY_GAUGE_FILLED_SYMBOL:-'▶'}
   local empty_symbol=${BATTERY_GAUGE_EMPTY_SYMBOL:-'▷'}
   local charging_color=${BATTERY_CHARGING_COLOR:-$color_yellow}
-  local charging_symbol=${BATTERY_CHARGING_SYMBOL:-'%{%G⚡%}'}
+  local charging_symbol=${BATTERY_CHARGING_SYMBOL:-'⚡'}
 
   local battery_remaining_percentage=$(battery_pct)
   local filled empty gauge_color
-- 
cgit v1.2.3-70-g09d2