[PATCH libinput 6/6] touchpad: add MT_TOOL-based palm detection
Peter Hutterer
peter.hutterer at who-t.net
Fri Apr 21 00:05:21 UTC 2017
If the touchpad driver tells us something is a palm, go with that.
https://bugs.freedesktop.org/show_bug.cgi?id=100243
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
src/evdev-mt-touchpad.c | 41 ++++++++++++++++++++++++
src/evdev-mt-touchpad.h | 4 +++
test/test-touchpad.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 128 insertions(+)
diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index f41dd68..8585351 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -341,6 +341,11 @@ tp_process_absolute(struct tp_dispatch *tp,
t->dirty = true;
tp->queued |= TOUCHPAD_EVENT_OTHERAXIS;
break;
+ case ABS_MT_TOOL_TYPE:
+ t->is_tool_palm = e->value == MT_TOOL_PALM;
+ t->dirty = true;
+ tp->queued |= TOUCHPAD_EVENT_OTHERAXIS;
+ break;
}
}
@@ -622,6 +627,31 @@ tp_palm_detect_trackpoint_triggered(struct tp_dispatch *tp,
return false;
}
+static bool
+tp_palm_detect_tool_triggered(struct tp_dispatch *tp,
+ struct tp_touch *t,
+ uint64_t time)
+{
+ if (!tp->palm.use_mt_tool)
+ return false;
+
+ if (t->palm.state != PALM_NONE &&
+ t->palm.state != PALM_TOOL_PALM)
+ return false;
+
+ if (t->palm.state == PALM_NONE &&
+ t->is_tool_palm)
+ t->palm.state = PALM_TOOL_PALM;
+ else if (t->palm.state == PALM_TOOL_PALM &&
+ !t->is_tool_palm)
+ t->palm.state = PALM_NONE;
+
+ if (t->palm.state == PALM_TOOL_PALM)
+ tp_stop_actions(tp, time);
+
+ return t->palm.state == PALM_TOOL_PALM;
+}
+
static inline bool
tp_palm_detect_move_out_of_edge(struct tp_dispatch *tp,
struct tp_touch *t,
@@ -732,6 +762,9 @@ tp_palm_detect(struct tp_dispatch *tp, struct tp_touch *t, uint64_t time)
if (tp_palm_detect_trackpoint_triggered(tp, t, time))
goto out;
+ if (tp_palm_detect_tool_triggered(tp, t, time))
+ goto out;
+
if (tp_palm_detect_edge(tp, t, time))
goto out;
@@ -750,6 +783,9 @@ out:
case PALM_TRACKPOINT:
palm_state = "trackpoint";
break;
+ case PALM_TOOL_PALM:
+ palm_state = "tool-palm";
+ break;
case PALM_NONE:
default:
abort();
@@ -2267,6 +2303,11 @@ tp_init_palmdetect(struct tp_dispatch *tp,
tp->palm.monitor_trackpoint = true;
+ if (libevdev_has_event_code(device->evdev,
+ EV_ABS,
+ ABS_MT_TOOL_TYPE))
+ tp->palm.use_mt_tool = true;
+
tp_init_palmdetect_edge(tp, device);
}
diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index 2d531b5..93dd37b 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -66,6 +66,7 @@ enum touch_palm_state {
PALM_EDGE,
PALM_TYPING,
PALM_TRACKPOINT,
+ PALM_TOOL_PALM,
};
enum button_event {
@@ -154,6 +155,7 @@ struct tp_touch {
struct device_coords point;
uint64_t millis;
int pressure;
+ bool is_tool_palm; /* MT_TOOL_PALM */
bool was_down; /* if distance == 0, false for pure hovering
touches */
@@ -347,6 +349,8 @@ struct tp_dispatch {
uint64_t trackpoint_last_event_time;
uint32_t trackpoint_event_count;
bool monitor_trackpoint;
+
+ bool use_mt_tool;
} palm;
struct {
diff --git a/test/test-touchpad.c b/test/test-touchpad.c
index c0de99b..2731500 100644
--- a/test/test-touchpad.c
+++ b/test/test-touchpad.c
@@ -1293,6 +1293,86 @@ START_TEST(touchpad_palm_detect_both_edges)
}
END_TEST
+static inline bool
+touchpad_has_tool_palm(struct litest_device *dev)
+{
+ return libevdev_has_event_code(dev->evdev, EV_ABS, ABS_MT_TOOL_TYPE);
+}
+
+START_TEST(touchpad_palm_detect_tool_palm)
+{
+ struct litest_device *dev = litest_current_device();
+ struct libinput *li = dev->libinput;
+
+ if (!touchpad_has_tool_palm(dev))
+ return;
+
+ litest_touch_down(dev, 0, 50, 50);
+ litest_touch_move_to(dev, 0, 50, 50, 70, 70, 10, 1);
+ litest_drain_events(li);
+
+ litest_event(dev, EV_ABS, ABS_MT_TOOL_TYPE, MT_TOOL_PALM);
+ litest_event(dev, EV_SYN, SYN_REPORT, 0);
+ litest_touch_move_to(dev, 0, 70, 70, 50, 40, 10, 1);
+ litest_touch_up(dev, 0);
+
+ litest_assert_empty_queue(li);
+}
+END_TEST
+
+START_TEST(touchpad_palm_detect_tool_palm_on_off)
+{
+ struct litest_device *dev = litest_current_device();
+ struct libinput *li = dev->libinput;
+
+ if (!touchpad_has_tool_palm(dev))
+ return;
+
+ litest_touch_down(dev, 0, 50, 50);
+ litest_touch_move_to(dev, 0, 50, 50, 70, 70, 10, 1);
+ litest_drain_events(li);
+
+ litest_event(dev, EV_ABS, ABS_MT_TOOL_TYPE, MT_TOOL_PALM);
+ litest_event(dev, EV_SYN, SYN_REPORT, 0);
+ litest_touch_move_to(dev, 0, 70, 70, 50, 40, 10, 1);
+
+ litest_assert_empty_queue(li);
+
+ litest_event(dev, EV_ABS, ABS_MT_TOOL_TYPE, MT_TOOL_FINGER);
+ litest_event(dev, EV_SYN, SYN_REPORT, 0);
+ litest_touch_move_to(dev, 0, 50, 40, 70, 70, 10, 1);
+ litest_touch_up(dev, 0);
+
+ litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION);
+}
+END_TEST
+
+START_TEST(touchpad_palm_detect_tool_palm_tap)
+{
+ struct litest_device *dev = litest_current_device();
+ struct libinput *li = dev->libinput;
+
+ if (!touchpad_has_tool_palm(dev))
+ return;
+
+ litest_enable_tap(dev->libinput_device);
+ litest_drain_events(li);
+
+ litest_push_event_frame(dev);
+ litest_event(dev, EV_ABS, ABS_MT_TOOL_TYPE, MT_TOOL_PALM);
+ litest_touch_down(dev, 0, 50, 50);
+ litest_pop_event_frame(dev);
+ libinput_dispatch(li);
+ litest_assert_empty_queue(li);
+
+ litest_touch_up(dev, 0);
+ libinput_dispatch(li);
+ litest_timeout_tap();
+
+ litest_assert_empty_queue(li);
+}
+END_TEST
+
START_TEST(touchpad_left_handed)
{
struct litest_device *dev = litest_current_device();
@@ -4987,6 +5067,9 @@ litest_setup_tests_touchpad(void)
litest_add("touchpad:palm", touchpad_no_palm_detect_at_edge_for_edge_scrolling, LITEST_TOUCHPAD, LITEST_CLICKPAD);
litest_add("touchpad:palm", touchpad_no_palm_detect_2fg_scroll, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
litest_add("touchpad:palm", touchpad_palm_detect_both_edges, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
+ litest_add("touchpad:palm", touchpad_palm_detect_tool_palm, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
+ litest_add("touchpad:palm", touchpad_palm_detect_tool_palm_on_off, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
+ litest_add("touchpad:palm", touchpad_palm_detect_tool_palm_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
litest_add("touchpad:left-handed", touchpad_left_handed, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_CLICKPAD);
litest_add_for_device("touchpad:left-handed", touchpad_left_handed_appletouch, LITEST_APPLETOUCH);
--
2.9.3
More information about the wayland-devel
mailing list