keyboard: generalize keymap data

Add a keymap_format field and rename keymap_string to keymap_data.
This commit is contained in:
Simon Ser 2021-08-07 14:04:24 +02:00
parent 5ba6cf517b
commit 0f2b95af26
4 changed files with 23 additions and 14 deletions

View file

@ -357,7 +357,13 @@ static void seat_client_send_keymap(struct wlr_seat_client *client,
continue;
}
wl_keyboard_send_keymap(resource, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
enum wl_keyboard_keymap_format format = WL_KEYBOARD_KEYMAP_FORMAT_NO_KEYMAP;
if (keyboard->keymap != NULL) {
assert(keyboard->keymap_format == XKB_KEYMAP_FORMAT_TEXT_V1);
format = WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1;
}
wl_keyboard_send_keymap(resource, format,
keyboard->keymap_fd, keyboard->keymap_size);
}
}