From 4ce8a7d94075a5e9e3dc5728fc77b9f830b8713f Mon Sep 17 00:00:00 2001 From: Alon Date: Sat, 4 Jul 2020 14:08:06 +0300 Subject: [PATCH 1/4] Added support for GNU screen hardstatus format --- battery | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/battery b/battery index 600ea83..985de8e 100755 --- a/battery +++ b/battery @@ -7,14 +7,15 @@ battery usage: -h, --help print this message -t output tmux status bar format -z output zsh prompt format + -s output screen prompt format -e don't output the emoji -a output ascii instead of spark -b battery path default: /sys/class/power_supply/BAT0 -p use pmset (more accurate) - colors: tmux zsh - -g good battery level default: 1;32 | green | 64 - -m middle battery level default: 1;33 | yellow | 136 - -w warn battery level default: 0;31 | red | 160 + colors: tmux zsh screen + -g good battery level default: 1;32 | green | 64 | g + -m middle battery level default: 1;33 | yellow | 136 | y + -w warn battery level default: 0;31 | red | 160 | k EOF } @@ -28,6 +29,7 @@ setDefaults() { pmset_on=0 output_tmux=0 output_zsh=0 + output_screen=0 ascii=0 ascii_bar='==========' emoji=1 @@ -107,6 +109,8 @@ apply_colors() { COLOR="#[fg=$good_color]" elif ((output_zsh)); then COLOR="%F{$good_color}" + elif ((output_screen)); then + COLOR="\005{$good_color}" else COLOR=$good_color fi @@ -117,6 +121,8 @@ apply_colors() { COLOR="#[fg=$middle_color]" elif ((output_zsh)); then COLOR="%F{$middle_color}" + elif ((output_screen)); then + COLOR="\005{$middle_color}" else COLOR=$middle_color fi @@ -127,6 +133,8 @@ apply_colors() { COLOR="#[fg=$warn_color]" elif ((output_zsh)); then COLOR="%F{$warn_color}" + elif ((output_screen)); then + COLOR="\005{$warn_color}" else COLOR=$warn_color fi @@ -160,13 +168,15 @@ print_status() { printf "%s%s %s%s" "$COLOR" "[$BATT_PCT%]" "$GRAPH" "#[default]" elif ((output_zsh)); then printf "%%B%s%s %s" "$COLOR" "[$BATT_PCT%%]" "$GRAPH" + elif ((output_screen)); then + printf "%b %s" "$COLOR" "[$BATT_PCT%]" "$GRAPH" else printf "\e[0;%sm%s %s \e[m\n" "$COLOR" "[$BATT_PCT%]" "$GRAPH" fi } # Read args -while getopts ":g:m:w:tzeab:p" opt; do +while getopts ":g:m:w:tzseab:p" opt; do case $opt in g) good_color=$OPTARG @@ -189,6 +199,12 @@ while getopts ":g:m:w:tzeab:p" opt; do middle_color="136" warn_color="160" ;; + s) + output_screen=1 + good_color="g" + middle_color="y" + warn_color="r" + ;; e) emoji=0 ;; From 35ea2ddb1265fa99897e1667fa58e5fc683f8b03 Mon Sep 17 00:00:00 2001 From: Alon Date: Tue, 7 Jul 2020 19:04:52 +0300 Subject: [PATCH 2/4] Fixed tabulation and color doc --- battery | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/battery b/battery index 985de8e..1059d48 100755 --- a/battery +++ b/battery @@ -12,10 +12,10 @@ battery usage: -a output ascii instead of spark -b battery path default: /sys/class/power_supply/BAT0 -p use pmset (more accurate) - colors: tmux zsh screen + colors: tmux zsh screen -g good battery level default: 1;32 | green | 64 | g -m middle battery level default: 1;33 | yellow | 136 | y - -w warn battery level default: 0;31 | red | 160 | k + -w warn battery level default: 0;31 | red | 160 | r EOF } From 644db6813eccb5caa38900d89f11cf8903d23bc5 Mon Sep 17 00:00:00 2001 From: Alon Date: Tue, 7 Jul 2020 19:08:58 +0300 Subject: [PATCH 3/4] Fixed tabulation and color doc --- battery | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/battery b/battery index 1059d48..f31b26c 100755 --- a/battery +++ b/battery @@ -13,9 +13,9 @@ battery usage: -b battery path default: /sys/class/power_supply/BAT0 -p use pmset (more accurate) colors: tmux zsh screen - -g good battery level default: 1;32 | green | 64 | g - -m middle battery level default: 1;33 | yellow | 136 | y - -w warn battery level default: 0;31 | red | 160 | r + -g good battery level default: 1;32 | green | 64 | g + -m middle battery level default: 1;33 | yellow | 136| y + -w warn battery level default: 0;31 | red | 160| r EOF } From 979f3deb112231dddd2c37f4be7f43c0f6bdc7cf Mon Sep 17 00:00:00 2001 From: Alon Date: Tue, 7 Jul 2020 19:09:25 +0300 Subject: [PATCH 4/4] Fixed tabulation and color doc --- battery | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/battery b/battery index f31b26c..e270880 100755 --- a/battery +++ b/battery @@ -12,10 +12,10 @@ battery usage: -a output ascii instead of spark -b battery path default: /sys/class/power_supply/BAT0 -p use pmset (more accurate) - colors: tmux zsh screen - -g good battery level default: 1;32 | green | 64 | g - -m middle battery level default: 1;33 | yellow | 136| y - -w warn battery level default: 0;31 | red | 160| r + colors: tmux zsh screen + -g good battery level default: 1;32 | green | 64 | g + -m middle battery level default: 1;33 | yellow | 136 | y + -w warn battery level default: 0;31 | red | 160 | r EOF }