1 files changed, 18 insertions, 4 deletions

diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index 243f860b..dc07cbf0 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -15,6 +15,7 @@
 #include "sway/input/cursor.h"
 #include "sway/ipc-server.h"
 #include "sway/server.h"
+#include "sway/tree/view.h"
 #include "stringop.h"
 #include "list.h"
 #include "log.h"
@@ -333,12 +334,25 @@ static void handle_keyboard_shortcuts_inhibit_new_inhibitor(
         struct sway_seat *seat = inhibitor->seat->data;
         wl_list_insert(&seat->keyboard_shortcuts_inhibitors, &sway_inhibitor->link);
 
-        struct seat_config *config = seat_get_config(seat);
-        if (!config) {
-                config = seat_get_config_by_name("*");
+        // per-view, seat-agnostic config via criteria
+        struct sway_view *view = view_from_wlr_surface(inhibitor->surface);
+        enum seat_config_shortcuts_inhibit inhibit = SHORTCUTS_INHIBIT_DEFAULT;
+        if (view) {
+                inhibit = view->shortcuts_inhibit;
         }
 
-        if (config && config->shortcuts_inhibit == SHORTCUTS_INHIBIT_DISABLE) {
+        if (inhibit == SHORTCUTS_INHIBIT_DEFAULT) {
+                struct seat_config *config = seat_get_config(seat);
+                if (!config) {
+                        config = seat_get_config_by_name("*");
+                }
+
+                if (config) {
+                        inhibit = config->shortcuts_inhibit;
+                }
+        }
+
+        if (inhibit == SHORTCUTS_INHIBIT_DISABLE) {
                 /**
                  * Here we deny to honour the inhibitor by never sending the
                  * activate signal. We can not, however, destroy the inhibitor