diff options
| author | Zach DeCook <zachdecook@librem.one> | 2024-01-12 09:43:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-12 15:43:16 +0100 |
| commit | c4da4b026deefd58f532353b64e9f17130e760ca (patch) | |
| tree | 0b2096a5c61af1f79feb95fe5e52939ea53434df /src | |
| parent | babb9c07b045e21b5549cdcc3096d677e9db35b3 (diff) | |
layershell: Fix greedy mouse grab from keyboard_interactive layer (#4401)
* Layer: Don't allow a keyboard-layer to steal focus from other layers
* Input: Don't change keyboard focus on click if focus is locked
Diffstat (limited to 'src')
| -rw-r--r-- | src/Compositor.cpp | 8 | ||||
| -rw-r--r-- | src/managers/input/InputManager.cpp | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp index cbdcd6b8..2b3fc7d3 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -1102,14 +1102,6 @@ wlr_surface* CCompositor::vectorToLayerSurface(const Vector2D& pos, std::vector< auto SURFACEAT = wlr_layer_surface_v1_surface_at(ls->layerSurface, pos.x - ls->geometry.x, pos.y - ls->geometry.y, &sCoords->x, &sCoords->y); - if (ls->layerSurface->current.keyboard_interactive && ls->layer >= ZWLR_LAYER_SHELL_V1_LAYER_TOP) { - if (!SURFACEAT) - SURFACEAT = ls->layerSurface->surface; - - *ppLayerSurfaceFound = ls.get(); - return SURFACEAT; - } - if (SURFACEAT) { if (!pixman_region32_not_empty(&SURFACEAT->input_region)) continue; diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp index 207df738..8bfdb65c 100644 --- a/src/managers/input/InputManager.cpp +++ b/src/managers/input/InputManager.cpp @@ -359,7 +359,7 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) { bool allowKeyboardRefocus = true; - if (!refocus && g_pCompositor->m_pLastFocus) { + if (g_pCompositor->m_pLastFocus) { const auto PLS = g_pCompositor->getLayerSurfaceFromSurface(g_pCompositor->m_pLastFocus); if (PLS && PLS->layerSurface->current.keyboard_interactive == ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_EXCLUSIVE) @@ -421,7 +421,7 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) { m_bLastFocusOnLS = false; return; // don't enter any new surfaces } else { - if (((FOLLOWMOUSE != 3 && allowKeyboardRefocus) && (*PMOUSEREFOCUS || m_pLastMouseFocus != pFoundWindow)) || refocus) { + if (allowKeyboardRefocus && ((FOLLOWMOUSE != 3 && (*PMOUSEREFOCUS || m_pLastMouseFocus != pFoundWindow)) || refocus)) { m_pLastMouseFocus = pFoundWindow; g_pCompositor->focusWindow(pFoundWindow, foundSurface); } |