From bebfe01d731a977c23c325dd37361f6d5f7268c2 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Wed, 20 Apr 2022 15:58:02 +0200 Subject: Added a custom NO_XWAYLAND flag --- src/managers/XWaylandManager.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src/managers/XWaylandManager.cpp') diff --git a/src/managers/XWaylandManager.cpp b/src/managers/XWaylandManager.cpp index 1c242a78..fcb72ef5 100644 --- a/src/managers/XWaylandManager.cpp +++ b/src/managers/XWaylandManager.cpp @@ -3,19 +3,21 @@ #include "../events/Events.hpp" CHyprXWaylandManager::CHyprXWaylandManager() { - m_sWLRXWayland = wlr_xwayland_create(g_pCompositor->m_sWLDisplay, g_pCompositor->m_sWLRCompositor, 1); + if (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); + Debug::log(LOG, "CHyprXWaylandManager started on display %s", m_sWLRXWayland->display_name); + } } CHyprXWaylandManager::~CHyprXWaylandManager() { -- cgit v1.2.3