mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-25 06:46:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

keyboard: simplify handle_key_event

Browse source
This commit is contained in:
xdavidwu 2021-03-12 11:22:15 +08:00
parent 93bcd6f59f
commit e397ebc06f
No known key found for this signature in database
GPG key ID: EF1E781EE6BE877E
1 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

53
sway/input/keyboard.c
View file

@ -503,7 +503,22 @@ static void handle_key_event(struct sway_keyboard *keyboard,
keyinfo.raw_keysyms_len); keyinfo.raw_keysyms_len);
} }
if (!handled || event->state == WL_KEYBOARD_KEY_STATE_RELEASED) { bool pressed_sent = false;
if (event->state == WL_KEYBOARD_KEY_STATE_RELEASED) {
// If the pressed event was sent to a client, also send the released
// event. In particular, don't send the released event to the IM grab.
pressed_sent = update_shortcut_state(
&keyboard->state_pressed_sent, event->keycode,
event->state, keyinfo.keycode, 0);
if (pressed_sent) {
wlr_seat_set_keyboard(wlr_seat, wlr_device);
wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec,
event->keycode, event->state);
handled = true;
}
}
if (!handled) {
struct wlr_input_method_keyboard_grab_v2 *kb_grab = keyboard_get_im_grab(keyboard); struct wlr_input_method_keyboard_grab_v2 *kb_grab = keyboard_get_im_grab(keyboard);
struct wlr_virtual_keyboard_v1 *virtual_keyboard = struct wlr_virtual_keyboard_v1 *virtual_keyboard =
wlr_input_device_get_virtual_keyboard(wlr_device); wlr_input_device_get_virtual_keyboard(wlr_device);
@ -513,39 +528,23 @@ static void handle_key_event(struct sway_keyboard *keyboard,
if (kb_grab && !(virtual_keyboard && if (kb_grab && !(virtual_keyboard &&
wl_resource_get_client(virtual_keyboard->resource) == wl_resource_get_client(virtual_keyboard->resource) ==
wl_resource_get_client(kb_grab->resource))) { wl_resource_get_client(kb_grab->resource))) {
// Do not send release event to grab if the press event was not
// sent to grab.
if (event->state == WL_KEYBOARD_KEY_STATE_RELEASED) {
bool pressed_sent = update_shortcut_state(
&keyboard->state_pressed_sent, event->keycode,
event->state, keyinfo.keycode, 0);
if (pressed_sent) {
wlr_seat_set_keyboard(wlr_seat, wlr_device);
wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec,
event->keycode, event->state);
goto end;
}
}
wlr_input_method_keyboard_grab_v2_set_keyboard(kb_grab, wlr_input_method_keyboard_grab_v2_set_keyboard(kb_grab,
wlr_device->keyboard); wlr_device->keyboard);
wlr_input_method_keyboard_grab_v2_send_key(kb_grab, wlr_input_method_keyboard_grab_v2_send_key(kb_grab,
event->time_msec, event->keycode, event->state); event->time_msec, event->keycode, event->state);
goto end; handled = true;
}
bool pressed_sent = update_shortcut_state(
&keyboard->state_pressed_sent, event->keycode, event->state,
keyinfo.keycode, 0);
if (pressed_sent || event->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
wlr_seat_set_keyboard(wlr_seat, wlr_device);
wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec,
event->keycode, event->state);
} }
} }
end: if (!handled && !pressed_sent) {
update_shortcut_state(
&keyboard->state_pressed_sent, event->keycode, event->state,
keyinfo.keycode, 0);
wlr_seat_set_keyboard(wlr_seat, wlr_device);
wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec,
event->keycode, event->state);
}
free(device_identifier); free(device_identifier);
} }