From 8e4d820efd604d927372f55ca9c02856cacbd6ff Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 10 Jul 2019 12:10:42 +1000 Subject: [PATCH] test: only run the speed finger tests when the touchpad has thumb detection --- src/evdev-mt-touchpad.c | 2 +- test/test-touchpad.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c index 9b7d30c..8f43b4b 100644 --- a/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c @@ -1698,7 +1698,7 @@ tp_process_state(struct tp_dispatch *tp, uint64_t time) * never count down. Let's see how far we get with that. */ if (t->speed.last_speed > THUMB_IGNORE_SPEED_THRESHOLD) { - if (t->speed.exceeded_count < 10) + if (t->speed.exceeded_count < 15) t->speed.exceeded_count++; } else if (t->speed.exceeded_count > 0) { t->speed.exceeded_count--; diff --git a/test/test-touchpad.c b/test/test-touchpad.c index 1f349b8..9ce9456 100644 --- a/test/test-touchpad.c +++ b/test/test-touchpad.c @@ -6498,6 +6498,9 @@ START_TEST(touchpad_speed_ignore_finger) struct litest_device *dev = litest_current_device(); struct libinput *li = dev->libinput; + if (!has_thumb_detect(dev)) + return; + if (litest_has_clickfinger(dev)) litest_enable_clickfinger(dev); @@ -6521,6 +6524,9 @@ START_TEST(touchpad_speed_allow_nearby_finger) struct litest_device *dev = litest_current_device(); struct libinput *li = dev->libinput; + if (!has_thumb_detect(dev)) + return; + if (!litest_has_2fg_scroll(dev)) return; @@ -6550,6 +6556,9 @@ START_TEST(touchpad_speed_ignore_finger_edgescroll) struct litest_device *dev = litest_current_device(); struct libinput *li = dev->libinput; + if (!has_thumb_detect(dev)) + return; + litest_enable_edge_scroll(dev); if (litest_has_clickfinger(dev)) litest_enable_clickfinger(dev); @@ -6581,6 +6590,9 @@ START_TEST(touchpad_speed_ignore_hovering_finger) { -1, 0 } }; + if (!has_thumb_detect(dev)) + return; + litest_drain_events(li); /* first finger down but below touch size. we use slot 2 because -- 2.7.4