diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2023-01-29 12:43:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-29 12:43:18 +0000 |
| commit | ff9bcb19fa1944635d6064710f7b947bd53aa42c (patch) | |
| tree | 06cbf13c7faaa80d8061b6594cdfc9f3e052d1a4 /src | |
| parent | ce632b7a05a27d121c9544607ccd873adee8bd42 (diff) | |
Allow to disable X11 backend separately from Xwayland after 5a750b485aca (#1445)
Diffstat (limited to 'src')
| -rw-r--r-- | src/helpers/X11Stubs.hpp | 7 | ||||
| -rw-r--r-- | src/helpers/XWaylandStubs.hpp | 6 | ||||
| -rw-r--r-- | src/includes.hpp | 9 |
3 files changed, 15 insertions, 7 deletions
diff --git a/src/helpers/X11Stubs.hpp b/src/helpers/X11Stubs.hpp new file mode 100644 index 00000000..19bea6f8 --- /dev/null +++ b/src/helpers/X11Stubs.hpp @@ -0,0 +1,7 @@ +#pragma once + +inline bool wlr_backend_is_x11(void*) { + return false; +} + +inline void wlr_x11_output_create(void*) {} diff --git a/src/helpers/XWaylandStubs.hpp b/src/helpers/XWaylandStubs.hpp index 080aa807..af808074 100644 --- a/src/helpers/XWaylandStubs.hpp +++ b/src/helpers/XWaylandStubs.hpp @@ -160,9 +160,3 @@ inline void wlr_xwayland_surface_close(wlr_xwayland_surface*) {} inline void wlr_xwayland_surface_set_fullscreen(wlr_xwayland_surface*, bool) {} inline void wlr_xwayland_surface_set_minimized(wlr_xwayland_surface*, bool) {} - -inline bool wlr_backend_is_x11(void*) { - return false; -} - -inline void wlr_x11_output_create(void*) {}
\ No newline at end of file diff --git a/src/includes.hpp b/src/includes.hpp index 29737fbb..8c804ceb 100644 --- a/src/includes.hpp +++ b/src/includes.hpp @@ -105,8 +105,11 @@ extern "C" { #include <drm_fourcc.h> -#ifndef NO_XWAYLAND +#if WLR_HAS_X11_BACKEND #include <wlr/backend/x11.h> +#endif + +#ifndef NO_XWAYLAND #include <wlr/xwayland.h> #endif } @@ -127,6 +130,10 @@ extern "C" { #include <GLES3/gl3ext.h> #endif +#if !WLR_HAS_X11_BACKEND +#include "helpers/X11Stubs.hpp" +#endif + #ifdef NO_XWAYLAND #define XWAYLAND false #include "helpers/XWaylandStubs.hpp" |