From ebdabc203072c855f9e28a679630c8decc6911ff Mon Sep 17 00:00:00 2001
From: Cedric Sodhi <manday@openmail.cc>
Date: Fri, 9 Mar 2018 15:17:15 +0100
Subject: Make X11 fully optional

Make X11 Backend (in addition to XWayland) optional and small bug fix on XWayland includes.
---
 backend/backend.c   | 2 ++
 backend/meson.build | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'backend')

diff --git a/backend/backend.c b/backend/backend.c
index c67be617..58ac756e 100644
--- a/backend/backend.c
+++ b/backend/backend.c
@@ -94,6 +94,7 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) {
 		}
 	}
 
+#ifdef WLR_HAS_X11_BACKEND
 	const char *x11_display = getenv("DISPLAY");
 	if (x11_display) {
 		struct wlr_backend *x11_backend =
@@ -101,6 +102,7 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) {
 		wlr_multi_backend_add(backend, x11_backend);
 		return backend;
 	}
+#endif
 
 	// Attempt DRM+libinput
 	struct wlr_session *session = wlr_session_create(display);
diff --git a/backend/meson.build b/backend/meson.build
index c0ed76f1..a74ea024 100644
--- a/backend/meson.build
+++ b/backend/meson.build
@@ -24,7 +24,6 @@ backend_files = files(
 	'wayland/output.c',
 	'wayland/registry.c',
 	'wayland/wl_seat.c',
-	'x11/backend.c',
 )
 
 backend_deps = [
@@ -50,6 +49,10 @@ if conf_data.get('WLR_HAS_SYSTEMD', false)
 	backend_deps += systemd
 endif
 
+if conf_data.get('WLR_HAS_X11_BACKEND', false)
+	backend_files += files('x11/backend.c')
+endif
+
 if conf_data.get('WLR_HAS_ELOGIND', false)
 	backend_files += files('session/logind.c')
 	backend_deps += elogind
-- 
cgit v1.2.3


From 51141dd11e9adfb1d26e22166adc2a4c9c10bcfe Mon Sep 17 00:00:00 2001
From: Cedric Sodhi <manday@openmail.cc>
Date: Fri, 23 Mar 2018 10:28:36 +0100
Subject: Minor corrections

---
 backend/backend.c | 4 +++-
 meson.build       | 2 +-
 meson_options.txt | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'backend')

diff --git a/backend/backend.c b/backend/backend.c
index 58ac756e..96e155dc 100644
--- a/backend/backend.c
+++ b/backend/backend.c
@@ -11,7 +11,9 @@
 #include <wlr/backend/multi.h>
 #include <wlr/backend/session.h>
 #include <wlr/backend/wayland.h>
-#include <wlr/backend/x11.h>
+#ifdef WLR_HAS_X11_BACKEND
+#    include <wlr/backend/x11.h>
+#endif
 #include <wlr/util/log.h>
 
 void wlr_backend_init(struct wlr_backend *backend,
diff --git a/meson.build b/meson.build
index e7fa9890..e3c9a315 100644
--- a/meson.build
+++ b/meson.build
@@ -185,7 +185,7 @@ summary = [
 	'     systemd: @0@'.format(conf_data.get('WLR_HAS_SYSTEMD', false)),
 	'     elogind: @0@'.format(conf_data.get('WLR_HAS_ELOGIND', false)),
 	'    xwayland: @0@'.format(conf_data.get('WLR_HAS_XWAYLAND', false)),
-	' x11_backend: @0@'.format(conf_data.get('WLR_HAS_X11BACKEND', false)),
+	' x11_backend: @0@'.format(conf_data.get('WLR_HAS_X11_BACKEND', false)),
 	'   xcb-icccm: @0@'.format(conf_data.get('WLR_HAS_XCB_ICCCM', false)),
 	'  xcb-errors: @0@'.format(conf_data.get('WLR_HAS_XCB_ERRORS', false)),
 	'----------------',
diff --git a/meson_options.txt b/meson_options.txt
index dae22b55..9e8567d0 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,4 +3,4 @@ option('enable_systemd', type: 'combo', choices: ['auto', 'true', 'false'], valu
 option('enable_elogind', type: 'combo', choices: ['auto', 'true', 'false'], value: 'auto', description: 'Enable support for logind')
 option('enable_xcb_errors', type: 'combo', choices: ['auto', 'true', 'false'], value: 'auto', description: 'Use xcb-errors util library')
 option('enable_xwayland', type: 'boolean', value: true, description: 'Enable support X11 applications')
-option('enable_x11_backend', type: 'boolean', value: false, description: 'Enable X11 backend')
+option('enable_x11_backend', type: 'boolean', value: true, description: 'Enable X11 backend')
-- 
cgit v1.2.3


From 706f77e3c735e49b4a051d545f40043a53e1ea2c Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Mon, 26 Mar 2018 23:15:21 -0400
Subject: Address review feedback

---
 backend/backend.c | 2 +-
 rootston/input.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'backend')

diff --git a/backend/backend.c b/backend/backend.c
index 96e155dc..02b0b9af 100644
--- a/backend/backend.c
+++ b/backend/backend.c
@@ -12,7 +12,7 @@
 #include <wlr/backend/session.h>
 #include <wlr/backend/wayland.h>
 #ifdef WLR_HAS_X11_BACKEND
-#    include <wlr/backend/x11.h>
+#include <wlr/backend/x11.h>
 #endif
 #include <wlr/util/log.h>
 
diff --git a/rootston/input.c b/rootston/input.c
index 27ad1f6b..962be9fa 100644
--- a/rootston/input.c
+++ b/rootston/input.c
@@ -6,7 +6,7 @@
 #include <wlr/util/log.h>
 #include <wlr/xcursor.h>
 #ifdef WLR_HAS_XWAYLAND
-#    include <wlr/xwayland.h>
+#include <wlr/xwayland.h>
 #endif
 #include "rootston/config.h"
 #include "rootston/input.h"
-- 
cgit v1.2.3