mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-29 05:40:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

keyboard: generalize keymap data

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

3
include/wlr/types/wlr_keyboard.h
View file

@ -54,7 +54,8 @@ struct wlr_keyboard {
const struct wlr_keyboard_impl *impl; const struct wlr_keyboard_impl *impl;
struct wlr_keyboard_group *group; struct wlr_keyboard_group *group;
char *keymap_string; enum xkb_keymap_format keymap_format;
char *keymap_data;
size_t keymap_size; size_t keymap_size;
int keymap_fd; int keymap_fd;
struct xkb_keymap *keymap; struct xkb_keymap *keymap;

8
types/seat/wlr_seat_keyboard.c
View file

@ -357,7 +357,13 @@ static void seat_client_send_keymap(struct wlr_seat_client *client,
continue; 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); keyboard->keymap_fd, keyboard->keymap_size);
} }
} }

7
types/wlr_input_method_v2.c
View file

@ -335,7 +335,7 @@ static bool keyboard_grab_send_keymap(
return false; return false;
} }
memcpy(ptr, keyboard->keymap_string, keyboard->keymap_size); memcpy(ptr, keyboard->keymap_data, keyboard->keymap_size);
munmap(ptr, keyboard->keymap_size); munmap(ptr, keyboard->keymap_size);
zwp_input_method_keyboard_grab_v2_send_keymap(keyboard_grab->resource, zwp_input_method_keyboard_grab_v2_send_keymap(keyboard_grab->resource,
@ -389,8 +389,9 @@ void wlr_input_method_keyboard_grab_v2_set_keyboard(
if (keyboard) { if (keyboard) {
if (keyboard_grab->keyboard == NULL || if (keyboard_grab->keyboard == NULL ||
strcmp(keyboard_grab->keyboard->keymap_string, keyboard_grab->keyboard->keymap_size != keyboard->keymap_size ||
keyboard->keymap_string) != 0) { memcmp(keyboard_grab->keyboard->keymap_data,
keyboard->keymap_data, keyboard->keymap_size) != 0) {
// send keymap only if it is changed, or if input method is not // send keymap only if it is changed, or if input method is not
// aware that it did not change and blindly send it back with // aware that it did not change and blindly send it back with
// virtual keyboard, it may cause an infinite recursion. // virtual keyboard, it may cause an infinite recursion.

19
types/wlr_keyboard.c
View file

@ -156,7 +156,7 @@ void wlr_keyboard_finish(struct wlr_keyboard *kb) {
/* Finish xkbcommon resources */ /* Finish xkbcommon resources */
xkb_state_unref(kb->xkb_state); xkb_state_unref(kb->xkb_state);
xkb_keymap_unref(kb->keymap); xkb_keymap_unref(kb->keymap);
free(kb->keymap_string); free(kb->keymap_data);
if (kb->keymap_fd >= 0) { if (kb->keymap_fd >= 0) {
close(kb->keymap_fd); close(kb->keymap_fd);
} }
@ -204,15 +204,16 @@ bool wlr_keyboard_set_keymap(struct wlr_keyboard *kb,
kb->mod_indexes[i] = xkb_map_mod_get_index(kb->keymap, mod_names[i]); kb->mod_indexes[i] = xkb_map_mod_get_index(kb->keymap, mod_names[i]);
} }
char *tmp_keymap_string = xkb_keymap_get_as_string(kb->keymap, char *keymap_data = xkb_keymap_get_as_string(kb->keymap,
XKB_KEYMAP_FORMAT_TEXT_V1); XKB_KEYMAP_FORMAT_TEXT_V1);
if (tmp_keymap_string == NULL) { if (keymap_data == NULL) {
wlr_log(WLR_ERROR, "Failed to get string version of keymap"); wlr_log(WLR_ERROR, "Failed to get string version of keymap");
goto err; goto err;
} }
free(kb->keymap_string); free(kb->keymap_data);
kb->keymap_string = tmp_keymap_string; kb->keymap_format = XKB_KEYMAP_FORMAT_TEXT_V1;
kb->keymap_size = strlen(kb->keymap_string) + 1; kb->keymap_data = keymap_data;
kb->keymap_size = strlen(kb->keymap_data) + 1;
int rw_fd = -1, ro_fd = -1; int rw_fd = -1, ro_fd = -1;
if (!allocate_shm_file_pair(kb->keymap_size, &rw_fd, &ro_fd)) { if (!allocate_shm_file_pair(kb->keymap_size, &rw_fd, &ro_fd)) {
@ -229,7 +230,7 @@ bool wlr_keyboard_set_keymap(struct wlr_keyboard *kb,
goto err; goto err;
} }
memcpy(dst, kb->keymap_string, kb->keymap_size); memcpy(dst, kb->keymap_data, kb->keymap_size);
munmap(dst, kb->keymap_size); munmap(dst, kb->keymap_size);
close(rw_fd); close(rw_fd);
@ -253,8 +254,8 @@ err:
kb->xkb_state = NULL; kb->xkb_state = NULL;
xkb_keymap_unref(keymap); xkb_keymap_unref(keymap);
kb->keymap = NULL; kb->keymap = NULL;
free(kb->keymap_string); free(kb->keymap_data);
kb->keymap_string = NULL; kb->keymap_data = NULL;
return false; return false;
} }