From f3511b149a0aac96ede1249bfff8746d2f05f284 Mon Sep 17 00:00:00 2001 From: Stacy Harper Date: Wed, 25 Aug 2021 00:37:35 +0200 Subject: [PATCH] Remove now unused screen detection for lisgd Signed-off-by: Stacy Harper Signed-off-by: Maarten van Gompel --- configs/default_hooks/lisgdstart | 38 ++++++++------------------------ 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/configs/default_hooks/lisgdstart b/configs/default_hooks/lisgdstart index 5682661..61f304c 100644 --- a/configs/default_hooks/lisgdstart +++ b/configs/default_hooks/lisgdstart @@ -13,39 +13,19 @@ if [ -z "$LISGD_THRESHOLD_PRESSED" ]; then LISGD_THRESHOLD_PRESSED=60 fi -case "$(sxmo_wm.sh)" in - sway) - output="$( - swaymsg -t get_outputs \ - | jq -r '.[] | select(.name == "DSI-1") | {transform: .transform, width: .current_mode.width, height: .current_mode.height}' \ - | sed "s|normal|0|" - )" - transform="$(printf %s "$output" | jq -r .transform)" - width="$(printf %s "$output" | jq -r .width)" - height="$(printf %s "$output" | jq -r .height)" - orientation="$((transform / 90))" - ;; - dwm) - output="$(xrandr | grep DSI-1 | cut -d' ' -f4)" - height="$(printf %s "$output" | cut -d'x' -f2 | cut -d'+' -f1)" - width="$(printf %s "$output" | cut -d'x' -f1)" - case "$(xrandr | grep DSI-1 | cut -d' ' -f 5)" in - right) orientation=1;; - left) orientation=3;; - inverted) orientation=2;; - *) orientation=0;; - esac - if [ "$((orientation%2))" -ne 0 ]; then - tmp="$height" - height="$width" - width="$tmp" - fi -esac +if [ dwm = "$(sxmo_wm.sh)" ]; then + case "$(xrandr | grep DSI-1 | cut -d' ' -f 5)" in + right) orientation=1;; + left) orientation=3;; + inverted) orientation=2;; + *) orientation=0;; + esac +fi #-g format: # fingers,swipe,edge,distance,command #order matters, only the first match gets executed -lisgd "$@" -o "$orientation" -h "$height" -w "$width" \ +lisgd "$@" ${orientation:+-o $orientation} \ -t "$LISGD_THRESHOLD" -T "$LISGD_THRESHOLD_PRESSED" \ -g '1,DRUL,BR,*,sxmo_inputhandler.sh bottomrightcorner' \ -g '1,DLUR,BL,*,sxmo_inputhandler.sh bottomleftcorner' \