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

touchpad: disable trackpoint palm detection on small touchpads

Browse source 
Tested on three laptops here, Lenovo T61, X220 and an HP EliteBook (?), all
with small touchpads. It's hard to have a hand position where the palm touches
the touchpad while using the trackpoint. So we might as well save us the
effort of monitoring events and enabling/disabling it on demand.

As a side-effect this fixes 1233844, but that's more a coincidence.
https://bugzilla.redhat.com/show_bug.cgi?id=1233844

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Peter Hutterer 2015-06-24 11:41:47 +10:00
parent eb4bd799de
commit f0c8286ae8
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -520,6 +520,9 @@ tp_palm_detect_trackpoint(struct tp_dispatch *tp,
struct tp_touch *t, struct tp_touch *t,
uint64_t time) uint64_t time)
{ {
if (!tp->palm.monitor_trackpoint)
return 0;
if (t->palm.state == PALM_NONE && if (t->palm.state == PALM_NONE &&
t->state == TOUCH_BEGIN && t->state == TOUCH_BEGIN &&
tp->palm.trackpoint_active) { tp->palm.trackpoint_active) {
@ -844,7 +847,8 @@ tp_remove_sendevents(struct tp_dispatch *tp)
libinput_timer_cancel(&tp->palm.trackpoint_timer); libinput_timer_cancel(&tp->palm.trackpoint_timer);
libinput_timer_cancel(&tp->dwt.keyboard_timer); libinput_timer_cancel(&tp->dwt.keyboard_timer);
if (tp->buttons.trackpoint) if (tp->buttons.trackpoint &&
tp->palm.monitor_trackpoint)
libinput_device_remove_event_listener( libinput_device_remove_event_listener(
&tp->palm.trackpoint_listener); &tp->palm.trackpoint_listener);
@ -1109,9 +1113,10 @@ tp_interface_device_added(struct evdev_device *device,
/* Don't send any pending releases to the new trackpoint */ /* Don't send any pending releases to the new trackpoint */
tp->buttons.active_is_topbutton = false; tp->buttons.active_is_topbutton = false;
tp->buttons.trackpoint = added_device; tp->buttons.trackpoint = added_device;
libinput_device_add_event_listener(&added_device->base, if (tp->palm.monitor_trackpoint)
&tp->palm.trackpoint_listener, libinput_device_add_event_listener(&added_device->base,
tp_trackpoint_event, tp); &tp->palm.trackpoint_listener,
tp_trackpoint_event, tp);
} }
if (added_device->tags & EVDEV_TAG_KEYBOARD && if (added_device->tags & EVDEV_TAG_KEYBOARD &&
@ -1150,8 +1155,9 @@ tp_interface_device_removed(struct evdev_device *device,
tp->buttons.active = 0; tp->buttons.active = 0;
tp->buttons.active_is_topbutton = false; tp->buttons.active_is_topbutton = false;
} }
libinput_device_remove_event_listener( if (tp->palm.monitor_trackpoint)
&tp->palm.trackpoint_listener); libinput_device_remove_event_listener(
&tp->palm.trackpoint_listener);
tp->buttons.trackpoint = NULL; tp->buttons.trackpoint = NULL;
} }
@ -1455,6 +1461,8 @@ tp_init_palmdetect(struct tp_dispatch *tp,
tp->palm.left_edge = device->abs.absinfo_x->minimum + width * 0.05; tp->palm.left_edge = device->abs.absinfo_x->minimum + width * 0.05;
tp->palm.vert_center = device->abs.absinfo_y->minimum + height/2; tp->palm.vert_center = device->abs.absinfo_y->minimum + height/2;
tp->palm.monitor_trackpoint = true;
return 0; return 0;
} }

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

@ -283,6 +283,7 @@ struct tp_dispatch {
struct libinput_event_listener trackpoint_listener; struct libinput_event_listener trackpoint_listener;
struct libinput_timer trackpoint_timer; struct libinput_timer trackpoint_timer;
uint64_t trackpoint_last_event_time; uint64_t trackpoint_last_event_time;
bool monitor_trackpoint;
} palm; } palm;
struct { struct {