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

evdev: Flush motion events when the slot changes, not just after sync

Browse source 
If two fingers are released almost simultaneously then evdev can send
the touch up events in one bunch without sending a sync event
in-between. However, the evdev_device struct only keeps track of one
pending touch up event so in this case the second touch up event would
override the first and it would be lost. This patch changes it to also
flush the events whenever the slot changes so that it will flush the
previous touch up event before trying to queue the next one.

https://bugs.freedesktop.org/show_bug.cgi?id=67563
This commit is contained in:
Neil Roberts 2013-09-20 15:03:29 +01:00 • committed by Jonas Ådahl
parent 6f96846e0a
commit b3023f5d0a
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/evdev-touchpad.c
View file

@ -493,7 +493,7 @@ touchpad_update_state(struct touchpad_dispatch *touchpad, uint32_t time)
touchpad->device->rel.dx = wl_fixed_from_double(dx);
touchpad->device->rel.dy = wl_fixed_from_double(dy);
touchpad->device->pending_events |=
EVDEV_RELATIVE_MOTION | EVDEV_SYN;
EVDEV_RELATIVE_MOTION | EVDEV_SYN_OR_SLOT;
} else if (touchpad->finger_state == TOUCHPAD_FINGERS_TWO) {
if (dx != 0.0)
notify_axis(touchpad->device->seat,

7
src/evdev.c
View file

@ -110,6 +110,7 @@ evdev_process_touch(struct evdev_device *device, struct input_event *e)
switch (e->code) {
case ABS_MT_SLOT:
device->mt.slot = e->value;
device->pending_events |= EVDEV_SYN_OR_SLOT;
break;
case ABS_MT_TRACKING_ID:
if (e->value >= 0)
@ -261,11 +262,11 @@ evdev_flush_motion(struct evdev_device *device, uint32_t time)
int32_t cx, cy;
int slot;
if (!(device->pending_events & EVDEV_SYN))
if (!(device->pending_events & EVDEV_SYN_OR_SLOT))
return;
slot = device->mt.slot;
device->pending_events &= ~EVDEV_SYN;
device->pending_events &= ~EVDEV_SYN_OR_SLOT;
if (device->pending_events & EVDEV_RELATIVE_MOTION) {
notify_motion(master, time, device->rel.dx, device->rel.dy);
device->pending_events &= ~EVDEV_RELATIVE_MOTION;
@ -332,7 +333,7 @@ fallback_process(struct evdev_dispatch *dispatch,
evdev_process_key(device, event, time);
break;
case EV_SYN:
device->pending_events |= EVDEV_SYN;
device->pending_events |= EVDEV_SYN_OR_SLOT;
break;
}
}

2
src/evdev.h
View file

@ -36,7 +36,7 @@ enum evdev_event_type {
EVDEV_ABSOLUTE_MT_MOTION = (1 << 2),
EVDEV_ABSOLUTE_MT_UP = (1 << 3),
EVDEV_RELATIVE_MOTION = (1 << 4),
EVDEV_SYN = (1 << 5),
EVDEV_SYN_OR_SLOT = (1 << 5),
};
enum evdev_device_capability {