nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix-bindsym'

This commit is contained in:
Michael Stapelberg 2011-12-17 22:34:55 +00:00
parent 7daac50807 7a80d903a5
commit 386477b789
1 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/config.c
View File

@ -82,40 +82,48 @@ Binding *get_binding(uint16_t modifiers, xcb_keycode_t keycode) {
* *
*/ */
void translate_keysyms() { void translate_keysyms() {
Binding *bind; Binding *bind;
TAILQ_FOREACH(bind, bindings, bindings) { xcb_keysym_t keysym;
if (bind->keycode > 0) int col;
continue; xcb_keycode_t i,
min_keycode = xcb_get_setup(conn)->min_keycode,
max_keycode = xcb_get_setup(conn)->max_keycode;
/* We need to translate the symbol to a keycode */ TAILQ_FOREACH(bind, bindings, bindings) {
xcb_keysym_t keysym = XStringToKeysym(bind->symbol); if (bind->keycode > 0)
if (keysym == NoSymbol) { continue;
ELOG("Could not translate string to key symbol: \"%s\"\n", bind->symbol);
continue;
}
uint32_t last_keycode = 0; /* We need to translate the symbol to a keycode */
xcb_keycode_t *keycodes = xcb_key_symbols_get_keycode(keysyms, keysym); keysym = XStringToKeysym(bind->symbol);
if (keycodes == NULL) { if (keysym == NoSymbol) {
DLOG("Could not translate symbol \"%s\"\n", bind->symbol); ELOG("Could not translate string to key symbol: \"%s\"\n",
continue; 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);
} }
/* 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 (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;
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);
}
} }
/* /*