summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVaxry <vaxry@vaxry.net>2025-12-17 19:26:10 +0000
committerVaxry <vaxry@vaxry.net>2025-12-17 19:26:25 +0000
commitf88deb928a0f7dc02f427473f8c29e8f2bed14a3 (patch)
treec860f3c984c662d059497226ca19e4d50a3b5af6 /src
parent18901b8e593ebd05a7134dcdb8a7774206cf5646 (diff)
compositor: warn on start via a log about start-hyprland
Diffstat (limited to 'src')
-rw-r--r--src/Compositor.cpp3
-rw-r--r--src/Compositor.hpp2
-rw-r--r--src/main.cpp8
3 files changed, 10 insertions, 3 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 00e5a2d8..f4e92ee9 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -142,8 +142,9 @@ static void aqLog(Aquamarine::eBackendLogLevel level, std::string msg) {
Debug::log(aqLevelToHl(level), "[AQ] {}", msg);
}
-void CCompositor::setWatchdogFd(int fd) {
+bool CCompositor::setWatchdogFd(int fd) {
m_watchdogWriteFd = Hyprutils::OS::CFileDescriptor{fd};
+ return m_watchdogWriteFd.isValid() && !m_watchdogWriteFd.isClosed();
}
void CCompositor::bumpNofile() {
diff --git a/src/Compositor.hpp b/src/Compositor.hpp
index ca65a12d..7671d8f0 100644
--- a/src/Compositor.hpp
+++ b/src/Compositor.hpp
@@ -67,7 +67,7 @@ class CCompositor {
void cleanup();
void bumpNofile();
void restoreNofile();
- void setWatchdogFd(int fd);
+ bool setWatchdogFd(int fd);
bool m_readyToProcess = false;
bool m_sessionActive = true;
diff --git a/src/main.cpp b/src/main.cpp
index ed436934..49d44a09 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -211,10 +211,16 @@ int main(int argc, char** argv) {
reapZombieChildrenAutomatically();
+ bool watchdogOk = watchdogFd > 0;
+
if (watchdogFd > 0)
- g_pCompositor->setWatchdogFd(watchdogFd);
+ watchdogOk = g_pCompositor->setWatchdogFd(watchdogFd);
if (safeMode)
g_pCompositor->m_safeMode = true;
+
+ if (!watchdogOk)
+ Debug::log(WARN, "WARNING: Hyprland is being launched without start-hyprland. This is highly advised against.");
+
g_pCompositor->initServer(socketName, socketFd);
if (verifyConfig)