summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Ådahl <jadahl@gmail.com>2015-01-30 12:23:00 +0800
committerBryce Harrington <bryce@osg.samsung.com>2015-02-04 19:39:32 -0800
commit90d1ac8d491e97b0244aa19ba6fe0d2ac934b720 (patch)
tree87105d0385ca5a60b48581762e61f6014aa9d71e
parente90b9e9b5958d3e613d7e08f58321fc664084dde (diff)
downloadweston-90d1ac8d491e97b0244aa19ba6fe0d2ac934b720.tar.gz
libinput: Only forward first and last press and release for a key
Keyboard key events will be received from a device where a key has been pressed, even though an equivalent key has been pressed (same key code) on a device connected to the same seat. notify_key() expects to only be called as if there was only one keyboard device associated with the given seat, so to achieve this, ignore every event where forwarding it would result in multiple 'pressed' or 'released' notifications. Signed-off-by: Jonas Ådahl <jadahl@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniels@collabora.com> Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
-rw-r--r--src/libinput-device.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/libinput-device.c b/src/libinput-device.c
index 5c5b9b90..567e5ea9 100644
--- a/src/libinput-device.c
+++ b/src/libinput-device.c
@@ -59,6 +59,17 @@ handle_keyboard_key(struct libinput_device *libinput_device,
{
struct evdev_device *device =
libinput_device_get_user_data(libinput_device);
+ int key_state =
+ libinput_event_keyboard_get_key_state(keyboard_event);
+ int seat_key_count =
+ libinput_event_keyboard_get_seat_key_count(keyboard_event);
+
+ /* Ignore key events that are not seat wide state changes. */
+ if ((key_state == LIBINPUT_KEY_STATE_PRESSED &&
+ seat_key_count != 1) ||
+ (key_state == LIBINPUT_KEY_STATE_RELEASED &&
+ seat_key_count != 0))
+ return;
notify_key(device->seat,
libinput_event_keyboard_get_time(keyboard_event),