From 8ce590c46ce9c80d560c9e1dfc59ad52ba7a652f Mon Sep 17 00:00:00 2001
From: Sébastien Dailly <sebastien@dailly.me>
Date: Tue, 28 Dec 2021 10:49:08 +0100
Subject: Update bspwm scripts

---
 bspwm/scripts/bspwm/desktops.sh  | 14 +++++++-------
 bspwm/scripts/bspwm/wallpaper.sh | 20 ++++++++++----------
 sxhkd/scripts/sxhkd/rofi_new.sh  |  4 +++-
 sxhkd/scripts/sxhkd/show.sh      |  8 ++++++--
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/bspwm/scripts/bspwm/desktops.sh b/bspwm/scripts/bspwm/desktops.sh
index 61d75b5..c41754b 100755
--- a/bspwm/scripts/bspwm/desktops.sh
+++ b/bspwm/scripts/bspwm/desktops.sh
@@ -6,38 +6,38 @@ bspc subscribe desktop | while read -r event monitor_id desktop_id name; do
             for desktop in $(bspc query -D); do
                 test "x${desktop}" = "x${desktop_id}" && continue
 
-                nodes=$(bspc query -d ${desktop} -N)
                 # If the desktop is empty, delete it
+                nodes=$(bspc query -d ${desktop} -N)
                 test -z "${nodes}" && bspc desktop ${desktop} -r 
             done
             ;;
         desktop_add)
-            bspc monitor -o $(bspc query --names -D| sort -V | tr -s '\n' ' ')
+            bspc monitor -o $(bspc query --names -D | sort -V | tr -s '\n' ' ')
             case $name in 
                 Chat)
                     bspc node @$name:/ -i
-                    bspc rule --add Signal -o node=@$name:/
+                    bspc rule --add Signal --one-shot node=@$name:/
                     signal-desktop &
                     ;;
                 Musique)
                     bspc node @$name:/ -i
-                    bspc rule --add Gmpc -o node=@$name:/
+                    bspc rule --add Gmpc --one-shot node=@$name:/
                     gmpc &
                     ;;
                 Web)
                     bspc node @$name:/ -i
-                    bspc rule --add Firefox-esr -o node=@$name:/
+                    bspc rule --add Firefox-esr --one-shot node=@$name:/
                     firefox &
                     ;;
                 Mail)
                     bspc node @$name:/ -i
-                    bspc rule --add thunderbird -o node=@$name:/
+                    bspc rule --add thunderbird --one-shot node=@$name:/
                     thunderbird &
                     ;;
             esac
             ;;
         desktop_rename)
-            bspc monitor -o $(bspc query --names -D| sort -V | tr -s '\n' ' ')
+            bspc monitor -o $(bspc query --names -D | sort -V | tr -s '\n' ' ')
             ;;
     esac
 done
diff --git a/bspwm/scripts/bspwm/wallpaper.sh b/bspwm/scripts/bspwm/wallpaper.sh
index 552da76..ab2ab14 100755
--- a/bspwm/scripts/bspwm/wallpaper.sh
+++ b/bspwm/scripts/bspwm/wallpaper.sh
@@ -18,15 +18,15 @@ image=$1
 #    -addd "#ffffff00" 90 \
 #    -gradient 0
 
-if [ -z "${VNCDESKTOP}" ]; then 
-  hsetroot \
-    -fill "${image}" \
-    -add "#ffffff77" \
-    -addd "#ffffff77" 2 \
-    -addd "#ffffff00" 0 \
-    -addd "#ffffff00" 90 \
-    -gradient 0
-else 
+#if [ -z "${VNCDESKTOP}" ]; then 
+#  hsetroot \
+#    -fill "${image}" \
+#    -add "#ffffff77" \
+#    -addd "#ffffff77" 2 \
+#    -addd "#ffffff00" 0 \
+#    -addd "#ffffff00" 90 \
+#    -gradient 0
+#else 
     #dominant=$(hexdump -n 3 -e '"%06X" 1 "\n"' /dev/urandom)
 
     # Traverse the chromatic circle in 5 hours
@@ -43,4 +43,4 @@ else
     -addd "#F0F0F0FF" 40 \
     -addd "#F0F0F0" 5 \
     -gradient 0
-fi
+#fi
diff --git a/sxhkd/scripts/sxhkd/rofi_new.sh b/sxhkd/scripts/sxhkd/rofi_new.sh
index 47a0ae7..b1e19d8 100755
--- a/sxhkd/scripts/sxhkd/rofi_new.sh
+++ b/sxhkd/scripts/sxhkd/rofi_new.sh
@@ -2,6 +2,8 @@
 if [ -z $1 ]; then
     cat <(echo -e "Chat\nWeb\nMail\nMusique") <(bspc query --names -D) | sort -u
 else
-  ~/scripts/sxhkd/show.sh $1
+  for desktop in $(echo $1 | tr "," "\n"); do
+      ~/scripts/sxhkd/show.sh $desktop
+  done
 fi
 
diff --git a/sxhkd/scripts/sxhkd/show.sh b/sxhkd/scripts/sxhkd/show.sh
index 4f83617..b87067c 100755
--- a/sxhkd/scripts/sxhkd/show.sh
+++ b/sxhkd/scripts/sxhkd/show.sh
@@ -1,3 +1,7 @@
 #!/bin/sh
-bspc query -D --names | grep -q "$1" || bspc monitor -a "$1"
-bspc desktop -f "$1"
+
+# If the required desktop does not exists, create it
+bspc query --desktops --names | grep --quiet "$1" || bspc monitor --add-desktops "$1"
+
+# Switch to the desired desktop
+bspc desktop --focus "$1"
-- 
cgit v1.2.3