]> git.mdlowis.com Git - proto/labwc.git/commitdiff
Remove seat->nr_inhibited_keybind_views
authortokyo4j <hrak1529@gmail.com>
Wed, 23 Jul 2025 16:18:36 +0000 (01:18 +0900)
committerHiroaki Yamamoto <hrak1529@gmail.com>
Sun, 27 Jul 2025 15:06:52 +0000 (00:06 +0900)
include/labwc.h
src/input/keyboard.c
src/view.c

index 5f4ae1336deb57bd32c88b9a1c8c249478b04f79..fbeb992b879b072b640b468e55cd7494488568aa 100644 (file)
@@ -129,9 +129,6 @@ struct seat {
 
        struct wlr_pointer_constraint_v1 *current_constraint;
 
-       /* In support for ToggleKeybinds */
-       uint32_t nr_inhibited_keybind_views;
-
        /* Used to hide the workspace OSD after switching workspaces */
        struct wl_event_source *workspace_osd_timer;
        bool workspace_osd_shown_by_modifier;
index 17a2139553fa52a2c3dd1668efac477bf5b8c6ff..676366d905fc6c12a33bdd70c85c09d9411a1ffb 100644 (file)
@@ -211,8 +211,7 @@ match_keybinding_for_sym(struct server *server, uint32_t modifiers,
                if (modifiers ^ keybind->modifiers) {
                        continue;
                }
-               if (server->seat.nr_inhibited_keybind_views
-                               && server->active_view
+               if (server->active_view
                                && server->active_view->inhibits_keybinds
                                && !actions_contain_toggle_keybinds(&keybind->actions)) {
                        continue;
index 1a9d92ccb2bfdcec6aea5ad996aac10ebd4a576f..bc3cf35cc9d2d367e3e37b9b71e1af99d0ebc710 100644 (file)
@@ -2437,11 +2437,6 @@ view_toggle_keybinds(struct view *view)
 {
        assert(view);
        view->inhibits_keybinds = !view->inhibits_keybinds;
-       if (view->inhibits_keybinds) {
-               view->server->seat.nr_inhibited_keybind_views++;
-       } else {
-               view->server->seat.nr_inhibited_keybind_views--;
-       }
 
        if (view->ssd_enabled) {
                ssd_enable_keybind_inhibit_indicator(view->ssd,
@@ -2621,7 +2616,6 @@ view_destroy(struct view *view)
 
        if (view->inhibits_keybinds) {
                view->inhibits_keybinds = false;
-               server->seat.nr_inhibited_keybind_views--;
        }
 
        osd_on_view_destroy(view);