cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xwayland: fix crash when trying to initialize without Xwayland installed (#9077)

Browse source
This commit is contained in:
Zach DeCook 2025-01-20 13:40:51 -05:00 • committed by GitHub
parent 9e8d9791c7
commit a661203bb6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 41 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/xwayland/XWayland.cpp
View file

@ -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
// 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 (!enabled) {
unsetenv("DISPLAY");
return;
}
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;
}