monitor: cleanup and modernize scheduleDone

2 files changed, 16 insertions, 13 deletions

diff --git a/src/helpers/Monitor.cpp b/src/helpers/Monitor.cpp
index a9569699..03a1d92b 100644
--- a/src/helpers/Monitor.cpp
+++ b/src/helpers/Monitor.cpp
@@ -12,6 +12,7 @@
 #include "../protocols/DRMSyncobj.hpp"
 #include "../protocols/core/Output.hpp"
 #include "../managers/PointerManager.hpp"
+#include "../managers/eventLoop/EventLoopManager.hpp"
 #include "../protocols/core/Compositor.hpp"
 #include "sync/SyncTimeline.hpp"
 #include <aquamarine/output/Output.hpp>
@@ -789,20 +790,22 @@ CBox CMonitor::logicalBox() {
     return {vecPosition, vecSize};
 }
 
-static void onDoneSource(void* data) {
-    auto pMonitor = (CMonitor*)data;
-
-    if (!PROTO::outputs.contains(pMonitor->szName))
+void CMonitor::scheduleDone() {
+    if (doneScheduled)
         return;
 
-    PROTO::outputs.at(pMonitor->szName)->sendDone();
-}
+    doneScheduled = true;
 
-void CMonitor::scheduleDone() {
-    if (doneSource)
-        return;
+    g_pEventLoopManager->doLater([M = self] {
+        if (!M) // if M is gone, we got destroyed, doesn't matter.
+            return;
+
+        if (!PROTO::outputs.contains(M->szName))
+            return;
 
-    doneSource = wl_event_loop_add_idle(g_pCompositor->m_sWLEventLoop, ::onDoneSource, this);
+        PROTO::outputs.at(M->szName)->sendDone();
+        M->doneScheduled = false;
+    });
 }
 
 bool CMonitor::attemptDirectScanout() {
diff --git a/src/helpers/Monitor.hpp b/src/helpers/Monitor.hpp
index 97d9f8ab..2a2edab6 100644
--- a/src/helpers/Monitor.hpp
+++ b/src/helpers/Monitor.hpp
@@ -190,10 +190,10 @@ class CMonitor {
     }
 
   private:
-    void             setupDefaultWS(const SMonitorRule&);
-    WORKSPACEID      findAvailableDefaultWS();
+    void        setupDefaultWS(const SMonitorRule&);
+    WORKSPACEID findAvailableDefaultWS();
 
-    wl_event_source* doneSource = nullptr;
+    bool        doneScheduled = false;
 
     struct {
         CHyprSignalListener frame;