From 24aaf3353c9682106de8f1cd7f1cc97679f2630e Mon Sep 17 00:00:00 2001
From: Maximilian Seidler <paideia_dilemma@losfuzzys.net>
Date: Wed, 26 Feb 2025 10:30:45 +0100
Subject: [PATCH] core: use hyprutils CProcess

---
 src/core/Hypridle.cpp | 33 +++++----------------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/src/core/Hypridle.cpp b/src/core/Hypridle.cpp
index a5464dd..b775d16 100644
--- a/src/core/Hypridle.cpp
+++ b/src/core/Hypridle.cpp
@@ -10,6 +10,7 @@
 #include <algorithm>
 #include <thread>
 #include <mutex>
+#include <hyprutils/os/Process.hpp>
 
 CHypridle::CHypridle() {
     m_sWaylandState.display = wl_display_connect(nullptr);
@@ -19,19 +20,7 @@ CHypridle::CHypridle() {
     }
 }
 
-static void setupSignals() {
-    struct sigaction sa;
-
-    // don't transform child processes into zombies and don't handle SIGCHLD.
-    sigemptyset(&sa.sa_mask);
-    sa.sa_flags   = SA_NOCLDSTOP | SA_NOCLDWAIT | SA_RESTART;
-    sa.sa_handler = SIG_DFL;
-    sigaction(SIGCHLD, &sa, nullptr);
-}
-
 void CHypridle::run() {
-    setupSignals();
-
     m_sWaylandState.registry = makeShared<CCWlRegistry>((wl_proxy*)wl_display_get_registry(m_sWaylandState.display));
     m_sWaylandState.registry->setGlobal([this](CCWlRegistry* r, uint32_t name, const char* interface, uint32_t version) {
         const std::string IFACE = interface;
@@ -247,25 +236,13 @@ void CHypridle::enterEventLoop() {
 static void spawn(const std::string& args) {
     Debug::log(LOG, "Executing {}", args);
 
-    pid_t child = fork();
-    if (child < 0) {
-        Debug::log(ERR, "Failed to fork");
+    Hyprutils::OS::CProcess proc("/bin/sh", {"-c", args});
+    if (!proc.runAsync()) {
+        Debug::log(ERR, "Failed run \"{}\"", args);
         return;
-    } else if (child == 0) {
-        setsid();
-
-        struct sigaction sa;
-        // reset signals to the default
-        sigemptyset(&sa.sa_mask);
-        sa.sa_flags   = 0;
-        sa.sa_handler = SIG_DFL;
-        sigaction(SIGCHLD, &sa, nullptr);
-
-        execl("/bin/sh", "/bin/sh", "-c", args.c_str(), nullptr);
-        _exit(1);
     }
 
-    Debug::log(LOG, "Process Created with pid {}", child);
+    Debug::log(LOG, "Process Created with pid {}", proc.pid());
 }
 
 void CHypridle::onIdled(SIdleListener* pListener) {