aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/keyboard.c
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2023-12-04 15:53:57 +0100
committerLibravatar Simon Ser <contact@emersion.fr>2023-12-13 10:11:35 +0100
commit7ad8c80bfe020f2689b049306f5c0a6fe6ff622d (patch)
tree50506020329f084ee6d3e19347b2383361eff564 /sway/input/keyboard.c
parentinput/seat: drop exclusive_client (diff)
downloadsway-7ad8c80bfe020f2689b049306f5c0a6fe6ff622d.tar.gz
sway-7ad8c80bfe020f2689b049306f5c0a6fe6ff622d.tar.zst
sway-7ad8c80bfe020f2689b049306f5c0a6fe6ff622d.zip
input/{keyboard,switch}: rename input_inhibited variable to locked
This is more descriptive now.
Diffstat (limited to 'sway/input/keyboard.c')
-rw-r--r--sway/input/keyboard.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 577ec9f5..dea7a7bd 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -405,7 +405,7 @@ static void handle_key_event(struct sway_keyboard *keyboard,
405 char *device_identifier = input_device_get_identifier(wlr_device); 405 char *device_identifier = input_device_get_identifier(wlr_device);
406 bool exact_identifier = keyboard->wlr->group != NULL; 406 bool exact_identifier = keyboard->wlr->group != NULL;
407 seat_idle_notify_activity(seat, IDLE_SOURCE_KEYBOARD); 407 seat_idle_notify_activity(seat, IDLE_SOURCE_KEYBOARD);
408 bool input_inhibited = server.session_lock.locked; 408 bool locked = server.session_lock.locked;
409 struct sway_keyboard_shortcuts_inhibitor *sway_inhibitor = 409 struct sway_keyboard_shortcuts_inhibitor *sway_inhibitor =
410 keyboard_shortcuts_inhibitor_get_for_focused_surface(seat); 410 keyboard_shortcuts_inhibitor_get_for_focused_surface(seat);
411 bool shortcuts_inhibited = sway_inhibitor && sway_inhibitor->inhibitor->active; 411 bool shortcuts_inhibited = sway_inhibitor && sway_inhibitor->inhibitor->active;
@@ -423,17 +423,17 @@ static void handle_key_event(struct sway_keyboard *keyboard,
423 struct sway_binding *binding_released = NULL; 423 struct sway_binding *binding_released = NULL;
424 get_active_binding(&keyboard->state_keycodes, 424 get_active_binding(&keyboard->state_keycodes,
425 config->current_mode->keycode_bindings, &binding_released, 425 config->current_mode->keycode_bindings, &binding_released,
426 keyinfo.code_modifiers, true, input_inhibited, 426 keyinfo.code_modifiers, true, locked,
427 shortcuts_inhibited, device_identifier, 427 shortcuts_inhibited, device_identifier,
428 exact_identifier, keyboard->effective_layout); 428 exact_identifier, keyboard->effective_layout);
429 get_active_binding(&keyboard->state_keysyms_raw, 429 get_active_binding(&keyboard->state_keysyms_raw,
430 config->current_mode->keysym_bindings, &binding_released, 430 config->current_mode->keysym_bindings, &binding_released,
431 keyinfo.raw_modifiers, true, input_inhibited, 431 keyinfo.raw_modifiers, true, locked,
432 shortcuts_inhibited, device_identifier, 432 shortcuts_inhibited, device_identifier,
433 exact_identifier, keyboard->effective_layout); 433 exact_identifier, keyboard->effective_layout);
434 get_active_binding(&keyboard->state_keysyms_translated, 434 get_active_binding(&keyboard->state_keysyms_translated,
435 config->current_mode->keysym_bindings, &binding_released, 435 config->current_mode->keysym_bindings, &binding_released,
436 keyinfo.translated_modifiers, true, input_inhibited, 436 keyinfo.translated_modifiers, true, locked,
437 shortcuts_inhibited, device_identifier, 437 shortcuts_inhibited, device_identifier,
438 exact_identifier, keyboard->effective_layout); 438 exact_identifier, keyboard->effective_layout);
439 439
@@ -455,17 +455,17 @@ static void handle_key_event(struct sway_keyboard *keyboard,
455 if (event->state == WL_KEYBOARD_KEY_STATE_PRESSED) { 455 if (event->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
456 get_active_binding(&keyboard->state_keycodes, 456 get_active_binding(&keyboard->state_keycodes,
457 config->current_mode->keycode_bindings, &binding, 457 config->current_mode->keycode_bindings, &binding,
458 keyinfo.code_modifiers, false, input_inhibited, 458 keyinfo.code_modifiers, false, locked,
459 shortcuts_inhibited, device_identifier, 459 shortcuts_inhibited, device_identifier,
460 exact_identifier, keyboard->effective_layout); 460 exact_identifier, keyboard->effective_layout);
461 get_active_binding(&keyboard->state_keysyms_raw, 461 get_active_binding(&keyboard->state_keysyms_raw,
462 config->current_mode->keysym_bindings, &binding, 462 config->current_mode->keysym_bindings, &binding,
463 keyinfo.raw_modifiers, false, input_inhibited, 463 keyinfo.raw_modifiers, false, locked,
464 shortcuts_inhibited, device_identifier, 464 shortcuts_inhibited, device_identifier,
465 exact_identifier, keyboard->effective_layout); 465 exact_identifier, keyboard->effective_layout);
466 get_active_binding(&keyboard->state_keysyms_translated, 466 get_active_binding(&keyboard->state_keysyms_translated,
467 config->current_mode->keysym_bindings, &binding, 467 config->current_mode->keysym_bindings, &binding,
468 keyinfo.translated_modifiers, false, input_inhibited, 468 keyinfo.translated_modifiers, false, locked,
469 shortcuts_inhibited, device_identifier, 469 shortcuts_inhibited, device_identifier,
470 exact_identifier, keyboard->effective_layout); 470 exact_identifier, keyboard->effective_layout);
471 } 471 }