mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window: Update modifier state directly after receiving a modifier event

Browse Source 
If the keyboard modifier event was received after the key event the
modifier state would end up incorrect.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
This commit is contained in:
Jonas Ådahl
2012-09-27 18:40:45 +02:00
committed by Kristian Høgsberg
parent d9f5819e8f
commit d9f6b078b6
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/window.c
+11 -12
View File
@@ -2284,7 +2284,6 @@ keyboard_handle_key(void *data, struct wl_keyboard *keyboard,
enum wl_keyboard_key_state state = state_w; enum wl_keyboard_key_state state = state_w;
const xkb_keysym_t *syms; const xkb_keysym_t *syms;
xkb_keysym_t sym; xkb_keysym_t sym;
xkb_mod_mask_t mask;
struct itimerspec its; struct itimerspec its;
input->display->serial = serial; input->display->serial = serial;
@@ -2294,17 +2293,6 @@ keyboard_handle_key(void *data, struct wl_keyboard *keyboard,
num_syms = xkb_key_get_syms(input->xkb.state, code, &syms); num_syms = xkb_key_get_syms(input->xkb.state, code, &syms);
mask = xkb_state_serialize_mods(input->xkb.state,
XKB_STATE_DEPRESSED |
XKB_STATE_LATCHED);
input->modifiers = 0;
if (mask & input->xkb.control_mask)
input->modifiers |= MOD_CONTROL_MASK;
if (mask & input->xkb.alt_mask)
input->modifiers |= MOD_ALT_MASK;
if (mask & input->xkb.shift_mask)
input->modifiers |= MOD_SHIFT_MASK;
sym = XKB_KEY_NoSymbol; sym = XKB_KEY_NoSymbol;
if (num_syms == 1) if (num_syms == 1)
sym = syms[0]; sym = syms[0];
@@ -2356,9 +2344,20 @@ keyboard_handle_modifiers(void *data, struct wl_keyboard *keyboard,
uint32_t group) uint32_t group)
{ {
struct input *input = data; struct input *input = data;
xkb_mod_mask_t mask;
xkb_state_update_mask(input->xkb.state, mods_depressed, mods_latched, xkb_state_update_mask(input->xkb.state, mods_depressed, mods_latched,
mods_locked, 0, 0, group); mods_locked, 0, 0, group);
mask = xkb_state_serialize_mods(input->xkb.state,
XKB_STATE_DEPRESSED |
XKB_STATE_LATCHED);
input->modifiers = 0;
if (mask & input->xkb.control_mask)
input->modifiers |= MOD_CONTROL_MASK;
if (mask & input->xkb.alt_mask)
input->modifiers |= MOD_ALT_MASK;
if (mask & input->xkb.shift_mask)
input->modifiers |= MOD_SHIFT_MASK;
} }
static const struct wl_keyboard_listener keyboard_listener = { static const struct wl_keyboard_listener keyboard_listener = {