summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2017-02-01 14:48:11 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2017-02-01 15:06:10 +1000
commite86fdd588315ab13f44d2575c12bc167a9947173 (patch)
tree85fc65954c9cc4f5ce8ecadf595095ee8840873b
parent45d7794de2fb8c24fddd5cd91d946900e4bb4495 (diff)
Revert "touchpad: reduce the initial timeout for tapping after touch"
The timeout is too short, a number of users are unable to tap now. https://bugs.freedesktop.org/show_bug.cgi?id=99447 This reverts commit d0ba1e2b383acaac8a31a1ded7d3039bcd161db3.
-rw-r--r--src/evdev-mt-touchpad-tap.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/evdev-mt-touchpad-tap.c b/src/evdev-mt-touchpad-tap.c
index 1829732f..ca8e776a 100644
--- a/src/evdev-mt-touchpad-tap.c
+++ b/src/evdev-mt-touchpad-tap.c
@@ -33,7 +33,6 @@
#include "evdev-mt-touchpad.h"
-#define DEFAULT_TAP_INITIAL_TIMEOUT_PERIOD ms2us(100)
#define DEFAULT_TAP_TIMEOUT_PERIOD ms2us(180)
#define DEFAULT_DRAG_TIMEOUT_PERIOD ms2us(300)
#define DEFAULT_TAP_MOVE_THRESHOLD 1.3 /* mm */
@@ -128,13 +127,6 @@ tp_tap_notify(struct tp_dispatch *tp,
}
static void
-tp_tap_set_initial_timer(struct tp_dispatch *tp, uint64_t time)
-{
- libinput_timer_set(&tp->tap.timer,
- time + DEFAULT_TAP_INITIAL_TIMEOUT_PERIOD);
-}
-
-static void
tp_tap_set_timer(struct tp_dispatch *tp, uint64_t time)
{
libinput_timer_set(&tp->tap.timer, time + DEFAULT_TAP_TIMEOUT_PERIOD);
@@ -163,7 +155,7 @@ tp_tap_idle_handle_event(struct tp_dispatch *tp,
case TAP_EVENT_TOUCH:
tp->tap.state = TAP_STATE_TOUCH;
tp->tap.first_press_time = time;
- tp_tap_set_initial_timer(tp, time);
+ tp_tap_set_timer(tp, time);
break;
case TAP_EVENT_RELEASE:
break;