From 76202a824da458109148c58d71ca7e9d3cc5401d Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 17 Dec 2011 22:28:28 +0000 Subject: [PATCH 1/2] re-indent translate_keysyms() --- src/config.c | 64 ++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/config.c b/src/config.c index 8efb491e..f604a30c 100644 --- a/src/config.c +++ b/src/config.c @@ -82,40 +82,40 @@ Binding *get_binding(uint16_t modifiers, xcb_keycode_t keycode) { * */ void translate_keysyms() { - Binding *bind; - TAILQ_FOREACH(bind, bindings, bindings) { - if (bind->keycode > 0) - continue; + Binding *bind; + TAILQ_FOREACH(bind, bindings, bindings) { + if (bind->keycode > 0) + continue; - /* We need to translate the symbol to a keycode */ - xcb_keysym_t keysym = XStringToKeysym(bind->symbol); - if (keysym == NoSymbol) { - ELOG("Could not translate string to key symbol: \"%s\"\n", bind->symbol); - continue; - } - - uint32_t last_keycode = 0; - xcb_keycode_t *keycodes = xcb_key_symbols_get_keycode(keysyms, keysym); - if (keycodes == NULL) { - DLOG("Could not translate symbol \"%s\"\n", bind->symbol); - continue; - } - - bind->number_keycodes = 0; - - for (xcb_keycode_t *walk = keycodes; *walk != 0; walk++) { - /* We hope duplicate keycodes will be returned in order - * and skip them */ - if (last_keycode == *walk) - continue; - last_keycode = *walk; - bind->number_keycodes++; - } - DLOG("Translated symbol \"%s\" to %d keycode\n", bind->symbol, bind->number_keycodes); - bind->translated_to = smalloc(bind->number_keycodes * sizeof(xcb_keycode_t)); - memcpy(bind->translated_to, keycodes, bind->number_keycodes * sizeof(xcb_keycode_t)); - free(keycodes); + /* We need to translate the symbol to a keycode */ + xcb_keysym_t keysym = XStringToKeysym(bind->symbol); + if (keysym == NoSymbol) { + ELOG("Could not translate string to key symbol: \"%s\"\n", bind->symbol); + continue; } + + uint32_t last_keycode = 0; + xcb_keycode_t *keycodes = xcb_key_symbols_get_keycode(keysyms, keysym); + if (keycodes == NULL) { + DLOG("Could not translate symbol \"%s\"\n", bind->symbol); + continue; + } + + bind->number_keycodes = 0; + + for (xcb_keycode_t *walk = keycodes; *walk != 0; walk++) { + /* We hope duplicate keycodes will be returned in order + * and skip them */ + if (last_keycode == *walk) + continue; + last_keycode = *walk; + bind->number_keycodes++; + } + DLOG("Translated symbol \"%s\" to %d keycode\n", bind->symbol, bind->number_keycodes); + bind->translated_to = smalloc(bind->number_keycodes * sizeof(xcb_keycode_t)); + memcpy(bind->translated_to, keycodes, bind->number_keycodes * sizeof(xcb_keycode_t)); + free(keycodes); + } } /* From 7a80d903a565e0fb6565147f452cd11d01b2d727 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 17 Dec 2011 22:31:21 +0000 Subject: [PATCH 2/2] keygrabbing: only look in the appropriate columns when resolving keysyms Fixes: #585 This commit fixes the problem of i3 wrongly grabbing/interpreting (!) some key bindings. Basically, when you have, say, "bindsym Mod1+4 workspace 4", but you also have "bindsym Mod1+semicolon focus right" (both are default), and your keyboard layout has semicolon on Mode_switch + 4, the "workspace 4" keybinding was shadowed by the "focus right" keybinding, because that also resolves to semicolon. So, from now on, i3 will only consider column 0 and 1 for normal bindings and column 2 and 3 for bindings using Mode_switch (columns as seen in xmodmap -pke). --- src/config.c | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/src/config.c b/src/config.c index f604a30c..7fc15c0d 100644 --- a/src/config.c +++ b/src/config.c @@ -83,38 +83,46 @@ Binding *get_binding(uint16_t modifiers, xcb_keycode_t keycode) { */ void translate_keysyms() { Binding *bind; + xcb_keysym_t keysym; + int col; + xcb_keycode_t i, + min_keycode = xcb_get_setup(conn)->min_keycode, + max_keycode = xcb_get_setup(conn)->max_keycode; + TAILQ_FOREACH(bind, bindings, bindings) { if (bind->keycode > 0) continue; /* We need to translate the symbol to a keycode */ - xcb_keysym_t keysym = XStringToKeysym(bind->symbol); + keysym = XStringToKeysym(bind->symbol); if (keysym == NoSymbol) { - ELOG("Could not translate string to key symbol: \"%s\"\n", bind->symbol); + ELOG("Could not translate string to key symbol: \"%s\"\n", + bind->symbol); continue; } - uint32_t last_keycode = 0; - xcb_keycode_t *keycodes = xcb_key_symbols_get_keycode(keysyms, keysym); - if (keycodes == NULL) { - DLOG("Could not translate symbol \"%s\"\n", bind->symbol); - continue; - } + /* Base column we use for looking up key symbols. We always consider + * the base column and the corresponding shift column, so without + * mode_switch, we look in 0 and 1, with mode_switch we look in 2 and + * 3. */ + col = (bind->mods & BIND_MODE_SWITCH ? 2 : 0); + FREE(bind->translated_to); bind->number_keycodes = 0; - for (xcb_keycode_t *walk = keycodes; *walk != 0; walk++) { - /* We hope duplicate keycodes will be returned in order - * and skip them */ - if (last_keycode == *walk) + for (i = min_keycode; i && i <= max_keycode; i++) { + if ((xcb_key_symbols_get_keysym(keysyms, i, col) != keysym) && + (xcb_key_symbols_get_keysym(keysyms, i, col+1) != keysym)) continue; - last_keycode = *walk; bind->number_keycodes++; + bind->translated_to = srealloc(bind->translated_to, + (sizeof(xcb_keycode_t) * + bind->number_keycodes)); + bind->translated_to[bind->number_keycodes-1] = i; } - DLOG("Translated symbol \"%s\" to %d keycode\n", bind->symbol, bind->number_keycodes); - bind->translated_to = smalloc(bind->number_keycodes * sizeof(xcb_keycode_t)); - memcpy(bind->translated_to, keycodes, bind->number_keycodes * sizeof(xcb_keycode_t)); - free(keycodes); + + DLOG("Translated symbol \"%s\" to %d keycode\n", bind->symbol, + bind->number_keycodes); } }