From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 Jun 2019 00:27:59 +0000 (+1000)
Subject: touchpad: rename the scroll timeout define, drop the pinch one
X-Git-Tag: 1.13.901~1^2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e89e43c74ade30cff7cc013f88b1877188c578d;p=platform%2Fupstream%2Flibinput.git

touchpad: rename the scroll timeout define, drop the pinch one

The previously 'scroll'-named timeout is also used for swipe, so let's rename
it. And the pinch one isn't used at all.

Extracted from Matt Mayfield's thumb detection patches.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---

diff --git a/src/evdev-mt-touchpad-gestures.c b/src/evdev-mt-touchpad-gestures.c
index eeb3b4c..75a54f8 100644
--- a/src/evdev-mt-touchpad-gestures.c
+++ b/src/evdev-mt-touchpad-gestures.c
@@ -30,8 +30,7 @@
 #include "evdev-mt-touchpad.h"
 
 #define DEFAULT_GESTURE_SWITCH_TIMEOUT ms2us(100)
-#define DEFAULT_GESTURE_2FG_SCROLL_TIMEOUT ms2us(150)
-#define DEFAULT_GESTURE_2FG_PINCH_TIMEOUT ms2us(75)
+#define DEFAULT_GESTURE_SWIPE_TIMEOUT ms2us(150)
 
 static inline const char*
 gesture_state_to_str(enum tp_gesture_state state)
@@ -475,7 +474,7 @@ tp_gesture_handle_state_unknown(struct tp_dispatch *tp, uint64_t time)
 	vert_distance = abs(first->point.y - second->point.y);
 	horiz_distance = abs(first->point.x - second->point.x);
 
-	if (time > (tp->gesture.initial_time + DEFAULT_GESTURE_2FG_SCROLL_TIMEOUT)) {
+	if (time > (tp->gesture.initial_time + DEFAULT_GESTURE_SWIPE_TIMEOUT)) {
 		/* for two-finger gestures, if the fingers stay unmoving for a
 		 * while, assume (slow) scroll */
 		if (tp->gesture.finger_count == 2) {
@@ -500,7 +499,7 @@ tp_gesture_handle_state_unknown(struct tp_dispatch *tp, uint64_t time)
 		}
 	}
 
-	if (time > (tp->gesture.initial_time + DEFAULT_GESTURE_2FG_SCROLL_TIMEOUT)) {
+	if (time > (tp->gesture.initial_time + DEFAULT_GESTURE_SWIPE_TIMEOUT)) {
 		mm = evdev_convert_xy_to_mm(tp->device, horiz_distance, vert_distance);
 		if (tp->gesture.finger_count == 2 && mm.x > 40 && mm.y > 40)
 			return GESTURE_STATE_PINCH;