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

Merge pull request #875 from Ongy/keyboard_order 

reorder xkb state handling in wlr_keyboard
This commit is contained in:
Drew DeVault 2018-04-18 08:38:26 -04:00 committed by GitHub
parent dbdc63ddde c8ccb1bef3
commit c18afd6731
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
types/wlr_keyboard.c
View File

@ -120,6 +120,10 @@ void wlr_keyboard_notify_key(struct wlr_keyboard *keyboard,
if (keyboard->xkb_state == NULL) {
return;
}
keyboard_key_update(keyboard, event);
wlr_signal_emit_safe(&keyboard->events.key, event);
if (event->update_state) {
uint32_t keycode = event->keycode + 8;
xkb_state_update_key(keyboard->xkb_state, keycode,
@ -131,9 +135,6 @@ void wlr_keyboard_notify_key(struct wlr_keyboard *keyboard,
if (updated) {
wlr_signal_emit_safe(&keyboard->events.modifiers, keyboard);
}
keyboard_key_update(keyboard, event);
wlr_signal_emit_safe(&keyboard->events.key, event);
}
void wlr_keyboard_init(struct wlr_keyboard *kb,