diff options
| author | Tom Englund <tomenglund26@gmail.com> | 2025-12-12 00:59:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-11 23:59:47 +0000 |
| commit | 8dfdcfb35385eabb821e668d327b30ea3e483ab8 (patch) | |
| tree | f809eeb43e6c5ff0e88dd39cd48e2635d7278368 /src | |
| parent | 5700736505557363f8574f5abcc6c0f489821466 (diff) | |
compositor: dont try to focus unmapped window (#12629)
* compositor: dont try to focus unmapped window
if lastwindow is unmapped it hits getWindowInDirection and nullptr
derefs window->m_workspace. and coredumps. triggered by dual monitor and
one client on each surface with a combination of animation and
killactive / movefocus keybind.
* keybindmgr: use newly added aliveAndVisible()
use newly added aliveAndVisible() over visible()
Diffstat (limited to 'src')
| -rw-r--r-- | src/Compositor.cpp | 3 | ||||
| -rw-r--r-- | src/managers/KeybindManager.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp index a0a8c9ac..b9e2f315 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -1380,6 +1380,9 @@ PHLWINDOW CCompositor::getWindowInDirection(PHLWINDOW pWindow, char dir) { const auto WINDOWIDEALBB = pWindow->isFullscreen() ? CBox{PMONITOR->m_position, PMONITOR->m_size} : pWindow->getWindowIdealBoundingBoxIgnoreReserved(); const auto PWORKSPACE = pWindow->m_workspace; + if (!PWORKSPACE) + return nullptr; // ?? + return getWindowInDirection(WINDOWIDEALBB, PWORKSPACE, dir, pWindow, pWindow->m_isFloating); } diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp index bda1ff5a..b33ca3c1 100644 --- a/src/managers/KeybindManager.cpp +++ b/src/managers/KeybindManager.cpp @@ -1487,7 +1487,7 @@ SDispatchResult CKeybindManager::moveFocusTo(std::string args) { } const auto PLASTWINDOW = Desktop::focusState()->window(); - if (!PLASTWINDOW) { + if (!PLASTWINDOW || !PLASTWINDOW->aliveAndVisible()) { if (*PMONITORFALLBACK) tryMoveFocusToMonitor(g_pCompositor->getMonitorInDirection(arg)); |