fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-01-05 02:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gestures: handle pointer motion as an extra state

Browse source 
Refactor the gesture state machine to integrate pointer motion as an extra state
of the state machine.

Signed-off-by: José Expósito <jose.exposito89@gmail.com>
This commit is contained in:
José Expósito 2021-05-27 19:18:54 +02:00 • committed by Peter Hutterer
parent ba3e79c9f4
commit d5636eb934
2 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/evdev-mt-touchpad-gestures.c
View file

@ -40,6 +40,7 @@ gesture_state_to_str(enum tp_gesture_state state)
switch (state) {
CASE_RETURN_STRING(GESTURE_STATE_NONE);
CASE_RETURN_STRING(GESTURE_STATE_UNKNOWN);
CASE_RETURN_STRING(GESTURE_STATE_POINTER_MOTION);
CASE_RETURN_STRING(GESTURE_STATE_SCROLL);
CASE_RETURN_STRING(GESTURE_STATE_PINCH);
CASE_RETURN_STRING(GESTURE_STATE_SWIPE);
@ -135,6 +136,8 @@ tp_gesture_start(struct tp_dispatch *tp, uint64_t time)
tp->gesture.finger_count,
&zero, &zero);
break;
case GESTURE_STATE_POINTER_MOTION:
break;
}
tp->gesture.started = true;
@ -447,6 +450,13 @@ tp_gesture_detect_motion_gestures(struct tp_dispatch *tp, uint64_t time)
double min_move = 1.5; /* min movement threshold in mm - count this touch */
double max_move = 4.0; /* max movement threshold in mm - ignore other touch */
if (tp->gesture.finger_count == 1) {
if (tp_has_pending_pointer_motion(tp, time))
return GESTURE_STATE_POINTER_MOTION;
return GESTURE_STATE_UNKNOWN;
}
/* If we have more fingers than slots, we don't know where the
* fingers are. Default to swipe */
if (tp->gesture.enabled && tp->gesture.finger_count > 2 &&
@ -602,7 +612,7 @@ tp_gesture_handle_state_none(struct tp_dispatch *tp, uint64_t time)
ntouches = tp_gesture_get_active_touches(tp, touches, 4);
if (ntouches < 2)
return GESTURE_STATE_NONE;
return GESTURE_STATE_UNKNOWN;
if (!tp->gesture.enabled) {
if (ntouches == 2)
@ -661,6 +671,14 @@ tp_gesture_handle_state_unknown(struct tp_dispatch *tp, uint64_t time)
return tp_gesture_detect_motion_gestures(tp, time);
}
static enum tp_gesture_state
tp_gesture_handle_state_pointer_motion(struct tp_dispatch *tp, uint64_t time)
{
if (tp->queued & TOUCHPAD_EVENT_MOTION)
tp_gesture_post_pointer_motion(tp, time);
return GESTURE_STATE_POINTER_MOTION;
}
static enum tp_gesture_state
tp_gesture_handle_state_scroll(struct tp_dispatch *tp, uint64_t time)
{
@ -771,6 +789,10 @@ tp_gesture_post_gesture(struct tp_dispatch *tp, uint64_t time)
tp->gesture.state =
tp_gesture_handle_state_unknown(tp, time);
if (tp->gesture.state == GESTURE_STATE_POINTER_MOTION)
tp->gesture.state =
tp_gesture_handle_state_pointer_motion(tp, time);
if (tp->gesture.state == GESTURE_STATE_SCROLL)
tp->gesture.state =
tp_gesture_handle_state_scroll(tp, time);
@ -819,7 +841,10 @@ tp_gesture_post_events(struct tp_dispatch *tp, uint64_t time)
if (tp_tap_dragging(tp) ||
(tp->buttons.is_clickpad && tp->buttons.state &&
tp->thumb.state == THUMB_STATE_FINGER)) {
tp_gesture_cancel(tp, time);
if (tp->gesture.state != GESTURE_STATE_POINTER_MOTION) {
tp_gesture_cancel(tp, time);
tp->gesture.state = GESTURE_STATE_POINTER_MOTION;
}
tp->gesture.finger_count = 1;
tp->gesture.finger_count_pending = 0;
}
@ -835,17 +860,8 @@ tp_gesture_post_events(struct tp_dispatch *tp, uint64_t time)
tp_gesture_thumb_moved(tp))
tp_thumb_reset(tp);
switch (tp->gesture.finger_count) {
case 1:
if (tp->queued & TOUCHPAD_EVENT_MOTION)
tp_gesture_post_pointer_motion(tp, time);
break;
case 2:
case 3:
case 4:
if (tp->gesture.finger_count <= 4)
tp_gesture_post_gesture(tp, time);
break;
}
}
void
@ -891,6 +907,8 @@ tp_gesture_end(struct tp_dispatch *tp, uint64_t time, bool cancelled)
tp->gesture.finger_count,
cancelled);
break;
case GESTURE_STATE_POINTER_MOTION:
break;
}
tp->gesture.started = false;

1
src/evdev-mt-touchpad.h
View file

@ -157,6 +157,7 @@ enum tp_edge_scroll_touch_state {
enum tp_gesture_state {
GESTURE_STATE_NONE,
GESTURE_STATE_UNKNOWN,
GESTURE_STATE_POINTER_MOTION,
GESTURE_STATE_SCROLL,
GESTURE_STATE_PINCH,
GESTURE_STATE_SWIPE,