From 7ae87a233c7c2c9c010f947f5d15f2968d03433b Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Mon, 18 Apr 2022 17:16:01 +0200
Subject: Inhibit fixes

---
 src/managers/InputManager.cpp   | 2 +-
 src/managers/KeybindManager.cpp | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/managers')

diff --git a/src/managers/InputManager.cpp b/src/managers/InputManager.cpp
index 1f5b125b..0800ac95 100644
--- a/src/managers/InputManager.cpp
+++ b/src/managers/InputManager.cpp
@@ -53,7 +53,7 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
 
     // first, we check if the workspace doesnt have a fullscreen window
     const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(PMONITOR->activeWorkspace);
-    if (PWORKSPACE->m_bHasFullscreenWindow) {
+    if (PWORKSPACE->m_bHasFullscreenWindow && !foundSurface) {
         pFoundWindow = g_pCompositor->getFullscreenWindowOnWorkspace(PWORKSPACE->m_iID);
 
         for (auto w = g_pCompositor->m_lWindows.rbegin(); w != g_pCompositor->m_lWindows.rend(); ++w) {
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index 4a5cce5a..50d20524 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -32,6 +32,11 @@ bool CKeybindManager::handleKeybinds(const uint32_t& modmask, const xkb_keysym_t
     if (handleInternalKeybinds(key))
         return true;
 
+    if (g_pCompositor->m_sSeat.exclusiveClient){
+        Debug::log(LOG, "Not handling keybinds due to there being an exclusive inhibited client.");
+        return false;
+    }
+
     for (auto& k : m_dKeybinds) {
         if (modmask != k.modmask) 
             continue;
-- 
cgit v1.2.3