mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-20 05:33:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: keyboard: keymap: use xkb_keymap_new_from_buffer()

Browse source
This commit is contained in:
Daniel Eklöf 2020-07-14 08:52:42 +02:00
parent 307eead987
commit 0ed02e9676
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
input.c
View file

@ -215,6 +215,8 @@ keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard,
return; return;
} }
while (map_str[size - 1] == '\0')
size--;
if (seat->kbd.xkb_compose_state != NULL) { if (seat->kbd.xkb_compose_state != NULL) {
xkb_compose_state_unref(seat->kbd.xkb_compose_state); xkb_compose_state_unref(seat->kbd.xkb_compose_state);
@ -246,8 +248,8 @@ keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard,
tll_free(seat->kbd.bindings.search); tll_free(seat->kbd.bindings.search);
seat->kbd.xkb = xkb_context_new(XKB_CONTEXT_NO_FLAGS); seat->kbd.xkb = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
seat->kbd.xkb_keymap = xkb_keymap_new_from_string( seat->kbd.xkb_keymap = xkb_keymap_new_from_buffer(
seat->kbd.xkb, map_str, XKB_KEYMAP_FORMAT_TEXT_V1, seat->kbd.xkb, map_str, size, XKB_KEYMAP_FORMAT_TEXT_V1,
XKB_KEYMAP_COMPILE_NO_FLAGS); XKB_KEYMAP_COMPILE_NO_FLAGS);
/* TODO: initialize in enter? */ /* TODO: initialize in enter? */