diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-02-03 22:18:59 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-02-03 22:18:59 -0500 |
| commit | cb170078f7fe918b880da0dbcccc622a8b480451 (patch) | |
| tree | 21538ae477b21c730d499082a75e59dd88c26a5a /.config/wmii-hg | |
| parent | cbeab00f4a3da0c6292373587312e21da198347e (diff) | |
| parent | 26c23840ee5780b8444423e74607187f000a0877 (diff) | |
Merge branch 'master' into build64-par/master
Diffstat (limited to '.config/wmii-hg')
| -rw-r--r-- | .config/wmii-hg/config.sh | 4 | ||||
| -rw-r--r-- | .config/wmii-hg/rbar.sh | 4 | ||||
| -rwxr-xr-x | .config/wmii-hg/rbar_wifi | 26 |
3 files changed, 29 insertions, 5 deletions
diff --git a/.config/wmii-hg/config.sh b/.config/wmii-hg/config.sh index be75d65..ad4d2fe 100644 --- a/.config/wmii-hg/config.sh +++ b/.config/wmii-hg/config.sh @@ -25,6 +25,8 @@ Event() { ## 1 = left ## 2 = middle ## 3 = right + ## 4 = scroll up + ## 5 = scroll down ## Custom (non-WMII-generated) events WmiircStart) ## No args @@ -109,6 +111,8 @@ Event() { echo Fullscreen on >> $WMII_DIR/client/$1/ctl;; esac }& ;; + 4) ;; + 5) ;; esac;; ClientClick) ## $1=client $2=button ;; diff --git a/.config/wmii-hg/rbar.sh b/.config/wmii-hg/rbar.sh index 8297b71..4f6faf1 100644 --- a/.config/wmii-hg/rbar.sh +++ b/.config/wmii-hg/rbar.sh @@ -14,5 +14,7 @@ case "$1" in 1) left-click;; 2) middle-click;; 3) right-click;; - *) update "$1";; + 4) scroll-up;; + 5) scroll-down;; + [0-9][0-9]_*) update "$1";; esac diff --git a/.config/wmii-hg/rbar_wifi b/.config/wmii-hg/rbar_wifi index 63dc653..195df7c 100755 --- a/.config/wmii-hg/rbar_wifi +++ b/.config/wmii-hg/rbar_wifi @@ -29,7 +29,7 @@ right-click() { IFS='' while read -r line; do list+=("$line") - done < <(netctl-auto list | sed 's,$,$,' | column -s '$' -t) + done < <({ netctl-auto list; printf '> %s\n' 'New Network' 'Disable All' 'Enable All';} | sed 's,$,$,' | column -s '$' -t) cur='' for item in "${list[@]}"; do @@ -39,9 +39,27 @@ right-click() { done item=$(wmii9menu -i "$cur" "${list[@]}") - if [[ -n $item ]] && [[ "$item" != '* '* ]]; then - netctl-auto switch-to "$item" - fi + case "$item" in + '') + # Nothing selected + ;; + '* '*) + # Already selected; do nothing + ;; + '> New Network'*) + urxvt +sb -title wifi-menu -e sudo wifi-menu + ;; + '> Disable All'*) + sudo netctl-auto disable-all + ;; + '> Enable All'*) + sudo netctl-auto enable-all + ;; + *) + # NB: do NOT quote $item; we need to strip whitespace + sudo netctl-auto switch-to $item + ;; + esac } . "$(dirname "$0")/rbar.sh" |