Replace deprecated xkbcommon symbols with current names
These symbols (xkb_map_* and others) were replaced in xkbcommon with more
consistent names. See the header xkbcommon/xkbcommon-compat.h for how
the old names map to the new.
The new names have been available since the first stable xkbcommon
release (0.2.0).
Signed-off-by: Ran Benita <ran234@gmail.com>
diff --git a/clients/weston-simple-im.c b/clients/weston-simple-im.c
index ded6a04..787782f 100644
--- a/clients/weston-simple-im.c
+++ b/clients/weston-simple-im.c
@@ -187,10 +187,10 @@
}
keyboard->keymap =
- xkb_map_new_from_string(keyboard->xkb_context,
- map_str,
- XKB_KEYMAP_FORMAT_TEXT_V1,
- 0);
+ xkb_keymap_new_from_string(keyboard->xkb_context,
+ map_str,
+ XKB_KEYMAP_FORMAT_TEXT_V1,
+ 0);
munmap(map_str, size);
close(fd);
@@ -203,16 +203,16 @@
keyboard->state = xkb_state_new(keyboard->keymap);
if (!keyboard->state) {
fprintf(stderr, "failed to create XKB state\n");
- xkb_map_unref(keyboard->keymap);
+ xkb_keymap_unref(keyboard->keymap);
return;
}
keyboard->control_mask =
- 1 << xkb_map_mod_get_index(keyboard->keymap, "Control");
+ 1 << xkb_keymap_mod_get_index(keyboard->keymap, "Control");
keyboard->alt_mask =
- 1 << xkb_map_mod_get_index(keyboard->keymap, "Mod1");
+ 1 << xkb_keymap_mod_get_index(keyboard->keymap, "Mod1");
keyboard->shift_mask =
- 1 << xkb_map_mod_get_index(keyboard->keymap, "Shift");
+ 1 << xkb_keymap_mod_get_index(keyboard->keymap, "Shift");
}
static void
@@ -234,7 +234,7 @@
return;
code = key + 8;
- num_syms = xkb_key_get_syms(keyboard->state, code, &syms);
+ num_syms = xkb_state_key_get_syms(keyboard->state, code, &syms);
sym = XKB_KEY_NoSymbol;
if (num_syms == 1)
@@ -261,8 +261,8 @@
xkb_state_update_mask(keyboard->state, mods_depressed,
mods_latched, mods_locked, 0, 0, group);
mask = xkb_state_serialize_mods(keyboard->state,
- XKB_STATE_DEPRESSED |
- XKB_STATE_LATCHED);
+ XKB_STATE_MODS_DEPRESSED |
+ XKB_STATE_MODS_LATCHED);
keyboard->modifiers = 0;
if (mask & keyboard->control_mask)