From 64f624d2b483d6d3b31731c0f82730c636190638 Mon Sep 17 00:00:00 2001 From: John Stevans Date: Fri, 1 Mar 2019 20:00:20 -0800 Subject: [PATCH 1/3] Add config for max number of lines --- nmcli-rofi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nmcli-rofi b/nmcli-rofi index cf192f2..b91791c 100755 --- a/nmcli-rofi +++ b/nmcli-rofi @@ -3,7 +3,7 @@ DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) # default config FIELDS=SSID,SECURITY,BARS -POSITION=0; XOFF=0; YOFF=0; +POSITION=0; XOFF=0; YOFF=0; MAXLINES=0; FONT="DejaVu Sans Mono Bold 14" # get current uuid @@ -52,6 +52,7 @@ function linenum () { [[ "$wa" != '' ]] && ops=4 || ops=3 lines=$(if_wifistate "$(($list_lines_num+$ops))" 1) + [[ $lines -ge $MAXLINES ]] && lines=$MAXLINES echo $lines } From c44c3f3f80ab29c6752736b23c4c9a5b0b4c4f62 Mon Sep 17 00:00:00 2001 From: John Stevans Date: Fri, 1 Mar 2019 20:02:46 -0800 Subject: [PATCH 2/3] Add default behavior for max number of lines --- nmcli-rofi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nmcli-rofi b/nmcli-rofi index b91791c..d3761c3 100755 --- a/nmcli-rofi +++ b/nmcli-rofi @@ -52,7 +52,7 @@ function linenum () { [[ "$wa" != '' ]] && ops=4 || ops=3 lines=$(if_wifistate "$(($list_lines_num+$ops))" 1) - [[ $lines -ge $MAXLINES ]] && lines=$MAXLINES + [[ $MAXLINES -gt 0 ]] && [[ $lines -ge $MAXLINES ]] && lines=$MAXLINES echo $lines } From 28cb7ef800dbeec286b80d577601ea240d0c731e Mon Sep 17 00:00:00 2001 From: John Stevans Date: Fri, 1 Mar 2019 20:54:35 -0800 Subject: [PATCH 3/3] Add max width --- nmcli-rofi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nmcli-rofi b/nmcli-rofi index d3761c3..b546cc8 100755 --- a/nmcli-rofi +++ b/nmcli-rofi @@ -3,7 +3,7 @@ DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) # default config FIELDS=SSID,SECURITY,BARS -POSITION=0; XOFF=0; YOFF=0; MAXLINES=0; +POSITION=0; XOFF=0; YOFF=0; MAXLINES=0; MAXWIDTH=0; FONT="DejaVu Sans Mono Bold 14" # get current uuid @@ -60,6 +60,7 @@ function rwidth () { minus=$(echo -n "IN-USE " | wc -m) rwidth=$(if_wifistate "$(($(echo "$1" | head -n 1 | awk '{print length($0); }')-$minus))" \ "$(echo "$2" | awk '{print length($0); }')" ) + [[ $MAXWIDTH -gt 0 ]] && [[ $rwidth -gt $MAXWIDTH ]] && rwidth=$MAXWIDTH echo $rwidth }