diff options
| author | Jason Gerecke <killertofu@gmail.com> | 2018-06-15 14:28:23 -0700 |
|---|---|---|
| committer | Jason Gerecke <killertofu@gmail.com> | 2019-09-04 09:38:11 -0700 |
| commit | 8188891c120af14f3cea28ad72ed0cf61eaa2988 (patch) | |
| tree | 79ccf20f52c0e6ced70563e341f40613faef27da | |
| parent | 0ac49a26d25279b7777239066aff8e1f5f23bd4b (diff) | |
| download | xf86-input-wacom-8188891c120af14f3cea28ad72ed0cf61eaa2988.tar.gz | |
Do not wait wcmTapTime to enter scroll or zoom mode
Commit 3005fc0 reduced the amount of time that we wait before entering
scroll and zoom mode, mentioning that the only reason we want to wait
at all is to process time-based two-finger gestures. The commit hints
at a "2 finger tap" being the only gesture which this would apply to,
but there are no signs of that gesture in the driver anymore. There is
the right-click gesture which requires that the second finger be tapped
for less than wcmTapTime, but removing the wcmTapTime limit on entering
scroll and zoom modes does not affect that gesture (unless your right-
click gesture was so sloppy that your fingers moved enough to be
considered a scroll or zoom gesture).
Ref: https://github.com/linuxwacom/xf86-input-wacom/issues/43
Ref: 3005fc0 ("reduce 2-finger scroll holdoff time")
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
| -rw-r--r-- | src/wcmTouchFilter.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/wcmTouchFilter.c b/src/wcmTouchFilter.c index 423a893..3846c88 100644 --- a/src/wcmTouchFilter.c +++ b/src/wcmTouchFilter.c @@ -528,23 +528,18 @@ void wcmGestureFilter(WacomDevicePtr priv, int touch_id) if (!dsLast[0].proximity || !dsLast[1].proximity) goto ret; - /* was in zoom mode no time check needed */ + /* continue zooming if already in zoom mode */ if ((common->wcmGestureMode & GESTURE_ZOOM_MODE) && ds[0].proximity && ds[1].proximity) wcmFingerZoom(priv); - /* was in scroll mode no time check needed */ + /* continue scrollling if already in scroll mode */ else if (common->wcmGestureMode & GESTURE_SCROLL_MODE) wcmFingerScroll(priv); /* process complex two finger gestures */ else { - CARD32 ms = GetTimeInMillis(); - int taptime = common->wcmGestureParameters.wcmTapTime; - - if (ds[0].proximity && ds[1].proximity && - (taptime < (ms - ds[0].sample)) && - (taptime < (ms - ds[1].sample))) + if (ds[0].proximity && ds[1].proximity) { /* scroll should be considered first since it requires * a finger distance check */ |