From eff3bfe261e90b8950b59379ca7815f735a7aab6 Mon Sep 17 00:00:00 2001 From: fazzi <18248986+fxzzi@users.noreply.github.com> Date: Mon, 4 May 2026 17:00:56 +0100 Subject: windows/focus: add fallbacks when focussing workspaces (#14270) --- src/desktop/Workspace.cpp | 12 ++++++++++++ src/desktop/Workspace.hpp | 1 + src/desktop/state/FocusState.cpp | 8 ++++++-- 3 files changed, 19 insertions(+), 2 deletions(-) (limited to 'src/desktop') diff --git a/src/desktop/Workspace.cpp b/src/desktop/Workspace.cpp index 60d8d985..23ea0dd7 100644 --- a/src/desktop/Workspace.cpp +++ b/src/desktop/Workspace.cpp @@ -83,6 +83,18 @@ PHLWINDOW CWorkspace::getLastFocusedWindow() { return m_lastFocusedWindow.lock(); } +PHLWINDOW CWorkspace::getFocusCandidate() { + auto pWindow = getLastFocusedWindow(); + + if (!pWindow) + pWindow = getTopLeftWindow(); + + if (!pWindow) + pWindow = getFirstWindow(); + + return pWindow; +} + std::string CWorkspace::getConfigName() { if (m_isSpecialWorkspace) { return m_name; diff --git a/src/desktop/Workspace.hpp b/src/desktop/Workspace.hpp index d778324d..1ccf1454 100644 --- a/src/desktop/Workspace.hpp +++ b/src/desktop/Workspace.hpp @@ -61,6 +61,7 @@ class CWorkspace { bool inert(); MONITORID monitorID(); PHLWINDOW getLastFocusedWindow(); + PHLWINDOW getFocusCandidate(); std::string getConfigName(); bool matchesStaticSelector(const std::string& selector); void markInert(); diff --git a/src/desktop/state/FocusState.cpp b/src/desktop/state/FocusState.cpp index 5db4bac5..5dd22f94 100644 --- a/src/desktop/state/FocusState.cpp +++ b/src/desktop/state/FocusState.cpp @@ -167,8 +167,12 @@ void CFocusState::rawWindowFocus(PHLWINDOW pWindow, eFocusReason reason, SPm_pinned) + rawMonitorFocus(PMONITOR); + + const auto PLASTWINDOW = m_focusWindow.lock(); + m_focusWindow = pWindow; + pWindow->m_workspace->m_lastFocusedWindow = pWindow; /* If special fallthrough is enabled, this behavior will be disabled, as I have no better idea of nicely tracking which window focuses are "via keybinds" and which ones aren't. */ -- cgit v1.2.3