From e61561fd9c75588735cd5b1784bbc0e0479d5105 Mon Sep 17 00:00:00 2001 From: Matt Roper Date: Mon, 24 Jun 2013 16:52:43 +0100 Subject: [PATCH] toytoolkit: Allow operation without a keymap In preparation for upcoming changes, we want to make sure that apps written with the toy toolkit continue to operate properly if no XKB keymap is received. If there's no XKB keymap, then we shouldn't try to figure out keyboard modifier states (since we probably don't even have equivalents of PC-style modifiers). Reviewed-by: Singh, Satyeshwar Reviewed-by: Bob Paauwe --- clients/window.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/clients/window.c b/clients/window.c index c13d207..c8e421b 100644 --- a/clients/window.c +++ b/clients/window.c @@ -3067,6 +3067,10 @@ keyboard_handle_modifiers(void *data, struct wl_keyboard *keyboard, struct input *input = data; xkb_mod_mask_t mask; + /* If we're not using a keymap, then we don't handle PC-style modifiers */ + if (!input->xkb.keymap) + return; + xkb_state_update_mask(input->xkb.state, mods_depressed, mods_latched, mods_locked, 0, 0, group); mask = xkb_state_serialize_mods(input->xkb.state, -- 2.7.4