applications/i3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

keygrabbing: only look in the appropriate columns when resolving keysyms

Browse Source 
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).
This commit is contained in:
Michael Stapelberg 2011-12-17 22:31:21 +00:00
parent 76202a824d
commit 7a80d903a5
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/config.c
View File

@ -83,38 +83,46 @@ Binding *get_binding(uint16_t modifiers, xcb_keycode_t keycode) {
*/ */
void translate_keysyms() { void translate_keysyms() {
Binding *bind; 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) { TAILQ_FOREACH(bind, bindings, bindings) {
if (bind->keycode > 0) if (bind->keycode > 0)
continue; continue;
/* We need to translate the symbol to a keycode */ /* We need to translate the symbol to a keycode */
xcb_keysym_t keysym = XStringToKeysym(bind->symbol); keysym = XStringToKeysym(bind->symbol);
if (keysym == NoSymbol) { 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; continue;
} }
uint32_t last_keycode = 0; /* Base column we use for looking up key symbols. We always consider
xcb_keycode_t *keycodes = xcb_key_symbols_get_keycode(keysyms, keysym); * the base column and the corresponding shift column, so without
if (keycodes == NULL) { * mode_switch, we look in 0 and 1, with mode_switch we look in 2 and
DLOG("Could not translate symbol \"%s\"\n", bind->symbol); * 3. */
continue; col = (bind->mods & BIND_MODE_SWITCH ? 2 : 0);
}
FREE(bind->translated_to);
bind->number_keycodes = 0; bind->number_keycodes = 0;
for (xcb_keycode_t *walk = keycodes; *walk != 0; walk++) { for (i = min_keycode; i && i <= max_keycode; i++) {
/* We hope duplicate keycodes will be returned in order if ((xcb_key_symbols_get_keysym(keysyms, i, col) != keysym) &&
* and skip them */ (xcb_key_symbols_get_keysym(keysyms, i, col+1) != keysym))
if (last_keycode == *walk)
continue; continue;
last_keycode = *walk;
bind->number_keycodes++; 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)); DLOG("Translated symbol \"%s\" to %d keycode\n", bind->symbol,
memcpy(bind->translated_to, keycodes, bind->number_keycodes * sizeof(xcb_keycode_t)); bind->number_keycodes);
free(keycodes);
} }
} }