mirror of
https://github.com/labwc/labwc.git
synced 2026-03-03 01:40:37 -05:00
Remove seat->nr_inhibited_keybind_views
This commit is contained in:
parent
f7702af9e4
commit
73095f75cb
3 changed files with 1 additions and 11 deletions
|
|
@ -129,9 +129,6 @@ struct seat {
|
||||||
|
|
||||||
struct wlr_pointer_constraint_v1 *current_constraint;
|
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 */
|
/* Used to hide the workspace OSD after switching workspaces */
|
||||||
struct wl_event_source *workspace_osd_timer;
|
struct wl_event_source *workspace_osd_timer;
|
||||||
bool workspace_osd_shown_by_modifier;
|
bool workspace_osd_shown_by_modifier;
|
||||||
|
|
|
||||||
|
|
@ -211,8 +211,7 @@ match_keybinding_for_sym(struct server *server, uint32_t modifiers,
|
||||||
if (modifiers ^ keybind->modifiers) {
|
if (modifiers ^ keybind->modifiers) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (server->seat.nr_inhibited_keybind_views
|
if (server->active_view
|
||||||
&& server->active_view
|
|
||||||
&& server->active_view->inhibits_keybinds
|
&& server->active_view->inhibits_keybinds
|
||||||
&& !actions_contain_toggle_keybinds(&keybind->actions)) {
|
&& !actions_contain_toggle_keybinds(&keybind->actions)) {
|
||||||
continue;
|
continue;
|
||||||
|
|
|
||||||
|
|
@ -2437,11 +2437,6 @@ view_toggle_keybinds(struct view *view)
|
||||||
{
|
{
|
||||||
assert(view);
|
assert(view);
|
||||||
view->inhibits_keybinds = !view->inhibits_keybinds;
|
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) {
|
if (view->ssd_enabled) {
|
||||||
ssd_enable_keybind_inhibit_indicator(view->ssd,
|
ssd_enable_keybind_inhibit_indicator(view->ssd,
|
||||||
|
|
@ -2621,7 +2616,6 @@ view_destroy(struct view *view)
|
||||||
|
|
||||||
if (view->inhibits_keybinds) {
|
if (view->inhibits_keybinds) {
|
||||||
view->inhibits_keybinds = false;
|
view->inhibits_keybinds = false;
|
||||||
server->seat.nr_inhibited_keybind_views--;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
osd_on_view_destroy(view);
|
osd_on_view_destroy(view);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue