isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 00:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

evdev: don't update xkb state for autorepeated keys

Browse Source 
xkb_state_update_key() needs to be called only on state transitions,
otherwise the state tracking gets confused and locks certain modifiers
forever.

https://bugzilla.gnome.org/show_bug.cgi?id=705710
This commit is contained in:
Giovanni Campagna 2013-08-09 17:07:52 +02:00
parent 8c358f18b1
commit 7b780b0c38
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clutter/evdev/clutter-device-manager-evdev.c
View File

@ -58,6 +58,8 @@
#define FIRST_SLAVE_ID 4 #define FIRST_SLAVE_ID 4
#define INVALID_SLAVE_ID 255 #define INVALID_SLAVE_ID 255
#define AUTOREPEAT_VALUE 2
struct _ClutterDeviceManagerEvdevPrivate struct _ClutterDeviceManagerEvdevPrivate
{ {
GUdevClient *udev_client; GUdevClient *udev_client;
@ -210,12 +212,18 @@ notify_key (ClutterEventSource *source,
manager_evdev->priv->xkb, manager_evdev->priv->xkb,
manager_evdev->priv->button_state, manager_evdev->priv->button_state,
time_, key, state); time_, key, state);
xkb_state_update_key (manager_evdev->priv->xkb, event->key.hardware_keycode, state ? XKB_KEY_DOWN : XKB_KEY_UP);
if (state) /* We must be careful and not pass multiple releases to xkb, otherwise it gets
add_key (manager_evdev->priv->keys, event->key.hardware_keycode); confused and locks the modifiers */
else if (state != AUTOREPEAT_VALUE)
remove_key (manager_evdev->priv->keys, event->key.hardware_keycode); {
xkb_state_update_key (manager_evdev->priv->xkb, event->key.hardware_keycode, state ? XKB_KEY_DOWN : XKB_KEY_UP);
if (state)
add_key (manager_evdev->priv->keys, event->key.hardware_keycode);
else
remove_key (manager_evdev->priv->keys, event->key.hardware_keycode);
}
queue_event (event); queue_event (event);
} }
@ -410,7 +418,7 @@ clutter_event_dispatch (GSource *g_source,
/* don't repeat mouse buttons */ /* don't repeat mouse buttons */
if (e->code >= BTN_MOUSE && e->code < KEY_OK) if (e->code >= BTN_MOUSE && e->code < KEY_OK)
if (e->value == 2) if (e->value == AUTOREPEAT_VALUE)
continue; continue;
switch (e->code) switch (e->code)