Cleanup input handling

We now use uncontextualized event name from lisgd as leftrightcorner. We
will determine the action name only in the input handler. It allow
events to match multiple action depending on contexts.

We also add some basics events as left/rigth/up/down and
twoleft/tworight/twoup/twodown and use some of them.

Use use twoup and twodown to scroll in less and right left to
change the page.

We also prefer use case switch instead of if conditions.

We remove this HANDLE variable usage and exit directly when the event
has been handled.

We also add some methods as type, key or typeenter to simplify some
code.

Signed-off-by: Stacy Harper <contact@stacyharper.net>
Signed-off-by: Maarten van Gompel <proycon@anaproy.nl>

scripts/core/sxmo_inputhandler.sh

@@ -28,6 +28,21 @@ lock_screen() {
 	fi
 }
 
+key() {
+	xdotool windowactivate "$WIN"
+	xdotool key --delay 50 --clearmodifiers "$@"
+}
+
+type() {
+	xdotool windowactivate "$WIN"
+	xdotool type --delay 50 --clearmodifiers "$@"
+}
+
+typeenter() {
+	type "$@"
+	xdotool key Return
+}
+
 if [ "$(sxmo_screenlock.sh getCurState)" != "unlock" ]; then
 	case "$ACTION" in
 		"volup_three")
@@ -51,176 +66,209 @@ XPROPOUT="$(xprop -id "$(xdotool getactivewindow)")"
 WMCLASS="$(echo "$XPROPOUT" | grep WM_CLASS | cut -d ' ' -f3-)"
 WMNAME=$(echo "$XPROPOUT" | grep -E "^WM_NAME" | cut -d ' ' -f3-)
 
-HANDLE=1
 if [ -x "$XDG_CONFIG_HOME"/sxmo/hooks/inputhandler ]; then
 	#hook script must exit with a zero exit code ONLY if it has handled the gesture!
-	"$XDG_CONFIG_HOME"/sxmo/hooks/inputhandler "$WMCLASS" "$WMNAME" "$@"
+	"$XDG_CONFIG_HOME"/sxmo/hooks/inputhandler "$WMCLASS" "$WMNAME" "$@" && exit
-	HANDLE=$?
 fi
 
-if [ "$HANDLE" -ne 0 ]; then
 #special context-sensitive handling
 case "$WMCLASS" in
-		"foxtrotgps")
+	*"st-256color"*)
-			# E.g. just a check to ignore 1-finger gestures in foxtrotgps
-			if [ "$ACTION" != "killwindow" ]; then
-				HANDLE=0
-			fi
-			;;
-		"st-256color")
 		# First we try to handle the app running inside st:
-			if echo "$WMNAME" | grep -i -w tuir; then
+		case "$WMNAME" in
-				if [ "$ACTION" = "enter" ]; then
+			*"tuir"*)
-					xdotool key o
+				if [ "$ACTION" = "rightbottomcorner" ]; then
-					HANDLE=0
+					type o
-				elif [ "$ACTION" = "back" ]; then
+					exit 0
-					xdotool key s
+				elif [ "$ACTION" = "leftbottomcorner" ]; then
-					HANDLE=0
+					type s
-				fi
+					exit 0
-			elif echo "$WMNAME" | grep -i -E -w "(less|mless)"; then
-				if [ "$ACTION" = "back" ] || [ "$ACTION" = "scrollleft_short" ]; then
-					xdotool key q
-					HANDLE=0
-				fi
 				fi
 				;;
+			*"less"*)
+				case "$ACTION" in
+					"leftbottomcorner")
+						type q
+						exit 0
+						;;
+					"leftrightcorner_short")
+						type q
+						exit 0
+						;;
+					"twodown")
+						type u
+						exit 0
+						;;
+					"twoup")
+						type  d
+						exit 0
+						;;
+					"left")
+						typeenter ":n"
+						exit 0
+						;;
+					"right")
+						typeenter ":p"
+						exit 0
+						;;
+				esac
+				;;
+		esac
 esac
-fi
 
-if [ "$HANDLE" -ne 0 ]; then
 #standard handling
 case "$ACTION" in
-		"prevdesktop")
+	"rightleftcorner")
-			xdotool key --clearmodifiers Super+Shift+e
+		key Super+Shift+e
+		exit 0
 		;;
-		"nextdesktop")
+	"leftrightcorner")
-			xdotool key --clearmodifiers Super+Shift+r
+		key Super+Shift+r
+		exit 0
 		;;
-		"moveprevdesktop")
+	"twoleft") # Move window previous
-			xdotool key --clearmodifiers Super+e
+		key Super+e
+		exit 0
 		;;
