diff options
| author | Vaxry <43317083+vaxerski@users.noreply.github.com> | 2022-10-27 11:26:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-27 11:26:35 +0100 |
| commit | d5a0610ea26c7086301db1c397a4d5b48ad469b4 (patch) | |
| tree | ea006320d41f423cb865700a14729f8111dfeb26 /src/managers/XWaylandManager.cpp | |
| parent | 4aebb73de005e50bb08bacb0bb26ea89e0bd2818 (diff) | |
No xwayland overhaul (#920)
Diffstat (limited to 'src/managers/XWaylandManager.cpp')
| -rw-r--r-- | src/managers/XWaylandManager.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/managers/XWaylandManager.cpp b/src/managers/XWaylandManager.cpp index 4a0b397d..89bb6871 100644 --- a/src/managers/XWaylandManager.cpp +++ b/src/managers/XWaylandManager.cpp @@ -3,23 +3,23 @@ #include "../events/Events.hpp" CHyprXWaylandManager::CHyprXWaylandManager() { - if (XWAYLAND) { - m_sWLRXWayland = wlr_xwayland_create(g_pCompositor->m_sWLDisplay, g_pCompositor->m_sWLRCompositor, 1); +#ifndef NO_XWAYLAND + m_sWLRXWayland = wlr_xwayland_create(g_pCompositor->m_sWLDisplay, g_pCompositor->m_sWLRCompositor, 1); - if (!m_sWLRXWayland) { - Debug::log(ERR, "Couldn't start up the XWaylandManager because wlr_xwayland_create returned a nullptr!"); - return; - } + if (!m_sWLRXWayland) { + Debug::log(ERR, "Couldn't start up the XWaylandManager because wlr_xwayland_create returned a nullptr!"); + return; + } - addWLSignal(&m_sWLRXWayland->events.ready, &Events::listen_readyXWayland, m_sWLRXWayland, "XWayland Manager"); - addWLSignal(&m_sWLRXWayland->events.new_surface, &Events::listen_surfaceXWayland, m_sWLRXWayland, "XWayland Manager"); + addWLSignal(&m_sWLRXWayland->events.ready, &Events::listen_readyXWayland, m_sWLRXWayland, "XWayland Manager"); + addWLSignal(&m_sWLRXWayland->events.new_surface, &Events::listen_surfaceXWayland, m_sWLRXWayland, "XWayland Manager"); - setenv("DISPLAY", m_sWLRXWayland->display_name, 1); + setenv("DISPLAY", m_sWLRXWayland->display_name, 1); - Debug::log(LOG, "CHyprXWaylandManager started on display %s", m_sWLRXWayland->display_name); - } else { - unsetenv("DISPLAY"); // unset DISPLAY so that X11 apps do not try to start on a different/invalid DISPLAY - } + Debug::log(LOG, "CHyprXWaylandManager started on display %s", m_sWLRXWayland->display_name); +#else + unsetenv("DISPLAY"); // unset DISPLAY so that X11 apps do not try to start on a different/invalid DISPLAY +#endif } CHyprXWaylandManager::~CHyprXWaylandManager() { |