From 73095f75cbec1eee6dc1b8db76b4b8b0d99c954b Mon Sep 17 00:00:00 2001 From: tokyo4j Date: Thu, 24 Jul 2025 01:18:36 +0900 Subject: [PATCH] Remove seat->nr_inhibited_keybind_views --- include/labwc.h | 3 --- src/input/keyboard.c | 3 +-- src/view.c | 6 ------ 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/include/labwc.h b/include/labwc.h index 5f4ae133..fbeb992b 100644 --- a/include/labwc.h +++ b/include/labwc.h @@ -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; diff --git a/src/input/keyboard.c b/src/input/keyboard.c index 17a21395..676366d9 100644 --- a/src/input/keyboard.c +++ b/src/input/keyboard.c @@ -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; diff --git a/src/view.c b/src/view.c index 1a9d92cc..bc3cf35c 100644 --- a/src/view.c +++ b/src/view.c @@ -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);