aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
authorMarkus Ongyerth <ongy@ongy.net>2018-01-13 21:20:15 +0100
committerMarkus Ongyerth <ongy@ongy.net>2018-01-13 21:20:15 +0100
commitc00e9d1416e609543b41d15550841a10a9b38632 (patch)
tree028e699f2deeff3e8fc018d26944a6f45f6a81f6 /backend
parent03faf17942432027aaeb12e624e089de7673c209 (diff)
adds remote argument to wayland backend create
Add a remote display name argument to wlr_wl_backend_create. If NULL is passed to the wayland backend at all times, creating a wayland backend *after* the compositor was started up, would require changing the WAYLAND_DISPLAY environment variable.
Diffstat (limited to 'backend')
-rw-r--r--backend/backend.c2
-rw-r--r--backend/wayland/backend.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/backend/backend.c b/backend/backend.c
index 6b32bc6a..54e1cdca 100644
--- a/backend/backend.c
+++ b/backend/backend.c
@@ -53,7 +53,7 @@ struct wlr_egl *wlr_backend_get_egl(struct wlr_backend *backend) {
}
static struct wlr_backend *attempt_wl_backend(struct wl_display *display) {
- struct wlr_backend *backend = wlr_wl_backend_create(display);
+ struct wlr_backend *backend = wlr_wl_backend_create(display, NULL);
if (backend) {
int outputs = 1;
const char *_outputs = getenv("WLR_WL_OUTPUTS");
diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c
index 36fbd8e0..32fdc2b6 100644
--- a/backend/wayland/backend.c
+++ b/backend/wayland/backend.c
@@ -158,7 +158,7 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) {
wlr_wl_backend_destroy(&backend->backend);
}
-struct wlr_backend *wlr_wl_backend_create(struct wl_display *display) {
+struct wlr_backend *wlr_wl_backend_create(struct wl_display *display, const char *remote) {
wlr_log(L_INFO, "Creating wayland backend");
struct wlr_wl_backend *backend = calloc(1, sizeof(struct wlr_wl_backend));
@@ -173,7 +173,7 @@ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display) {
backend->local_display = display;
- backend->remote_display = wl_display_connect(NULL);
+ backend->remote_display = wl_display_connect(remote);
if (!backend->remote_display) {
wlr_log_errno(L_ERROR, "Could not connect to remote display");
return false;