1 files changed, 32 insertions, 9 deletions

diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 2cfcd126..9c5f190e 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -150,16 +150,18 @@ static bool update_shortcut_state(struct sway_shortcut_state *state,
  */
 static void get_active_binding(const struct sway_shortcut_state *state,
                 list_t *bindings, struct sway_binding **current_binding,
-                uint32_t modifiers, bool release, bool locked, const char *input,
-                bool exact_input, xkb_layout_index_t group) {
+                uint32_t modifiers, bool release, bool locked, bool inhibited,
+                const char *input, bool exact_input, xkb_layout_index_t group) {
         for (int i = 0; i < bindings->length; ++i) {
                 struct sway_binding *binding = bindings->items[i];
                 bool binding_locked = (binding->flags & BINDING_LOCKED) != 0;
+                bool binding_inhibited = (binding->flags & BINDING_INHIBITED) != 0;
                 bool binding_release = binding->flags & BINDING_RELEASE;
 
                 if (modifiers ^ binding->modifiers ||
                                 release != binding_release ||
                                 locked > binding_locked ||
+                                inhibited > binding_inhibited ||
                                 (binding->group != XKB_LAYOUT_INVALID &&
                                  binding->group != group) ||
                                 (strcmp(binding->input, input) != 0 &&
@@ -195,6 +197,8 @@ static void get_active_binding(const struct sway_shortcut_state *state,
 
                         bool current_locked =
                                 ((*current_binding)->flags & BINDING_LOCKED) != 0;
+                        bool current_inhibited =
+                                ((*current_binding)->flags & BINDING_INHIBITED) != 0;
                         bool current_input = strcmp((*current_binding)->input, input) == 0;
                         bool current_group_set =
                                 (*current_binding)->group != XKB_LAYOUT_INVALID;
@@ -203,6 +207,7 @@ static void get_active_binding(const struct sway_shortcut_state *state,
 
                         if (current_input == binding_input
                                         && current_locked == binding_locked
+                                        && current_inhibited == binding_inhibited
                                         && current_group_set == binding_group_set) {
                                 sway_log(SWAY_DEBUG,
                                                 "Encountered conflicting bindings %d and %d",
@@ -224,11 +229,21 @@ static void get_active_binding(const struct sway_shortcut_state *state,
                                         current_locked == locked) {
                                 continue; // Prefer correct lock state for matching input+group
                         }
+
+                        if (current_input == binding_input &&
+                                        current_group_set == binding_group_set &&
+                                        current_locked == binding_locked &&
+                                        current_inhibited == inhibited) {
+                                // Prefer correct inhibition state for matching
+                                // input+group+locked
+                                continue;
+                        }
                 }
 
                 *current_binding = binding;
                 if (strcmp((*current_binding)->input, input) == 0 &&
                                 (((*current_binding)->flags & BINDING_LOCKED) == locked) &&
+                                (((*current_binding)->flags & BINDING_INHIBITED) == inhibited) &&
                                 (*current_binding)->group == group) {
                         return; // If a perfect match is found, quit searching
                 }
@@ -328,6 +343,9 @@ static void handle_key_event(struct sway_keyboard *keyboard,
         bool exact_identifier = wlr_device->keyboard->group != NULL;
         seat_idle_notify_activity(seat, IDLE_SOURCE_KEYBOARD);
         bool input_inhibited = seat->exclusive_client != NULL;
+        struct sway_keyboard_shortcuts_inhibitor *sway_inhibitor =
+                keyboard_shortcuts_inhibitor_get_for_focused_surface(seat);
+        bool shortcuts_inhibited = sway_inhibitor && sway_inhibitor->inhibitor->active;
 
         // Identify new keycode, raw keysym(s), and translated keysym(s)
         xkb_keycode_t keycode = event->keycode + 8;
@@ -364,15 +382,18 @@ static void handle_key_event(struct sway_keyboard *keyboard,
         struct sway_binding *binding_released = NULL;
         get_active_binding(&keyboard->state_keycodes,
                         config->current_mode->keycode_bindings, &binding_released,
-                        code_modifiers, true, input_inhibited, device_identifier,
+                        code_modifiers, true, input_inhibited,
+                        shortcuts_inhibited, device_identifier,
                         exact_identifier, keyboard->effective_layout);
         get_active_binding(&keyboard->state_keysyms_raw,
                         config->current_mode->keysym_bindings, &binding_released,
-                        raw_modifiers, true, input_inhibited, device_identifier,
+                        raw_modifiers, true, input_inhibited,
+                        shortcuts_inhibited, device_identifier,
                         exact_identifier, keyboard->effective_layout);
         get_active_binding(&keyboard->state_keysyms_translated,
                         config->current_mode->keysym_bindings, &binding_released,
-                        translated_modifiers, true, input_inhibited, device_identifier,
+                        translated_modifiers, true, input_inhibited,
+                        shortcuts_inhibited, device_identifier,
                         exact_identifier, keyboard->effective_layout);
 
         // Execute stored release binding once no longer active
@@ -393,17 +414,19 @@ static void handle_key_event(struct sway_keyboard *keyboard,
         if (event->state == WLR_KEY_PRESSED) {
                 get_active_binding(&keyboard->state_keycodes,
                                 config->current_mode->keycode_bindings, &binding,
-                                code_modifiers, false, input_inhibited, device_identifier,
+                                code_modifiers, false, input_inhibited,
+                                shortcuts_inhibited, device_identifier,
                                 exact_identifier, keyboard->effective_layout);
                 get_active_binding(&keyboard->state_keysyms_raw,
                                 config->current_mode->keysym_bindings, &binding,
-                                raw_modifiers, false, input_inhibited, device_identifier,
+                                raw_modifiers, false, input_inhibited,
+                                shortcuts_inhibited, device_identifier,
                                 exact_identifier, keyboard->effective_layout);
                 get_active_binding(&keyboard->state_keysyms_translated,
                                 config->current_mode->keysym_bindings, &binding,
                                 translated_modifiers, false, input_inhibited,
-                                device_identifier, exact_identifier,
-                                keyboard->effective_layout);
+                                shortcuts_inhibited, device_identifier,
+                                exact_identifier, keyboard->effective_layout);
         }
 
         // Set up (or clear) keyboard repeat for a pressed binding. Since the