1 files changed, 39 insertions, 41 deletions

diff --git a/src/desktop/history/WorkspaceHistoryTracker.cpp b/src/desktop/history/WorkspaceHistoryTracker.cpp
index bfedda13..0b4ef2fd 100644
--- a/src/desktop/history/WorkspaceHistoryTracker.cpp
+++ b/src/desktop/history/WorkspaceHistoryTracker.cpp
@@ -2,9 +2,13 @@
 
 #include "../../helpers/Monitor.hpp"
 #include "../Workspace.hpp"
+#include "../state/FocusState.hpp"
 #include "../../managers/HookSystemManager.hpp"
+#include "../../managers/eventLoop/EventLoopManager.hpp"
 #include "../../config/ConfigValue.hpp"
 
+#include <hyprutils/utils/ScopeGuard.hpp>
+
 using namespace Desktop;
 using namespace Desktop::History;
 
@@ -19,22 +23,16 @@ CWorkspaceHistoryTracker::CWorkspaceHistoryTracker() {
         track(workspace);
     });
 
-    static auto P1 = g_pHookSystem->hookDynamic("monitorAdded", [this](void* self, SCallbackInfo& info, std::any data) {
+    static auto P1 = g_pHookSystem->hookDynamic("focusedMon", [this](void* self, SCallbackInfo& info, std::any data) {
         auto mon = std::any_cast<PHLMONITOR>(data);
-        track(mon);
-    });
-}
-
-CWorkspaceHistoryTracker::SMonitorData& CWorkspaceHistoryTracker::dataFor(PHLMONITOR mon) {
-    for (auto& ref : m_monitorDatas) {
-        if (ref.monitor != mon)
-            continue;
 
-        return ref;
-    }
-
-    return m_monitorDatas.emplace_back(SMonitorData{
-        .monitor = mon,
+        // This sucks ASS, but we have to do this because switching to a workspace on another mon will trigger a workspace event right afterwards and we don't
+        // want to remember the workspace that was not visible there
+        // TODO: do something about this
+        g_pEventLoopManager->doLater([this, mon = PHLMONITORREF{mon}] {
+            if (mon)
+                track(mon->m_activeWorkspace);
+        });
     });
 }
 
@@ -52,44 +50,32 @@ CWorkspaceHistoryTracker::SWorkspacePreviousData& CWorkspaceHistoryTracker::data
 }
 
 void CWorkspaceHistoryTracker::track(PHLWORKSPACE w) {
-    if (!w->m_monitor)
+    if (!w || !w->m_monitor || w == m_lastWorkspaceData.workspace)
         return;
 
-    static auto PALLOWWORKSPACECYCLES = CConfigValue<Hyprlang::INT>("binds:allow_workspace_cycles");
+    static auto                   PALLOWWORKSPACECYCLES = CConfigValue<Hyprlang::INT>("binds:allow_workspace_cycles");
 
-    auto&       data    = dataFor(w);
-    auto&       monData = dataFor(w->m_monitor.lock());
+    auto&                         data = dataFor(w);
 
-    if (!monData.workspace) {
-        data.previous.reset();
-        data.previousID   = WORKSPACE_INVALID;
-        data.previousName = "";
-        return;
-    }
+    Hyprutils::Utils::CScopeGuard x([&] { setLastWorkspaceData(w); });
 
-    if (monData.workspace == w && !*PALLOWWORKSPACECYCLES) {
-        track(w->m_monitor.lock());
+    if (m_lastWorkspaceData.workspace == w && !*PALLOWWORKSPACECYCLES)
         return;
-    }
-
-    data.previous     = monData.workspace;
-    data.previousName = monData.workspace->m_name;
-    data.previousID   = monData.workspace->m_id;
-    data.previousMon  = monData.workspace->m_monitor;
 
-    track(w->m_monitor.lock());
-}
-
-void CWorkspaceHistoryTracker::track(PHLMONITOR mon) {
-    auto& data         = dataFor(mon);
-    data.workspace     = mon->m_activeWorkspace;
-    data.workspaceName = mon->m_activeWorkspace ? mon->m_activeWorkspace->m_name : "";
-    data.workspaceID   = mon->activeWorkspaceID();
+    data.previous = m_lastWorkspaceData.workspace;
+    if (m_lastWorkspaceData.workspace) {
+        data.previousName = m_lastWorkspaceData.workspace->m_name;
+        data.previousID   = m_lastWorkspaceData.workspace->m_id;
+        data.previousMon  = m_lastWorkspaceData.workspace->m_monitor;
+    } else {
+        data.previousName = m_lastWorkspaceData.workspaceName;
+        data.previousID   = m_lastWorkspaceData.workspaceID;
+        data.previousMon  = m_lastWorkspaceData.monitor;
+    }
 }
 
 void CWorkspaceHistoryTracker::gc() {
     std::erase_if(m_datas, [](const auto& e) { return !e.workspace; });
-    std::erase_if(m_monitorDatas, [](const auto& e) { return !e.monitor; });
 }
 
 const CWorkspaceHistoryTracker::SWorkspacePreviousData* CWorkspaceHistoryTracker::previousWorkspace(PHLWORKSPACE ws) {
@@ -156,3 +142,15 @@ SWorkspaceIDName CWorkspaceHistoryTracker::previousWorkspaceIDName(PHLWORKSPACE
 
     return SWorkspaceIDName{.id = DATA->previousID, .name = DATA->previousName, .isAutoIDd = DATA->previousID <= 0};
 }
+
+void CWorkspaceHistoryTracker::setLastWorkspaceData(PHLWORKSPACE w) {
+    if (!w) {
+        m_lastWorkspaceData = {};
+        return;
+    }
+
+    m_lastWorkspaceData.workspace     = w;
+    m_lastWorkspaceData.workspaceID   = w->m_id;
+    m_lastWorkspaceData.workspaceName = w->m_name;
+    m_lastWorkspaceData.monitor       = w->m_monitor;
+}