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

fallback: send key events out immediately upon receiving them

Browse source 
Commit db3b6fe5f7 "fallback: change to handle the state at EV_SYN time"
introduced regressions for two types of event sequences.

One is a kernel bug - some devices/drivers like the asus-wireless send a key
press + release within the same event frame which now cancels out and
disappears into the ether. This should be fixed in the kernel drivers but
there appear to be enough of them that we can't just pretend it's an outlier.

The second issue is a libinput bug. If we get two key events in the same frame
(e.g. shift + A) we update the state correctly but the events are sent in the
order of the event codes. KEY_A sorts before KEY_LEFTSHIFT and our shift + A
becomes A + shift.

Fix this by treating key events as before db3b6fe5f7 - by sending them out
as we get them.

https://bugs.freedesktop.org/show_bug.cgi?id=104030

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2017-12-08 09:41:07 +10:00
parent 8adfac3975
commit 1c8636923b
2 changed files with 73 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/evdev-fallback.c
View file

@ -501,6 +501,22 @@ fallback_process_key(struct fallback_dispatch *dispatch,
}
hw_set_key_down(dispatch, e->code, e->value);
switch (type) {
case KEY_TYPE_NONE:
break;
case KEY_TYPE_KEY:
fallback_keyboard_notify_key(
dispatch,
device,
time,
e->code,
e->value ? LIBINPUT_KEY_STATE_PRESSED :
LIBINPUT_KEY_STATE_RELEASED);
break;
case KEY_TYPE_BUTTON:
break;
}
}
static void
@ -834,27 +850,10 @@ fallback_handle_state(struct fallback_dispatch *dispatch,
if (dispatch->pending_event & EVDEV_KEY) {
bool want_debounce = false;
for (unsigned int code = 0; code <= KEY_MAX; code++) {
bool new_state;
if (!hw_key_has_changed(dispatch, code))
continue;
new_state = hw_is_key_down(dispatch, code);
switch (get_key_type(code)) {
case KEY_TYPE_NONE:
break;
case KEY_TYPE_KEY:
fallback_keyboard_notify_key(
dispatch,
device,
time,
code,
new_state ?
LIBINPUT_KEY_STATE_PRESSED :
LIBINPUT_KEY_STATE_RELEASED);
break;
case KEY_TYPE_BUTTON:
if (get_key_type(code) == KEY_TYPE_BUTTON) {
want_debounce = true;
break;
}

56
test/test-keyboard.c
View file

@ -365,6 +365,61 @@ START_TEST(keyboard_no_buttons)
}
END_TEST
START_TEST(keyboard_frame_order)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
if (!libevdev_has_event_code(dev->evdev, EV_KEY, KEY_A) ||
!libevdev_has_event_code(dev->evdev, EV_KEY, KEY_LEFTSHIFT))
return;
litest_drain_events(li);
litest_event(dev, EV_KEY, KEY_LEFTSHIFT, 1);
litest_event(dev, EV_KEY, KEY_A, 1);
litest_event(dev, EV_SYN, SYN_REPORT, 0);
libinput_dispatch(li);
litest_assert_key_event(li,
KEY_LEFTSHIFT,
LIBINPUT_KEY_STATE_PRESSED);
litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_PRESSED);
litest_event(dev, EV_KEY, KEY_LEFTSHIFT, 0);
litest_event(dev, EV_KEY, KEY_A, 0);
litest_event(dev, EV_SYN, SYN_REPORT, 0);
libinput_dispatch(li);
litest_assert_key_event(li,
KEY_LEFTSHIFT,
LIBINPUT_KEY_STATE_RELEASED);
litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_RELEASED);
litest_event(dev, EV_KEY, KEY_A, 1);
litest_event(dev, EV_KEY, KEY_LEFTSHIFT, 1);
litest_event(dev, EV_SYN, SYN_REPORT, 0);
libinput_dispatch(li);
litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_PRESSED);
litest_assert_key_event(li,
KEY_LEFTSHIFT,
LIBINPUT_KEY_STATE_PRESSED);
litest_event(dev, EV_KEY, KEY_A, 0);
litest_event(dev, EV_KEY, KEY_LEFTSHIFT, 0);
litest_event(dev, EV_SYN, SYN_REPORT, 0);
libinput_dispatch(li);
litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_RELEASED);
litest_assert_key_event(li,
KEY_LEFTSHIFT,
LIBINPUT_KEY_STATE_RELEASED);
libinput_dispatch(li);
}
END_TEST
START_TEST(keyboard_leds)
{
struct litest_device *dev = litest_current_device();
@ -432,6 +487,7 @@ litest_setup_tests_keyboard(void)
litest_add("keyboard:time", keyboard_time_usec, LITEST_KEYS, LITEST_ANY);
litest_add("keyboard:events", keyboard_no_buttons, LITEST_KEYS, LITEST_ANY);
litest_add("keyboard:events", keyboard_frame_order, LITEST_KEYS, LITEST_ANY);
litest_add("keyboard:leds", keyboard_leds, LITEST_ANY, LITEST_ANY);