-		"movenextdesktop")
+	"tworight") # Move window next
-			xdotool key --clearmodifiers Super+r
+		key Super+r
+		exit 0
 		;;
 	"unmute")
 		sxmo_vol.sh unmute &
+		exit 0
 		;;
 	"mute")
 		sxmo_vol.sh mute &
+		exit 0
 		;;
-		"brightnessup")
+	"righttopcorner")
 		sxmo_brightness.sh up &
+		exit 0
 		;;
-		"brightnessdown")
+	"lefttopcorner")
 		sxmo_brightness.sh down &
+		exit 0
 		;;
-		"volup")
+	"upleftcorner")
 		sxmo_vol.sh up &
+		exit 0
 		;;
-		"voldown")
+	"downleftcorner")
 		sxmo_vol.sh down &
+		exit 0
 		;;
-		"showkeyboard")
+	"upbottomcorner")
 		sxmo_keyboard.sh open
+		exit 0
 		;;
-		"hidekeyboard")
+	"downbottomcorner")
 		sxmo_keyboard.sh close
+		exit 0
 		;;
-		"showmenu")
+	"downtopcorner")
 		pidof dmenu || setsid -f sxmo_appmenu.sh &
+		exit 0
 		;;
-		"showsysmenu")
+	"twodowntopcorner")
 		pidof dmenu || setsid -f sxmo_appmenu.sh sys &
+		exit 0
 		;;
-		"hidemenu")
+	"uptopcorner")
 		pkill -9 dmenu
 		dunstctl close-all
+		exit 0
 		;;
-		"closewindow")
+	"twodownbottomcorner")
 		sxmo_killwindow.sh close
+		exit 0
 		;;
-		"killwindow")
+	"threedownbottomcorner")
 		sxmo_killwindow.sh
+		exit 0
 		;;
-		"scrollup_long")
+	"uprightcorner")
-			xdotool key Prior
-			;;
-		"scrolldown_long")
-			xdotool key Next
-			;;
-		"scrollup_med")
-			xdotool key Up Up Up
-			;;
-		"scrolldown_med")
-			xdotool key Down Down Down
-			;;
-		"scrollup_short")
 		xdotool key Up
+		exit 0
 		;;
-		"scrolldown_short")
+	"downrightcorner")
 		xdotool key Down
+		exit 0
 		;;
-		"scrollleft_short")
+	"leftrightcorner_short")
 		xdotool key Left
+		exit 0
 		;;
-		"scrollright_short")
+	"rightrightcorner_short")
 		xdotool key Right
+		exit 0
 		;;
-		"enter")
+	"rightbottomcorner")
 		xdotool key Return
+		exit 0
 		;;
-		"back")
+	"leftbottomcorner")
 		xdotool key BackSpace
+		exit 0
 		;;
 	"powerbutton_one")
 		if echo "$WMCLASS" | grep -i "megapixels"; then
-				xdotool key --clearmodifiers "space"
+			key "space"
 		else
 			sxmo_keyboard.sh toggle
 		fi
+		exit 0
 		;;
 	"powerbutton_two")
 		sxmo_blinkled.sh blue && $TERMCMD -e "$SHELL"
+		exit 0
 		;;
 	"powerbutton_three")
 		sxmo_blinkled.sh blue && $BROWSER
+		exit 0
 		;;
 	"volup_one")
 		sxmo_appmenu.sh
+		exit 0
 		;;
 	"volup_two")
 		sxmo_appmenu.sh sys
+		exit 0
 		;;
 	"volup_three")
 		lock_screen
+		exit 0
 		;;
 	"voldown_one")
-			xdotool key --clearmodifiers Super+space
+		key Super+space
+		exit 0
 		;;
 	"voldown_two")
-			xdotool key --clearmodifiers Super+Return
+		key Super+Return
+		exit 0
 		;;
 	"voldown_three")
 		sxmo_blinkled.sh red && sxmo_killwindow.sh
+		exit 0
 		;;
 	"voldown_four")
 		sxmo_blinkled.sh red & sxmo_killwindow.sh close
+		exit 0
 		;;
 	"topleftcorner")
 		sxmo_appmenu.sh sys &
+		exit 0
 		;;
 	"toprightcorner")
 		sxmo_appmenu.sh scripts &
+		exit 0
 		;;
 	"bottomleftcorner")
 		lock_screen
+		exit 0
 		;;
 	"bottomrightcorner")
 		sxmo_rotate.sh &
