closer: refactor include string substitution

lwilletts · Jun 2, 2020 · 6f44eb2 · 6f44eb2
1 parent 1aec40c
commit 6f44eb2
Showing 1 changed file with 34 additions and 30 deletions.
diff --git a/closer b/closer
@@ -18,43 +18,47 @@ EOF
 }
 
 windowUp() {
-    [ "$PFW" = "0x00000000" ] && {
-        mouseY="$(wmp -r | cut -d\  -f 2)"
-        printf '%s\n' "$root" | (xargs wattr yi; printf '%s\n' "$mouseY") | sort -nr | \
-            sed -n "/$mouseY/{n;p}" | cut -d\  -f 2
-    } || {
-        printf '%s\n' "$root" | xargs wattr yi | sort -nr | sed -n "/$PFW/{n;p}" | cut -d\  -f 2
-    }
+    if [ "$PFW" = "0x00000000" ]; then
+        mouseY="$(wmp -r)" mouseY="${mouseY#* }"
+        printf '%s\n' "$wids" | (xargs wattr yi; printf '%s\n' "$mouseY") | \
+            sort -nr | sed -n "/$mouseY/{n;p}" | cut -d\  -f 2
+    else
+        printf '%s\n' "$wids" | xargs wattr yi | sort -nr | \
+            sed -n "/$PFW/{n;p}" | cut -d\  -f 2
+    fi
 }
 
 windowDown() {
-    [ "$PFW" = "0x00000000" ] && {
-        mouseY="$(wmp -r | cut -d\  -f 2)"
-        printf '%s\n' "$root" | (xargs wattr yi; printf '%s\n' "$mouseY") | sort -n | \
-            sed -n "/$mouseY/{n;p}" | cut -d\  -f 2
-    } || {
-        printf '%s\n' "$root" | xargs wattr yi | sort -n | sed -n "/$PFW/{n;p}" | cut -d\  -f 2
-    }
+    if [ "$PFW" = "0x00000000" ]; then
+        mouseY="$(wmp -r)" mouseY="${mouseY#* }"
+        printf '%s\n' "$wids" | (xargs wattr yi; printf '%s\n' "$mouseY") | \
+            sort -n | sed -n "/$mouseY/{n;p}" | cut -d\  -f 2
+    else
+        printf '%s\n' "$wids" | xargs wattr yi | sort -n | \
+            sed -n "/$PFW/{n;p}" | cut -d\  -f 2
+    fi
 }
 
 windowLeft() {
-    [ "$PFW" = "0x00000000" ] && {
-        mouseX="$(wmp -r | cut -d\  -f 1)"
-        printf '%s\n' "$root" | (xargs wattr xi; printf '%s\n' "$mouseX") | sort -nr | \
-            sed -n "/$mouseX/{n;p}" | cut -d\  -f 2
-    } || {
-        printf '%s\n' "$root" | xargs wattr xi | sort -nr | sed -n "/$PFW/{n;p}" | cut -d\  -f 2
-    }
+    if [ "$PFW" = "0x00000000" ]; then
+        mouseX="$(wmp -r)" mouseX="${mouseX% *}"
+        printf '%s\n' "$wids" | (xargs wattr xi; printf '%s\n' "$mouseX") | \
+            sort -nr | sed -n "/$mouseX/{n;p}" | cut -d\  -f 2
+    else
+        printf '%s\n' "$wids" | xargs wattr xi | sort -nr | \
+            sed -n "/$PFW/{n;p}" | cut -d\  -f 2
+    fi
 }
 
 windowRight() {
-    [  "$PFW" = "0x00000000" ] && {
-        mouseX="$(wmp -r | cut -d\  -f 1)"
-        printf '%s\n' "$root" | (xargs wattr xi; printf '%s\n' "$mouseX") | sort -n | \
-            sed -n "/$mouseX/{n;p}" | cut -d\  -f 2
-    } || {
-        printf '%s\n' "$root" | xargs wattr xi | sort -n | sed -n "/$PFW/{n;p}" | cut -d\  -f 2
-    }
+    if [ "$PFW" = "0x00000000" ]; then
+        mouseX="$(wmp -r)" mouseX="${mouseX% *}"
+        printf '%s\n' "$wids" | (xargs wattr xi; printf '%s\n' "$mouseX") | \
+            sort -n | sed -n "/$mouseX/{n;p}" | cut -d\  -f 2
+    else
+        printf '%s\n' "$wids" | xargs wattr xi | sort -n | \
+            sed -n "/$PFW/{n;p}" | cut -d\  -f 2
+    fi
 }
 
 
@@ -64,8 +68,8 @@ main() {
     PFW="$(pfw 2> /dev/null || printf '%s\n' "0x00000000")"
 
     case "$2" in
-        -s|--screen|screen) root="$(listwindows)" ;;
-        *)                  root="$(lsw)"         ;;
+        -s|--screen|screen) wids="$(listwindows)" ;;
+        *)                  wids="$(lsw)"         ;;
     esac
 
     case "$1" in