test: only run the speed finger tests when the touchpad has thumb detection

This commit is contained in:
Peter Hutterer 2019-07-10 12:10:42 +10:00
parent 181f8d2ab5
commit 8e4d820efd
2 changed files with 13 additions and 1 deletions

View file

@ -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--;

View file

@ -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