diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-01-13 19:46:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-13 19:46:20 -0500 |
| commit | 64f6a443294996288edbff5c8ffc796fe58a2a41 (patch) | |
| tree | 1b67c9e188e44dc0ebb170e5a2c3ad749e7291f3 /backend | |
| parent | 03faf17942432027aaeb12e624e089de7673c209 (diff) | |
| parent | dfae5ff98f15ad65472cb2d39a8153ced14be1b8 (diff) | |
Merge pull request #559 from Ongy/wayland_remote
adds remote argument to wayland backend create
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/backend.c | 2 | ||||
| -rw-r--r-- | backend/wayland/backend.c | 4 |
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; |