mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-26 06:35:58 +01:00
Merge pull request #875 from Ongy/keyboard_order
reorder xkb state handling in wlr_keyboard
This commit is contained in:
commit
c18afd6731
1 changed files with 4 additions and 3 deletions
|
@ -120,6 +120,10 @@ void wlr_keyboard_notify_key(struct wlr_keyboard *keyboard,
|
||||||
if (keyboard->xkb_state == NULL) {
|
if (keyboard->xkb_state == NULL) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
keyboard_key_update(keyboard, event);
|
||||||
|
wlr_signal_emit_safe(&keyboard->events.key, event);
|
||||||
|
|
||||||
if (event->update_state) {
|
if (event->update_state) {
|
||||||
uint32_t keycode = event->keycode + 8;
|
uint32_t keycode = event->keycode + 8;
|
||||||
xkb_state_update_key(keyboard->xkb_state, keycode,
|
xkb_state_update_key(keyboard->xkb_state, keycode,
|
||||||
|
@ -131,9 +135,6 @@ void wlr_keyboard_notify_key(struct wlr_keyboard *keyboard,
|
||||||
if (updated) {
|
if (updated) {
|
||||||
wlr_signal_emit_safe(&keyboard->events.modifiers, keyboard);
|
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,
|
void wlr_keyboard_init(struct wlr_keyboard *kb,
|
||||||
|
|
Loading…
Reference in a new issue