From 01df3b73d815beaa892849ae7bd4eddc94642dc7 Mon Sep 17 00:00:00 2001 From: Vaxry Date: Thu, 25 Apr 2024 14:32:35 +0100 Subject: shortcuts-inhibitor: move to new impl --- src/managers/KeybindManager.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/managers/KeybindManager.cpp') diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp index ad863274..402c567f 100644 --- a/src/managers/KeybindManager.cpp +++ b/src/managers/KeybindManager.cpp @@ -4,6 +4,7 @@ #include "helpers/VarList.hpp" #include "../config/ConfigValue.hpp" #include "TokenManager.hpp" +#include "../protocols/ShortcutsInhibit.hpp" #include #include @@ -539,13 +540,9 @@ bool CKeybindManager::handleKeybinds(const uint32_t modmask, const SPressedKeyWi static auto PDISABLEINHIBIT = CConfigValue("binds:disable_keybind_grabbing"); - if (!*PDISABLEINHIBIT && !m_lShortcutInhibitors.empty()) { - for (auto& i : m_lShortcutInhibitors) { - if (i.pWlrInhibitor->surface == g_pCompositor->m_pLastFocus) { - Debug::log(LOG, "Keybind handling is disabled due to an inhibitor for surface {:x}", (uintptr_t)i.pWlrInhibitor->surface); - return false; - } - } + if (!*PDISABLEINHIBIT && PROTO::shortcutsInhibit->isInhibited()) { + Debug::log(LOG, "Keybind handling is disabled due to an inhibitor"); + return false; } for (auto& k : m_lKeybinds) { -- cgit v1.2.3