mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-11 04:27:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

seat: only pass on sent keys on surface-focus

Browse source 
Key events associated with keybindings (both pressed and released) are not
sent to clients. When using wlr_seat_keyboard_notify_enter() it it
therefore important not to send the keycodes of _all_ pressed keys, but
only those that were actually _sent_ to clients (that is, those that were
not bound).

This approach is consistent with sway's implementation in input/seat.c
cffb006feb/sway/input/seat.c (L173-L175)

Fixes issue #510
This commit is contained in:
Johan Malm 2022-09-20 20:46:39 +01:00
parent 4108313f96
commit de99a8ba33
4 changed files with 53 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/keyboard.c
View file

@ -85,6 +85,7 @@ handle_keybinding(struct server *server, uint32_t modifiers, xkb_keysym_t sym)
}
for (size_t i = 0; i < keybind->keysyms_len; i++) {
if (xkb_keysym_to_lower(sym) == keybind->keysyms[i]) {
key_state_store_pressed_keys_as_bound();
actions_run(NULL, server, &keybind->actions, 0);
return true;
}
@ -121,7 +122,7 @@ handle_compositor_keybindings(struct wl_listener *listener,
bool handled = false;
key_state_set_pressed(keycode,
key_state_set_pressed(event->keycode,
event->state == WL_KEYBOARD_KEY_STATE_PRESSED);
/*
@ -152,9 +153,9 @@ handle_compositor_keybindings(struct wl_listener *listener,
* If a press event was handled by a compositor binding, then do not
* forward the corresponding release event to clients
*/
if (key_state_corresponding_press_event_was_bound(keycode)
if (key_state_corresponding_press_event_was_bound(event->keycode)
&& event->state == WL_KEYBOARD_KEY_STATE_RELEASED) {
key_state_bound_key_remove(keycode);
key_state_bound_key_remove(event->keycode);
return true;
}
@ -247,7 +248,7 @@ keyboard_key_notify(struct wl_listener *listener, void *data)
if (!handled) {
wlr_seat_set_keyboard(wlr_seat, keyboard);
wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec,
event->keycode, event->state);
event->keycode, event->state);
}
}