Merge upstream

1 files changed, 15 insertions, 20 deletions

diff --git a/src/managers/ThreadManager.cpp b/src/managers/ThreadManager.cpp
index fa3d0d4e..3ca4d550 100644
--- a/src/managers/ThreadManager.cpp
+++ b/src/managers/ThreadManager.cpp
@@ -1,34 +1,29 @@
 #include "ThreadManager.hpp"
 #include "../debug/HyprCtl.hpp"
+#include "../Compositor.hpp"
 
-CThreadManager::CThreadManager() {
-    m_tMainThread = new std::thread([&]() {
-        // Call the handle method.
-        this->handle();
-    });
+int slowUpdate = 0;
 
-    m_tMainThread->detach(); // detach and continue.
-}
+int handleTimer(void* data) {
+    const auto PTM = (CThreadManager*)data;
 
-CThreadManager::~CThreadManager() {
-    //
-}
+    g_pConfigManager->tick();
 
-int slowUpdate = 0;
+    wl_event_source_timer_update(PTM->m_esConfigTimer, 1000);
 
-void CThreadManager::handle() {
+    return 0;
+}
 
+CThreadManager::CThreadManager() {
     g_pConfigManager->init();
 
     HyprCtl::startHyprCtlSocket();
 
-    while (3.1415f) {
-        slowUpdate++;
-        if (slowUpdate >= g_pConfigManager->getInt("general:max_fps")){
-            g_pConfigManager->tick();
-            slowUpdate = 0;
-        }
+    m_esConfigTimer = wl_event_loop_add_timer(g_pCompositor->m_sWLEventLoop, handleTimer, this);
+
+    wl_event_source_timer_update(m_esConfigTimer, 1000);
+}
 
-        std::this_thread::sleep_for(std::chrono::microseconds(1000000 / g_pConfigManager->getInt("general:max_fps")));
-    }
+CThreadManager::~CThreadManager() {
+    //
 }
\ No newline at end of file