summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZach DeCook <zachdecook@librem.one>2025-01-20 13:40:51 -0500
committerGitHub <noreply@github.com>2025-01-20 18:40:51 +0000
commita661203bb6d4714b211572759e2f74b1da194972 (patch)
tree7b2b18e5f84197e18ed54c48dff762e6aa7b2ed7 /src
parent9e8d9791c7f9b7d1183110da370772a8b2c1b6f4 (diff)
xwayland: fix crash when trying to initialize without Xwayland installed (#9077)
Diffstat (limited to 'src')
-rw-r--r--src/Compositor.cpp2
-rw-r--r--src/Compositor.hpp2
-rw-r--r--src/config/ConfigManager.cpp22
-rw-r--r--src/xwayland/XWayland.cpp34
-rw-r--r--src/xwayland/XWayland.hpp6
5 files changed, 41 insertions, 25 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 325bd882..cd0c7c61 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -669,7 +669,7 @@ void CCompositor::initManagers(eManagersInitStage stage) {
g_pDonationNagManager = std::make_unique<CDonationNagManager>();
Debug::log(LOG, "Starting XWayland");
- g_pXWayland = std::make_unique<CXWayland>(g_pCompositor->m_bEnableXwayland);
+ g_pXWayland = std::make_unique<CXWayland>(g_pCompositor->m_bWantsXwayland);
} break;
default: UNREACHABLE();
}
diff --git a/src/Compositor.hpp b/src/Compositor.hpp
index 430e583c..ebcca5d0 100644
--- a/src/Compositor.hpp
+++ b/src/Compositor.hpp
@@ -74,7 +74,7 @@ class CCompositor {
bool m_bIsShuttingDown = false;
bool m_bFinalRequests = false;
bool m_bDesktopEnvSet = false;
- bool m_bEnableXwayland = true;
+ bool m_bWantsXwayland = true;
// ------------------------------------------------- //
diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp
index 0347ced4..40f8d9ef 100644
--- a/src/config/ConfigManager.cpp
+++ b/src/config/ConfigManager.cpp
@@ -950,26 +950,16 @@ void CConfigManager::postConfigReload(const Hyprlang::CParseResult& result) {
}
#ifndef NO_XWAYLAND
- const auto PENABLEXWAYLAND = std::any_cast<Hyprlang::INT>(m_pConfig->getConfigValue("xwayland:enabled"));
+ const auto PENABLEXWAYLAND = std::any_cast<Hyprlang::INT>(m_pConfig->getConfigValue("xwayland:enabled"));
+ g_pCompositor->m_bWantsXwayland = PENABLEXWAYLAND;
// enable/disable xwayland usage
if (!isFirstLaunch) {
- bool prevEnabledXwayland = g_pCompositor->m_bEnableXwayland;
- if (PENABLEXWAYLAND != prevEnabledXwayland) {
- g_pCompositor->m_bEnableXwayland = PENABLEXWAYLAND;
- if (PENABLEXWAYLAND) {
- Debug::log(LOG, "xwayland has been enabled");
- } else {
- Debug::log(LOG, "xwayland has been disabled, cleaning up...");
- for (auto& w : g_pCompositor->m_vWindows) {
- if (w->m_pXDGSurface || !w->m_bIsX11)
- continue;
- g_pCompositor->closeWindow(w);
- }
- }
- g_pXWayland = std::make_unique<CXWayland>(g_pCompositor->m_bEnableXwayland);
+ bool prevEnabledXwayland = g_pXWayland->enabled();
+ if (g_pCompositor->m_bWantsXwayland != prevEnabledXwayland) {
+ g_pXWayland = std::make_unique<CXWayland>(g_pCompositor->m_bWantsXwayland);
}
} else
- g_pCompositor->m_bEnableXwayland = PENABLEXWAYLAND;
+ g_pCompositor->m_bWantsXwayland = PENABLEXWAYLAND;
#endif
if (!isFirstLaunch && !g_pCompositor->m_bUnsafeState)
diff --git a/src/xwayland/XWayland.cpp b/src/xwayland/XWayland.cpp
index 8cdb1fca..6b8a630b 100644
--- a/src/xwayland/XWayland.cpp
+++ b/src/xwayland/XWayland.cpp
@@ -1,21 +1,39 @@
#include "XWayland.hpp"
+#include "../Compositor.hpp"
#include "../debug/Log.hpp"
+#include "../helpers/fs/FsUtils.hpp"
-CXWayland::CXWayland(const bool enabled) {
+CXWayland::CXWayland(const bool wantsEnabled) {
#ifndef NO_XWAYLAND
- Debug::log(LOG, "Starting up the XWayland server");
-
- pServer = std::make_unique<CXWaylandServer>();
-
- if (!enabled) {
+ // Disable Xwayland and clean up if the user disabled it.
+ if (!wantsEnabled) {
+ Debug::log(LOG, "XWayland has been disabled, cleaning up...");
+ for (auto& w : g_pCompositor->m_vWindows) {
+ if (!w->m_bIsX11)
+ continue;
+ g_pCompositor->closeWindow(w);
+ }
unsetenv("DISPLAY");
+ m_enabled = false;
+ return;
+ }
+
+ if (!NFsUtils::executableExistsInPath("Xwayland")) {
+ // If Xwayland doesn't exist, don't try to start it.
+ Debug::log(LOG, "Unable to find XWayland; not starting it.");
return;
}
+ Debug::log(LOG, "Starting up the XWayland server");
+
+ pServer = std::make_unique<CXWaylandServer>();
+
if (!pServer->create()) {
Debug::log(ERR, "XWayland failed to start: it will not work.");
return;
}
+
+ m_enabled = true;
#else
Debug::log(LOG, "Not starting XWayland: disabled at compile time");
#endif
@@ -31,3 +49,7 @@ void CXWayland::setCursor(unsigned char* pixData, uint32_t stride, const Vector2
pWM->setCursor(pixData, stride, size, hotspot);
#endif
}
+
+bool CXWayland::enabled() {
+ return m_enabled;
+}
diff --git a/src/xwayland/XWayland.hpp b/src/xwayland/XWayland.hpp
index 113ca4d4..8347a6a7 100644
--- a/src/xwayland/XWayland.hpp
+++ b/src/xwayland/XWayland.hpp
@@ -17,18 +17,22 @@ class CXWM;
class CXWayland {
public:
- CXWayland(const bool enabled);
+ CXWayland(const bool wantsEnabled);
#ifndef NO_XWAYLAND
std::unique_ptr<CXWaylandServer> pServer;
std::unique_ptr<CXWM> pWM;
#endif
+ bool enabled();
void setCursor(unsigned char* pixData, uint32_t stride, const Vector2D& size, const Vector2D& hotspot);
struct {
CSignal newSurface;
} events;
+
+ private:
+ bool m_enabled = false;
};
inline std::unique_ptr<CXWayland> g_pXWayland;