blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Properly popluate keys array for enter on creation 

This corrects an oversight made in 3f617631cb
This commit is contained in:
Isaac Freund 2020-03-13 23:06:21 +01:00 committed by Simon Ser
parent 3f617631cb
commit 7c309ba4d3
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
types/seat/wlr_seat_keyboard.c
View File

@ -421,8 +421,21 @@ void seat_client_create_keyboard(struct wlr_seat_client *seat_client,
// Send an enter event if there is a focused client/surface stored // Send an enter event if there is a focused client/surface stored
if (focused_client != NULL && focused_surface != NULL) { if (focused_client != NULL && focused_surface != NULL) {
uint32_t *keycodes = keyboard->keycodes;
size_t num_keycodes = keyboard->num_keycodes;
struct wl_array keys; struct wl_array keys;
wl_array_init(&keys); wl_array_init(&keys);
for (size_t i = 0; i < num_keycodes; ++i) {
uint32_t *p = wl_array_add(&keys, sizeof(uint32_t));
if (!p) {
wlr_log(WLR_ERROR, "Cannot allocate memory, skipping keycode: %d\n",
keycodes[i]);
continue;
}
*p = keycodes[i];
}
uint32_t serial = wlr_seat_client_next_serial(focused_client); uint32_t serial = wlr_seat_client_next_serial(focused_client);
struct wl_resource *resource; struct wl_resource *resource;
wl_resource_for_each(resource, &focused_client->keyboards) { wl_resource_for_each(resource, &focused_client->keyboards) {
@ -434,6 +447,7 @@ void seat_client_create_keyboard(struct wlr_seat_client *seat_client,
focused_surface->resource, &keys); focused_surface->resource, &keys);
} }
} }
wl_array_release(&keys); wl_array_release(&keys);
} }
} }