- 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;