-			;;
+		exit 0
-		*)
-			#fallback, just execute the command
-			"$@"
 		;;
 esac
-fi

scripts/core/sxmo_lisgdstart.sh

@@ -24,26 +24,32 @@ else
 		-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 enter' \
+		-g '1,LR,B,L,sxmo_inputhandler.sh rightbottomcorner' \
-		-g '1,RL,B,L,sxmo_inputhandler.sh back' \
+		-g '1,RL,B,L,sxmo_inputhandler.sh leftbottomcorner' \
-		-g '1,LR,L,*,sxmo_inputhandler.sh prevdesktop' \
+		-g '1,LR,L,*,sxmo_inputhandler.sh rightleftcorner' \
-		-g '1,RL,R,*,sxmo_inputhandler.sh nextdesktop' \
+		-g '1,RL,R,*,sxmo_inputhandler.sh leftrightcorner' \
-		-g '1,DU,L,*,P,sxmo_inputhandler.sh volup' \
+		-g '1,DU,L,*,P,sxmo_inputhandler.sh upleftcorner' \
-		-g '1,UD,L,*,P,sxmo_inputhandler.sh voldown' \
+		-g '1,UD,L,*,P,sxmo_inputhandler.sh downleftcorner' \
-		-g '1,LR,T,*,P,sxmo_inputhandler.sh brightnessup' \
+		-g '1,LR,T,*,P,sxmo_inputhandler.sh righttopcorner' \
-		-g '1,RL,T,*,P,sxmo_inputhandler.sh brightnessdown' \
+		-g '1,RL,T,*,P,sxmo_inputhandler.sh lefttopcorner' \
-		-g "1,DU,B,*,sxmo_inputhandler.sh showkeyboard" \
+		-g "1,DU,B,*,sxmo_inputhandler.sh upbottomcorner" \
-		-g "1,UD,B,*,sxmo_inputhandler.sh hidekeyboard" \
+		-g "1,UD,B,*,sxmo_inputhandler.sh downbottomcorner" \
-		-g "1,UD,T,*,sxmo_inputhandler.sh showmenu" \
+		-g "1,UD,T,*,sxmo_inputhandler.sh downtopcorner" \
-		-g "1,DU,T,*,sxmo_inputhandler.sh hidemenu" \
+		-g "1,DU,T,*,sxmo_inputhandler.sh uptopcorner" \
-		-g "2,UD,T,*,sxmo_inputhandler.sh showsysmenu" \
+		-g "2,UD,T,*,sxmo_inputhandler.sh twodowntopcorner" \
-		-g "2,UD,B,*,sxmo_inputhandler.sh closewindow" \
+		-g "2,UD,B,*,sxmo_inputhandler.sh twodownbottomcorner" \
-		-g "3,UD,B,*,sxmo_inputhandler.sh killwindow" \
+		-g "r,UD,B,*,sxmo_inputhandler.sh threedownbottomcorner" \
-		-g '2,RL,*,*,sxmo_inputhandler.sh moveprevdesktop' \
+		-g '1,DU,R,*,P,sxmo_inputhandler.sh uprightcorner' \
-		-g '2,LR,*,*,sxmo_inputhandler.sh movenextdesktop' \
+		-g '1,UD,R,*,P,sxmo_inputhandler.sh downrightcorner' \
-		-g '1,DU,R,*,P,sxmo_inputhandler.sh scrollup_short' \
+		-g '1,LR,R,S,sxmo_inputhandler.sh rightrightcorner_short' \
-		-g '1,UD,R,*,P,sxmo_inputhandler.sh scrolldown_short' \
+		-g '1,RL,L,S,sxmo_inputhandler.sh leftrightcorner_short' \
-		-g '1,LR,R,S,sxmo_inputhandler.sh scrollright_short' \
+		-g '1,RL,*,*,sxmo_inputhandler.sh left' \
-		-g '1,RL,L,S,sxmo_inputhandler.sh scrollleft_short' \
+		-g '1,LR,*,*,sxmo_inputhandler.sh right' \
+		-g '1,DU,*,*,sxmo_inputhandler.sh up' \
+		-g '1,UD,*,*,sxmo_inputhandler.sh down' \
+		-g '2,RL,*,*,sxmo_inputhandler.sh twoleft' \
+		-g '2,LR,*,*,sxmo_inputhandler.sh tworight' \
+		-g '2,DU,*,*,sxmo_inputhandler.sh twoup' \
+		-g '2,UD,*,*,sxmo_inputhandler.sh twodown' \
 		>"$CACHEDIR/lisgd.log" 2>&1 &
 fi