From 883d389bc283ac6b29b303a94f063e5575f8416f Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Thu, 21 Apr 2022 22:00:03 +0200
Subject: Make hyprctl thread safe

---
 src/debug/HyprCtl.cpp | 68 +++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 55 insertions(+), 13 deletions(-)

(limited to 'src/debug/HyprCtl.cpp')

diff --git a/src/debug/HyprCtl.cpp b/src/debug/HyprCtl.cpp
index 2c45c663..160eaff6 100644
--- a/src/debug/HyprCtl.cpp
+++ b/src/debug/HyprCtl.cpp
@@ -111,6 +111,60 @@ std::string dispatchKeyword(std::string in) {
     return retval;
 }
 
+void HyprCtl::tickHyprCtl() {
+    if (!requestMade)
+        return;
+
+    std::string reply = "";
+
+    try {
+        if (request == "monitors")
+            reply = monitorsRequest();
+        else if (request == "workspaces")
+            reply = workspacesRequest();
+        else if (request == "clients")
+            reply = clientsRequest();
+        else if (request == "activewindow")
+            reply = activeWindowRequest();
+        else if (request == "layers")
+            reply = layersRequest();
+        else if (request.find("dispatch") == 0)
+            reply = dispatchRequest(request);
+        else if (request.find("keyword") == 0)
+            reply = dispatchKeyword(request);
+    } catch (std::exception& e) {
+        Debug::log(ERR, "Error in request: %s", e.what());
+        reply = "Err: " + std::string(e.what());
+    }
+
+    request = reply;
+
+    requestMade = false;
+    requestReady = true;
+}
+
+std::string getRequestFromThread(std::string rq) {
+    while (HyprCtl::request != "" || HyprCtl::requestMade || HyprCtl::requestReady) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(5));
+    }
+
+    HyprCtl::request = rq;
+    HyprCtl::requestMade = true;
+
+    while (!HyprCtl::requestReady) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(5));
+    }
+
+    HyprCtl::requestReady = false;
+    HyprCtl::requestMade = false;
+
+    std::string toReturn = HyprCtl::request;
+
+    HyprCtl::request = "";
+
+    return toReturn;
+}
+
 void HyprCtl::startHyprCtlSocket() {
     std::thread([&]() {
         uint16_t connectPort = 9187;
@@ -164,19 +218,7 @@ void HyprCtl::startHyprCtlSocket() {
 
             std::string request(readBuffer);
 
-            std::string reply = "";
-            try {
-                if (request == "monitors") reply = monitorsRequest();
-                else if (request == "workspaces") reply = workspacesRequest();
-                else if (request == "clients") reply = clientsRequest();
-                else if (request == "activewindow") reply = activeWindowRequest();
-                else if (request == "layers") reply = layersRequest();
-                else if (request.find("dispatch") == 0) reply = dispatchRequest(request);
-                else if (request.find("keyword") == 0) reply = dispatchKeyword(request);
-            } catch (std::exception& e) {
-                Debug::log(ERR, "Error in request: %s", e.what());
-                reply = "Err: " + std::string(e.what());
-            }
+            std::string reply = getRequestFromThread(request);
             
             write(ACCEPTEDCONNECTION, reply.c_str(), reply.length());
 
-- 
cgit v1.2.3