re-indent translate_keysyms()
This commit is contained in:
parent
7daac50807
commit
76202a824d
64
src/config.c
64
src/config.c
|
@ -82,40 +82,40 @@ 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) {
|
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);
|
xcb_keysym_t 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;
|
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue