summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPing Cheng <ping.cheng@wacom.com>2022-08-26 15:02:16 -0700
committerPeter Hutterer <peter.hutterer@who-t.net>2022-08-31 09:52:18 +1000
commit23c46706f12982c3baaa03b3b8f53ea72679a136 (patch)
tree7ed57c5be545bd0138203962b16723bd3ba92f6b
parent18ed7697e3049943e3bfef46af6c647b2d93ed8f (diff)
downloadxf86-input-wacom-23c46706f12982c3baaa03b3b8f53ea72679a136.tar.gz
Bring two finger right-click function back
Patch 65b7c37 fixed spurious right-clicks by setting wcmGestureMode back to GESTURE_CANCEL_MODE immediately when there is less than two fingers on the tablet, if the wcmGestureMode was in SCROLL_MODE or ZOOM_MODE. However, it narrowed wcmFingerTapToClick() rotine to LAG_MODE, which removed the opportunity for the routine to executed. Revert that. Fixes: https://github.com/linuxwacom/xf86-input-wacom/commit/65b7c37f0fac5cdd03ff7f977124148d0bdf4be8 (Prevent spurious right-clicks at the end of very short scroll and zoom gestures) Signed-off-by: Ping Cheng <ping.cheng@wacom.com>
-rw-r--r--src/wcmTouchFilter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wcmTouchFilter.c b/src/wcmTouchFilter.c
index 23123e3..08b8b0d 100644
--- a/src/wcmTouchFilter.c
+++ b/src/wcmTouchFilter.c
@@ -542,7 +542,7 @@ void wcmGestureFilter(WacomDevicePtr priv, unsigned int touch_id)
goto ret;
}
- if ((common->wcmGestureMode & GESTURE_LAG_MODE) && touch_id == 1)
+ if (!(common->wcmGestureMode & (GESTURE_SCROLL_MODE | GESTURE_ZOOM_MODE)) && touch_id == 1)
wcmFingerTapToClick(priv);
/* Change mode happens only when both fingers are out */