fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-28 08:30:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

touchpad: add support for clickfingers

Browse source 
On touchpads without physical buttons, the number of fingers on the touchpad
at the time the physical click happens decides the button type. 1/2/3 fingers
is handled left/right/middle.

We also swallow the motion event on the actual click event, this reduces
erroneous motion events by a bit. More processing is needed here though.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2014-02-17 11:14:29 +10:00
parent 4e8f1259cc
commit 05f82c573f
3 changed files with 61 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/evdev-mt-touchpad.c
View file

@ -461,14 +461,42 @@ tp_post_scroll_events(struct tp_dispatch *tp, uint32_t time)
return 0;
}
static void
tp_post_button_events(struct tp_dispatch *tp, uint32_t time)
static int
tp_post_clickfinger_buttons(struct tp_dispatch *tp, uint32_t time)
{
uint32_t current, old, button;
enum libinput_pointer_button_state state;
if ((tp->queued &
(TOUCHPAD_EVENT_BUTTON_PRESS|TOUCHPAD_EVENT_BUTTON_RELEASE)) == 0)
return;
current = tp->buttons.state;
old = tp->buttons.old_state;
if (current == old)
return 0;
switch (tp->nfingers_down) {
case 1: button = BTN_LEFT; break;
case 2: button = BTN_RIGHT; break;
case 3: button = BTN_MIDDLE; break;
default:
return 0;
}
if (current)
state = LIBINPUT_POINTER_BUTTON_STATE_PRESSED;
else
state = LIBINPUT_POINTER_BUTTON_STATE_RELEASED;
pointer_notify_button(&tp->device->base,
time,
button,
state);
return 1;
}
static int
tp_post_physical_buttons(struct tp_dispatch *tp, uint32_t time)
{
uint32_t current, old, button;
current = tp->buttons.state;
old = tp->buttons.old_state;
@ -493,6 +521,25 @@ tp_post_button_events(struct tp_dispatch *tp, uint32_t time)
current >>= 1;
old >>= 1;
}
return 0;
}
static int
tp_post_button_events(struct tp_dispatch *tp, uint32_t time)
{
int rc;
if ((tp->queued &
(TOUCHPAD_EVENT_BUTTON_PRESS|TOUCHPAD_EVENT_BUTTON_RELEASE)) == 0)
return 0;
if (tp->buttons.has_buttons)
rc = tp_post_physical_buttons(tp, time);
else
rc = tp_post_clickfinger_buttons(tp, time);
return rc;
}
static void
@ -501,6 +548,9 @@ tp_post_events(struct tp_dispatch *tp, uint32_t time)
struct tp_touch *t = tp_current_touch(tp);
double dx, dy;
if (tp_post_button_events(tp, time) != 0)
return;
if (tp_tap_handle_state(tp, time) != 0)
return;
@ -519,8 +569,6 @@ tp_post_events(struct tp_dispatch *tp, uint32_t time)
li_fixed_from_double(dx),
li_fixed_from_double(dy));
}
tp_post_button_events(tp, time);
}
static void
@ -639,6 +687,10 @@ tp_init(struct tp_dispatch *tp,
tp->hysteresis.margin_y =
diagonal / DEFAULT_HYSTERESIS_MARGIN_DENOMINATOR;
if (libevdev_has_event_code(device->evdev, EV_KEY, BTN_RIGHT) ||
libevdev_has_event_code(device->evdev, EV_KEY, BTN_RIGHT))
tp->buttons.has_buttons = true;
if (tp_init_scroll(tp) != 0)
return -1;

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

@ -117,6 +117,7 @@ struct tp_dispatch {
} accel;
struct {
bool has_buttons; /* true for physical LMR buttons */
uint32_t state;
uint32_t old_state;
} buttons; /* physical buttons */

2
test/pointer.c
View file

@ -186,7 +186,7 @@ END_TEST
int main (int argc, char **argv) {
litest_add("pointer:motion", pointer_motion_relative, LITEST_POINTER, LITEST_ANY);
litest_add("pointer:button", pointer_button, LITEST_BUTTON, LITEST_ANY);
litest_add("pointer:button", pointer_button, LITEST_BUTTON, LITEST_CLICKPAD);
litest_add("pointer:scroll", pointer_scroll_wheel, LITEST_WHEEL, LITEST_ANY);
return litest_run(argc, argv);