From 658f718fa3b2e08653493a00aeaa670a41d19c8d Mon Sep 17 00:00:00 2001 From: Vaxry Date: Sat, 10 Feb 2024 17:05:28 +0000 Subject: [PATCH] input: partially revert #4514 issues with refocus in #4649 --- src/managers/input/InputManager.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp index d0bc402c..44bbaf28 100644 --- a/src/managers/input/InputManager.cpp +++ b/src/managers/input/InputManager.cpp @@ -601,12 +601,8 @@ void CInputManager::processMouseDownNormal(wlr_pointer_button_event* e) { const auto mouseCoords = g_pInputManager->getMouseCoordsInternal(); const auto w = g_pCompositor->vectorToWindowUnified(mouseCoords, ALLOW_FLOATING | RESERVED_EXTENTS | INPUT_EXTENTS); - if (w && !m_bLastFocusOnLS) { - if (g_pCompositor->m_pLastWindow != w && *PFOLLOWMOUSE != 3) - g_pCompositor->focusWindow(w); - if (w->checkInputOnDecos(INPUT_TYPE_BUTTON, mouseCoords, e)) - return; - } + if (w && !m_bLastFocusOnLS && w->checkInputOnDecos(INPUT_TYPE_BUTTON, mouseCoords, e)) + return; // clicking on border triggers resize // TODO detect click on LS properly