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

evdev: log a bug if releasing a key fails, but don't loop forever

Browse source 
If a physical button is down but releasing said button doesn't actually
release it, we loop endlessly. Detect that and log a bug instead.

Reproducible: trigger a tap-n-drag on a touchpad device, then remove it.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Peter Hutterer 2015-05-19 14:44:16 +10:00
parent b84c60737f
commit db567c01a4
1 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/evdev.c
View file

@ -2330,6 +2330,9 @@ release_pressed_keys(struct evdev_device *device)
for (code = 0; code < KEY_CNT; code++) { for (code = 0; code < KEY_CNT; code++) {
int count = get_key_down_count(device, code); int count = get_key_down_count(device, code);
if (count == 0)
continue;
if (count > 1) { if (count > 1) {
log_bug_libinput(libinput, log_bug_libinput(libinput,
"Key %d is down %d times.\n", "Key %d is down %d times.\n",
@ -2337,25 +2340,31 @@ release_pressed_keys(struct evdev_device *device)
count); count);
} }
while (get_key_down_count(device, code) > 0) { switch (get_key_type(code)) {
switch (get_key_type(code)) { case EVDEV_KEY_TYPE_NONE:
case EVDEV_KEY_TYPE_NONE: break;
break; case EVDEV_KEY_TYPE_KEY:
case EVDEV_KEY_TYPE_KEY: evdev_keyboard_notify_key(
evdev_keyboard_notify_key( device,
device, time,
time, code,
code, LIBINPUT_KEY_STATE_RELEASED);
LIBINPUT_KEY_STATE_RELEASED); break;
break; case EVDEV_KEY_TYPE_BUTTON:
case EVDEV_KEY_TYPE_BUTTON: evdev_pointer_notify_physical_button(
evdev_pointer_notify_physical_button( device,
device, time,
time, evdev_to_left_handed(device, code),
evdev_to_left_handed(device, code), LIBINPUT_BUTTON_STATE_RELEASED);
LIBINPUT_BUTTON_STATE_RELEASED); break;
break; }
}
count = get_key_down_count(device, code);
if (count != 0) {
log_bug_libinput(libinput,
"Releasing key %d failed.\n",
code);
break;
} }
} }
} }