diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2018-04-27 14:40:57 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2018-04-27 16:37:10 +1000 |
| commit | c0fd857def5547f612d2c14ae57dda1cef47a92c (patch) | |
| tree | 211d978a82975e4123c9b835b44448bb5ae3d2c5 /test | |
| parent | 7d06ccc06125844ffc3e914ee8fa0a7b6e0a0df3 (diff) | |
touchpad: fix the trackpoint event counter for the T460s
Introduced in 416fa44d80b0f2c53b652ddfa35dd4a156a65c65 but there was a logic
error: we claimed to require 3 events from a trackpoint before stopping the
touchpad but the timer was only set when we actually stopped the touchpad. So
if a trackpoint sends a single event every second, we'd disable the touchpad
after 3 seconds for the duration of the timeout, then again 3 seconds later,
etc.
Fix this by always setting the timeout and resetting the event counter if no
activity happened.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-trackpoint.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/test/test-trackpoint.c b/test/test-trackpoint.c index a924f5e2..1f823331 100644 --- a/test/test-trackpoint.c +++ b/test/test-trackpoint.c @@ -379,6 +379,35 @@ START_TEST(trackpoint_palmdetect_require_min_events) } END_TEST +START_TEST(trackpoint_palmdetect_require_min_events_timeout) +{ + struct litest_device *trackpoint = litest_current_device(); + struct litest_device *touchpad; + struct libinput *li = trackpoint->libinput; + + touchpad = litest_add_device(li, LITEST_SYNAPTICS_I2C); + litest_drain_events(li); + + for (int i = 0; i < 10; i++) { + /* A single event does not trigger palm detection */ + litest_event(trackpoint, EV_REL, REL_X, 1); + litest_event(trackpoint, EV_REL, REL_Y, 1); + litest_event(trackpoint, EV_SYN, SYN_REPORT, 0); + libinput_dispatch(li); + litest_drain_events(li); + + litest_touch_down(touchpad, 0, 30, 30); + litest_touch_move_to(touchpad, 0, 30, 30, 80, 80, 10, 1); + litest_touch_up(touchpad, 0); + litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); + + litest_timeout_trackpoint(); + } + + litest_delete_device(touchpad); +} +END_TEST + TEST_COLLECTION(trackpoint) { litest_add("trackpoint:middlebutton", trackpoint_middlebutton, LITEST_POINTINGSTICK, LITEST_ANY); @@ -392,4 +421,5 @@ TEST_COLLECTION(trackpoint) litest_add("trackpoint:palmdetect", trackpoint_palmdetect, LITEST_POINTINGSTICK, LITEST_ANY); litest_add("trackpoint:palmdetect", trackpoint_palmdetect_resume_touch, LITEST_POINTINGSTICK, LITEST_ANY); litest_add("trackpoint:palmdetect", trackpoint_palmdetect_require_min_events, LITEST_POINTINGSTICK, LITEST_ANY); + litest_add("trackpoint:palmdetect", trackpoint_palmdetect_require_min_events_timeout, LITEST_POINTINGSTICK, LITEST_ANY); } |