aboutsummaryrefslogtreecommitdiff
path: root/sway/commands
diff options
context:
space:
mode:
authorKonstantin Pospelov <kupospelov@gmail.com>2019-02-19 16:35:35 +0300
committerSimon Ser <contact@emersion.fr>2019-04-26 20:56:48 +0300
commitf1609abe4c20a04b0b57f797b0e864b29840eda8 (patch)
treebe675820914ecad26516e7deb49d7bea9dc79d89 /sway/commands
parenta09c144b8b5f9d0518e7239a27e2fb86e00644b3 (diff)
downloadsway-f1609abe4c20a04b0b57f797b0e864b29840eda8.tar.xz
config: simplify keysym translation fields
Do not store `xkb_keymap` since it can be retrieved from `xkb_state`.
Diffstat (limited to 'sway/commands')
-rw-r--r--sway/commands/bind.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sway/commands/bind.c b/sway/commands/bind.c
index e5fd4433..ea8179bb 100644
--- a/sway/commands/bind.c
+++ b/sway/commands/bind.c
@@ -604,7 +604,7 @@ struct keycode_matches {
static void find_keycode(struct xkb_keymap *keymap,
xkb_keycode_t keycode, void *data) {
xkb_keysym_t keysym = xkb_state_key_get_one_sym(
- config->keysym_translation.xkb_state, keycode);
+ config->keysym_translation_state, keycode);
if (keysym == XKB_KEY_NoSymbol) {
return;
@@ -627,7 +627,8 @@ static struct keycode_matches get_keycode_for_keysym(xkb_keysym_t keysym) {
.count = 0,
};
- xkb_keymap_key_for_each(config->keysym_translation.xkb_keymap,
+ xkb_keymap_key_for_each(
+ xkb_state_get_keymap(config->keysym_translation_state),
find_keycode, &matches);
return matches;
}