diff options
author | Simon Ser <contact@emersion.fr> | 2020-11-11 11:00:55 +0100 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2020-11-11 11:00:55 +0100 |
commit | bb342ac5e6de67279a55edb76d8202f10411c38b (patch) | |
tree | fe1ea7787b653eab06a58f41dee224f217aba037 /sway/input | |
parent | build: bump wlroots dependency to 0.12.0 (diff) | |
download | sway-bb342ac5e6de67279a55edb76d8202f10411c38b.tar.gz sway-bb342ac5e6de67279a55edb76d8202f10411c38b.tar.zst sway-bb342ac5e6de67279a55edb76d8202f10411c38b.zip |
Replace wlr_key_state with wl_keyboard_key_state
References: https://github.com/swaywm/wlroots/pull/2446
Diffstat (limited to 'sway/input')
-rw-r--r-- | sway/input/keyboard.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c index ae30e83a..0413436e 100644 --- a/sway/input/keyboard.c +++ b/sway/input/keyboard.c | |||
@@ -125,7 +125,7 @@ static void state_add_key(struct sway_shortcut_state *state, | |||
125 | * Update the shortcut model state in response to new input | 125 | * Update the shortcut model state in response to new input |
126 | */ | 126 | */ |
127 | static bool update_shortcut_state(struct sway_shortcut_state *state, | 127 | static bool update_shortcut_state(struct sway_shortcut_state *state, |
128 | uint32_t keycode, enum wlr_key_state keystate, uint32_t new_key, | 128 | uint32_t keycode, enum wl_keyboard_key_state keystate, uint32_t new_key, |
129 | uint32_t raw_modifiers) { | 129 | uint32_t raw_modifiers) { |
130 | bool last_key_was_a_modifier = raw_modifiers != state->last_raw_modifiers; | 130 | bool last_key_was_a_modifier = raw_modifiers != state->last_raw_modifiers; |
131 | state->last_raw_modifiers = raw_modifiers; | 131 | state->last_raw_modifiers = raw_modifiers; |
@@ -135,7 +135,7 @@ static bool update_shortcut_state(struct sway_shortcut_state *state, | |||
135 | state_erase_key(state, state->last_keycode); | 135 | state_erase_key(state, state->last_keycode); |
136 | } | 136 | } |
137 | 137 | ||
138 | if (keystate == WLR_KEY_PRESSED) { | 138 | if (keystate == WL_KEYBOARD_KEY_STATE_PRESSED) { |
139 | // Add current key to set; there may be duplicates | 139 | // Add current key to set; there may be duplicates |
140 | state_add_key(state, keycode, new_key); | 140 | state_add_key(state, keycode, new_key); |
141 | state->last_keycode = keycode; | 141 | state->last_keycode = keycode; |
@@ -349,7 +349,7 @@ struct key_info { | |||
349 | }; | 349 | }; |
350 | 350 | ||
351 | static void update_keyboard_state(struct sway_keyboard *keyboard, | 351 | static void update_keyboard_state(struct sway_keyboard *keyboard, |
352 | uint32_t raw_keycode, enum wlr_key_state keystate, | 352 | uint32_t raw_keycode, enum wl_keyboard_key_state keystate, |
353 | struct key_info *keyinfo) { | 353 | struct key_info *keyinfo) { |
354 | // Identify new keycode, raw keysym(s), and translated keysym(s) | 354 | // Identify new keycode, raw keysym(s), and translated keysym(s) |
355 | keyinfo->keycode = raw_keycode + 8; | 355 | keyinfo->keycode = raw_keycode + 8; |
@@ -393,7 +393,7 @@ static void handle_key_event(struct sway_keyboard *keyboard, | |||
393 | keyboard_shortcuts_inhibitor_get_for_focused_surface(seat); | 393 | keyboard_shortcuts_inhibitor_get_for_focused_surface(seat); |
394 | bool shortcuts_inhibited = sway_inhibitor && sway_inhibitor->inhibitor->active; | 394 | bool shortcuts_inhibited = sway_inhibitor && sway_inhibitor->inhibitor->active; |
395 | 395 | ||
396 | if (event->state == WLR_KEY_PRESSED) { | 396 | if (event->state == WL_KEYBOARD_KEY_STATE_PRESSED) { |
397 | cursor_notify_key_press(seat->cursor); | 397 | cursor_notify_key_press(seat->cursor); |
398 | } | 398 | } |
399 | 399 | ||
@@ -422,20 +422,20 @@ static void handle_key_event(struct sway_keyboard *keyboard, | |||
422 | 422 | ||
423 | // Execute stored release binding once no longer active | 423 | // Execute stored release binding once no longer active |
424 | if (keyboard->held_binding && binding_released != keyboard->held_binding && | 424 | if (keyboard->held_binding && binding_released != keyboard->held_binding && |
425 | event->state == WLR_KEY_RELEASED) { | 425 | event->state == WL_KEYBOARD_KEY_STATE_RELEASED) { |
426 | seat_execute_command(seat, keyboard->held_binding); | 426 | seat_execute_command(seat, keyboard->held_binding); |
427 | handled = true; | 427 | handled = true; |
428 | } | 428 | } |
429 | if (binding_released != keyboard->held_binding) { | 429 | if (binding_released != keyboard->held_binding) { |
430 | keyboard->held_binding = NULL; | 430 | keyboard->held_binding = NULL; |
431 | } | 431 | } |
432 | if (binding_released && event->state == WLR_KEY_PRESSED) { | 432 | if (binding_released && event->state == WL_KEYBOARD_KEY_STATE_PRESSED) { |
433 | keyboard->held_binding = binding_released; | 433 | keyboard->held_binding = binding_released; |
434 | } | 434 | } |
435 | 435 | ||
436 | // Identify and execute active pressed binding | 436 | // Identify and execute active pressed binding |
437 | struct sway_binding *binding = NULL; | 437 | struct sway_binding *binding = NULL; |
438 | if (event->state == WLR_KEY_PRESSED) { | 438 | if (event->state == WL_KEYBOARD_KEY_STATE_PRESSED) { |
439 | get_active_binding(&keyboard->state_keycodes, | 439 | get_active_binding(&keyboard->state_keycodes, |
440 | config->current_mode->keycode_bindings, &binding, | 440 | config->current_mode->keycode_bindings, &binding, |
441 | keyinfo.code_modifiers, false, input_inhibited, | 441 | keyinfo.code_modifiers, false, input_inhibited, |
@@ -478,22 +478,22 @@ static void handle_key_event(struct sway_keyboard *keyboard, | |||
478 | } | 478 | } |
479 | 479 | ||
480 | // Compositor bindings | 480 | // Compositor bindings |
481 | if (!handled && event->state == WLR_KEY_PRESSED) { | 481 | if (!handled && event->state == WL_KEYBOARD_KEY_STATE_PRESSED) { |
482 | handled = keyboard_execute_compositor_binding( | 482 | handled = keyboard_execute_compositor_binding( |
483 | keyboard, keyinfo.translated_keysyms, | 483 | keyboard, keyinfo.translated_keysyms, |
484 | keyinfo.translated_modifiers, keyinfo.translated_keysyms_len); | 484 | keyinfo.translated_modifiers, keyinfo.translated_keysyms_len); |
485 | } | 485 | } |
486 | if (!handled && event->state == WLR_KEY_PRESSED) { | 486 | if (!handled && event->state == WL_KEYBOARD_KEY_STATE_PRESSED) { |
487 | handled = keyboard_execute_compositor_binding( | 487 | handled = keyboard_execute_compositor_binding( |
488 | keyboard, keyinfo.raw_keysyms, keyinfo.raw_modifiers, | 488 | keyboard, keyinfo.raw_keysyms, keyinfo.raw_modifiers, |
489 | keyinfo.raw_keysyms_len); | 489 | keyinfo.raw_keysyms_len); |
490 | } | 490 | } |
491 | 491 | ||
492 | if (!handled || event->state == WLR_KEY_RELEASED) { | 492 | if (!handled || event->state == WL_KEYBOARD_KEY_STATE_RELEASED) { |
493 | bool pressed_sent = update_shortcut_state( | 493 | bool pressed_sent = update_shortcut_state( |
494 | &keyboard->state_pressed_sent, event->keycode, event->state, | 494 | &keyboard->state_pressed_sent, event->keycode, event->state, |
495 | keyinfo.keycode, 0); | 495 | keyinfo.keycode, 0); |
496 | if (pressed_sent || event->state == WLR_KEY_PRESSED) { | 496 | if (pressed_sent || event->state == WL_KEYBOARD_KEY_STATE_PRESSED) { |
497 | wlr_seat_set_keyboard(wlr_seat, wlr_device); | 497 | wlr_seat_set_keyboard(wlr_seat, wlr_device); |
498 | wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec, | 498 | wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec, |
499 | event->keycode, event->state); | 499 | event->keycode, event->state); |
@@ -528,7 +528,7 @@ static void handle_keyboard_group_enter(struct wl_listener *listener, | |||
528 | uint32_t *keycode; | 528 | uint32_t *keycode; |
529 | wl_array_for_each(keycode, keycodes) { | 529 | wl_array_for_each(keycode, keycodes) { |
530 | struct key_info keyinfo; | 530 | struct key_info keyinfo; |
531 | update_keyboard_state(keyboard, *keycode, WLR_KEY_PRESSED, &keyinfo); | 531 | update_keyboard_state(keyboard, *keycode, WL_KEYBOARD_KEY_STATE_PRESSED, &keyinfo); |
532 | } | 532 | } |
533 | } | 533 | } |
534 | 534 | ||
@@ -544,10 +544,10 @@ static void handle_keyboard_group_leave(struct wl_listener *listener, | |||
544 | uint32_t *keycode; | 544 | uint32_t *keycode; |
545 | wl_array_for_each(keycode, keycodes) { | 545 | wl_array_for_each(keycode, keycodes) { |
546 | struct key_info keyinfo; | 546 | struct key_info keyinfo; |
547 | update_keyboard_state(keyboard, *keycode, WLR_KEY_RELEASED, &keyinfo); | 547 | update_keyboard_state(keyboard, *keycode, WL_KEYBOARD_KEY_STATE_RELEASED, &keyinfo); |
548 | 548 | ||
549 | pressed_sent |= update_shortcut_state(&keyboard->state_pressed_sent, | 549 | pressed_sent |= update_shortcut_state(&keyboard->state_pressed_sent, |
550 | *keycode, WLR_KEY_RELEASED, keyinfo.keycode, 0); | 550 | *keycode, WL_KEYBOARD_KEY_STATE_RELEASED, keyinfo.keycode, 0); |
551 | } | 551 | } |
552 | 552 | ||
553 | if (!pressed_sent) { | 553 | if (!pressed_sent) { |