From e3373669e5544c3f18cf1edcd8fcfff9c6222f5c Mon Sep 17 00:00:00 2001 From: Vaxry Date: Tue, 27 Feb 2024 23:14:56 +0000 Subject: wayland: implement keyboard_shortcuts_inhibit_v1 fixes #4568 --- src/managers/KeybindManager.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/managers/KeybindManager.cpp') diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp index 85598f20..198aa8f6 100644 --- a/src/managers/KeybindManager.cpp +++ b/src/managers/KeybindManager.cpp @@ -497,6 +497,15 @@ bool CKeybindManager::handleKeybinds(const uint32_t modmask, const SPressedKeyWi if (g_pCompositor->m_sSeat.exclusiveClient) Debug::log(LOG, "Keybind handling only locked (inhibitor)"); + if (!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; + } + } + } + for (auto& k : m_lKeybinds) { const bool SPECIALDISPATCHER = k.handler == "global" || k.handler == "pass" || k.handler == "mouse"; const bool SPECIALTRIGGERED = -- cgit v1.2.3