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

fix send modifiers in wlr-seat set keyboard

This commit is contained in:
Tony Crisci 2018-01-06 10:31:32 -05:00
parent 670d336099
commit 2bd3a75f80
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
types/wlr_seat.c
View File

@ -774,6 +774,7 @@ void wlr_seat_set_keyboard(struct wlr_seat *seat,
if (keyboard) { if (keyboard) {
assert(device->type == WLR_INPUT_DEVICE_KEYBOARD); assert(device->type == WLR_INPUT_DEVICE_KEYBOARD);
seat->keyboard_state.keyboard = keyboard;
wl_signal_add(&device->events.destroy, wl_signal_add(&device->events.destroy,
&seat->keyboard_state.keyboard_destroy); &seat->keyboard_state.keyboard_destroy);
@ -788,14 +789,14 @@ void wlr_seat_set_keyboard(struct wlr_seat *seat,
struct wlr_seat_client *client; struct wlr_seat_client *client;
wl_list_for_each(client, &seat->clients, link) { wl_list_for_each(client, &seat->clients, link) {
seat_client_send_keymap(client, device->keyboard); seat_client_send_keymap(client, keyboard);
seat_client_send_repeat_info(client, device->keyboard); seat_client_send_repeat_info(client, keyboard);
} }
wlr_seat_keyboard_send_modifiers(seat, keyboard->modifiers);
} else {
seat->keyboard_state.keyboard = NULL;
} }
seat->keyboard_state.keyboard = keyboard;
wlr_seat_keyboard_send_modifiers(seat);
} }
struct wlr_keyboard *wlr_seat_get_keyboard(struct wlr_seat *seat) { struct wlr_keyboard *wlr_seat_get_keyboard(struct wlr_seat *seat) {