hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-22 23:06:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

avoid using wayland-0 as a socket name

Browse source
This commit is contained in:
vaxerski 2022-12-05 17:21:09 +00:00
parent 66fb083003
commit 9fb24ac1e9
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Compositor.cpp
View file

@ -345,15 +345,21 @@ void CCompositor::startCompositor() {
initAllSignals(); initAllSignals();
m_szWLDisplaySocket = wl_display_add_socket_auto(m_sWLDisplay); // get socket, avoid using 0
for (int candidate = 1; candidate <= 32; candidate++) {
if (wl_display_add_socket(m_sWLDisplay, ("wayland-" + std::to_string(candidate)).c_str()) >= 0) {
m_szWLDisplaySocket = "wayland-" + std::to_string(candidate);
break;
}
}
if (!m_szWLDisplaySocket) { if (m_szWLDisplaySocket.empty()) {
Debug::log(CRIT, "m_szWLDisplaySocket NULL!"); Debug::log(CRIT, "m_szWLDisplaySocket NULL!");
wlr_backend_destroy(m_sWLRBackend); wlr_backend_destroy(m_sWLRBackend);
throw std::runtime_error("m_szWLDisplaySocket was null! (wl_display_add_socket_auto failed)"); throw std::runtime_error("m_szWLDisplaySocket was null! (wl_display_add_socket_auto failed)");
} }
setenv("WAYLAND_DISPLAY", m_szWLDisplaySocket, 1); setenv("WAYLAND_DISPLAY", m_szWLDisplaySocket.c_str(), 1);
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);

2
src/Compositor.hpp
View file

@ -76,7 +76,7 @@ public:
// ------------------------------------------------- // // ------------------------------------------------- //
const char* m_szWLDisplaySocket; std::string m_szWLDisplaySocket = "";
std::string m_szInstanceSignature = ""; std::string m_szInstanceSignature = "";
std::string m_szCurrentSplash = "error"; std::string m_szCurrentSplash = "error";