From 8eabd0d05aa2ae62d2e86db01a685efb71d21bac Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Mon, 29 May 2023 23:09:15 -0400
Subject: [PATCH] fix: make gesture script do touch fix only when touchscreen
 is used

---
 lisgd/config             | 5 +++--
 sway/config              | 2 +-
 sway/scripts/gestures.sh | 8 ++++++--
 waybar/style.css         | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lisgd/config b/lisgd/config
index d2cf39c2..2b8eaf15 100755
--- a/lisgd/config
+++ b/lisgd/config
@@ -5,8 +5,9 @@
 
 function gestures {
 	lisgd -d /dev/input/by-path/platform-AMDI0010\:00-event -o 0 -t 125 -r 25 -m 3200 \
-	-g "3,RL,N,S,R,$HOME/.config/sway/scripts/gestures.sh next" \
-	-g "3,LR,N,S,R,$HOME/.config/sway/scripts/gestures.sh prev"
+	-g "3,RL,N,*,R,$HOME/.config/sway/scripts/gestures.sh next touch" \
+	-g "3,LR,N,*,R,$HOME/.config/sway/scripts/gestures.sh prev touch" \
+	-g "1,DU,B,*,R,$HOME/.config/sway/scripts/tablet/osk-toggle.sh"
 }
 
 if pgrep lisgd ; then
diff --git a/sway/config b/sway/config
index 9284f26e..ba1c0d34 100755
--- a/sway/config
+++ b/sway/config
@@ -42,7 +42,7 @@ bar {
 # execs
 exec bash -c "sleep 3; nm-tray"
 exec eww daemon
-exec $HOME/.config/lisgd/config
+exec_always $HOME/.config/lisgd/config
 exec sudo input-emulator start touch --x-max 1920 --y-max 1200 --slots 4
 
 exec dbus-update-activation-environment --all
diff --git a/sway/scripts/gestures.sh b/sway/scripts/gestures.sh
index 3f0eb0f0..26da4e75 100755
--- a/sway/scripts/gestures.sh
+++ b/sway/scripts/gestures.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 SIDE="$1"
+TOUCH="$2"
 workspaces=($(swaymsg -t get_workspaces | jq '.[] | .num'))
 list_focused=($(swaymsg -t get_workspaces | jq '.[] | .focused'))
 
@@ -32,5 +33,8 @@ elif [[ $SIDE == "prev" ]]; then
 elif [[ $SIDE == "next" ]]; then
 	swaymsg workspace $[$current_workspace + 1]
 fi
-sleep 0.2
-sudo input-emulator touch tap 1280 720
+
+if [[ $TOUCH == "touch" ]]
+	sleep 0.2
+	sudo input-emulator touch tap 1280 720
+fi
diff --git a/waybar/style.css b/waybar/style.css
index a2e7132e..c8361bd6 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,7 +1,7 @@
 * {
     border: none;
     /*font-family: 'SF Mono', Consolas, 'Font Awesome 5 Free Solid', Roboto;*/
-    font-family: UbuntuMono;
+    font-family: Product Sans;
     font-size: 18px
   }