From c831d267732de3b7f2e62a809f2006078a0aeba1 Mon Sep 17 00:00:00 2001 From: Maarten van Gompel Date: Fri, 10 Sep 2021 23:07:44 +0200 Subject: [PATCH] fixed gesture names; a lot of gestures were erronously named corner rather than edge This causes us to have both a 'bottomleftcorner' and 'leftbottomcorner', the latter is now 'leftbottomedge' and is interpreted as 'a left swipe along the bottom edge' while 'bottomleftcorner' is 'diagonal swipe from the bottom left corner'. Signed-off-by: Anjandev Momi --- configs/default_hooks/lisgdstart | 36 ++++++++++++------------- scripts/core/sxmo_inputhandler.sh | 44 +++++++++++++++---------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/configs/default_hooks/lisgdstart b/configs/default_hooks/lisgdstart index 61f304c..976cfe5 100644 --- a/configs/default_hooks/lisgdstart +++ b/configs/default_hooks/lisgdstart @@ -31,24 +31,24 @@ lisgd "$@" ${orientation:+-o $orientation} \ -g '1,DLUR,BL,*,sxmo_inputhandler.sh bottomleftcorner' \ -g '1,ULDR,TL,*,sxmo_inputhandler.sh topleftcorner' \ -g '1,URDL,TR,*,sxmo_inputhandler.sh toprightcorner' \ - -g '1,LR,B,L,sxmo_inputhandler.sh rightbottomcorner' \ - -g '1,RL,B,L,sxmo_inputhandler.sh leftbottomcorner' \ - -g '1,LR,L,*,sxmo_inputhandler.sh rightleftcorner' \ - -g '1,RL,R,*,sxmo_inputhandler.sh leftrightcorner' \ - -g '1,DU,L,*,P,sxmo_inputhandler.sh upleftcorner' \ - -g '1,UD,L,*,P,sxmo_inputhandler.sh downleftcorner' \ - -g '1,LR,T,*,P,sxmo_inputhandler.sh righttopcorner' \ - -g '1,RL,T,*,P,sxmo_inputhandler.sh lefttopcorner' \ - -g "1,DU,B,*,sxmo_inputhandler.sh upbottomcorner" \ - -g "1,UD,B,*,sxmo_inputhandler.sh downbottomcorner" \ - -g "1,UD,T,*,sxmo_inputhandler.sh downtopcorner" \ - -g "1,DU,T,*,sxmo_inputhandler.sh uptopcorner" \ - -g "2,UD,T,*,sxmo_inputhandler.sh twodowntopcorner" \ - -g "2,UD,B,*,sxmo_inputhandler.sh twodownbottomcorner" \ - -g '1,DU,R,*,P,sxmo_inputhandler.sh uprightcorner' \ - -g '1,UD,R,*,P,sxmo_inputhandler.sh downrightcorner' \ - -g '1,LR,R,S,sxmo_inputhandler.sh rightrightcorner_short' \ - -g '1,RL,L,S,sxmo_inputhandler.sh leftrightcorner_short' \ + -g '1,LR,B,L,sxmo_inputhandler.sh rightbottomedge' \ + -g '1,RL,B,L,sxmo_inputhandler.sh leftbottomedge' \ + -g '1,LR,L,*,sxmo_inputhandler.sh rightleftedge' \ + -g '1,RL,R,*,sxmo_inputhandler.sh leftrightedge' \ + -g '1,DU,L,*,P,sxmo_inputhandler.sh upleftedge' \ + -g '1,UD,L,*,P,sxmo_inputhandler.sh downleftedge' \ + -g '1,LR,T,*,P,sxmo_inputhandler.sh righttopedge' \ + -g '1,RL,T,*,P,sxmo_inputhandler.sh lefttopedge' \ + -g "1,DU,B,*,sxmo_inputhandler.sh upbottomedge" \ + -g "1,UD,B,*,sxmo_inputhandler.sh downbottomedge" \ + -g "1,UD,T,*,sxmo_inputhandler.sh downtopedge" \ + -g "1,DU,T,*,sxmo_inputhandler.sh uptopedge" \ + -g "2,UD,T,*,sxmo_inputhandler.sh twodowntopedge" \ + -g "2,UD,B,*,sxmo_inputhandler.sh twodownbottomedge" \ + -g '1,DU,R,*,P,sxmo_inputhandler.sh uprightedge' \ + -g '1,UD,R,*,P,sxmo_inputhandler.sh downrightedge' \ + -g '1,LR,R,S,sxmo_inputhandler.sh rightrightedge_short' \ + -g '1,RL,L,S,sxmo_inputhandler.sh leftrightedge_short' \ -g '1,RL,*,L,sxmo_inputhandler.sh longoneleft' \ -g '1,LR,*,L,sxmo_inputhandler.sh longoneright' \ -g '1,DU,*,L,sxmo_inputhandler.sh longoneup' \ diff --git a/scripts/core/sxmo_inputhandler.sh b/scripts/core/sxmo_inputhandler.sh index 0bb417c..ae26d6c 100755 --- a/scripts/core/sxmo_inputhandler.sh +++ b/scripts/core/sxmo_inputhandler.sh @@ -71,21 +71,21 @@ case "$WMCLASS" in # First we try to handle the app running inside st: case "$WMNAME" in *"tuir"*) - if [ "$ACTION" = "rightbottomcorner" ]; then + if [ "$ACTION" = "rightbottomedge" ]; then sxmo_type.sh o exit 0 - elif [ "$ACTION" = "leftbottomcorner" ]; then + elif [ "$ACTION" = "leftbottomedge" ]; then sxmo_type.sh s exit 0 fi ;; *"less"*) case "$ACTION" in - "leftbottomcorner") + "leftbottomedge") sxmo_type.sh q exit 0 ;; - "leftrightcorner_short") + "leftrightedge_short") sxmo_type.sh q exit 0 ;; @@ -199,11 +199,11 @@ case "$ACTION" in lock_screen exit ;; - "rightleftcorner") + "rightleftedge") sxmo_workspace.sh previous exit 0 ;; - "leftrightcorner") + "leftrightedge") sxmo_workspace.sh next exit 0 ;; @@ -215,68 +215,68 @@ case "$ACTION" in sxmo_workspace.sh move-next exit 0 ;; - "righttopcorner") + "righttopedge") sxmo_brightness.sh up & exit 0 ;; - "lefttopcorner") + "lefttopedge") sxmo_brightness.sh down & exit 0 ;; - "upleftcorner") + "upleftedge") sxmo_vol.sh up & exit 0 ;; - "downleftcorner") + "downleftedge") sxmo_vol.sh down & exit 0 ;; - "upbottomcorner") + "upbottomedge") sxmo_keyboard.sh open exit 0 ;; - "downbottomcorner") + "downbottomedge") sxmo_keyboard.sh close exit 0 ;; - "downtopcorner") + "downtopedge") sxmo_dmenu.sh isopen || sxmo_appmenu.sh & exit 0 ;; - "twodowntopcorner") + "twodowntopedge") sxmo_dmenu.sh isopen || sxmo_appmenu.sh sys & exit 0 ;; - "uptopcorner") + "uptopedge") sxmo_dmenu.sh close dunstctl close-all exit 0 ;; - "twodownbottomcorner") + "twodownbottomedge") sxmo_killwindow.sh exit 0 ;; - "uprightcorner") + "uprightedge") sxmo_type.sh -k Up exit 0 ;; - "downrightcorner") + "downrightedge") sxmo_type.sh -k Down exit 0 ;; - "leftrightcorner_short") + "leftrightedge_short") sxmo_type.sh -k Left exit 0 ;; - "rightrightcorner_short") + "rightrightedge_short") sxmo_type.sh -k Right exit 0 ;; - "rightbottomcorner") + "rightbottomedge") sxmo_type.sh -k Return exit 0 ;; - "leftbottomcorner") + "leftbottomedge") sxmo_type.sh -k BackSpace exit 0 ;;