xwayland: add option to enable/disable xwayland (#7633)
* config: add xwayland enabled option to config * xwayland: use DISPLAY env variable for enable/disable of new launches * xwayland: close X11 windows when turning of XWayland * clang: format fix * config: add better description for xwayland:enabled * xwayland: close X11 windows on disable without crashes * xwayland: better method of informing CXWayland if xwayland enabled * xwayland: prevent closing non-xwayland windows on disable * misc: loop formatting
This commit is contained in:
parent
027140b731
commit
bd6d6e7f33
8 changed files with 48 additions and 6 deletions
|
|
@ -1,12 +1,17 @@
|
|||
#include "XWayland.hpp"
|
||||
#include "../debug/Log.hpp"
|
||||
|
||||
CXWayland::CXWayland() {
|
||||
CXWayland::CXWayland(const bool enabled) {
|
||||
#ifndef NO_XWAYLAND
|
||||
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;
|
||||
|
|
@ -25,4 +30,4 @@ void CXWayland::setCursor(unsigned char* pixData, uint32_t stride, const Vector2
|
|||
|
||||
pWM->setCursor(pixData, stride, size, hotspot);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue