diff options
| author | Simon Ser <contact@emersion.fr> | 2023-06-07 14:15:44 +0200 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2023-08-16 16:29:09 +0200 |
| commit | dd24991c9ef26bcd215e0601ca3a86a36e72a64b (patch) | |
| tree | 6a689b939f0438794beeaf6cdd3c25c1b6ebdf3e /include | |
| parent | 664ec59095996662ad7c158c64a2d5dfc50f58a1 (diff) | |
backend/wayland: take existing wl_display in wlr_wl_backend_create()
This allows compositors to use an existing wl_display, to integrate
wlroots with an existing toolkit.
Diffstat (limited to 'include')
| -rw-r--r-- | include/backend/wayland.h | 1 | ||||
| -rw-r--r-- | include/wlr/backend/wayland.h | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/backend/wayland.h b/include/backend/wayland.h index fd056403..1e731469 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -30,6 +30,7 @@ struct wlr_wl_backend { /* remote state */ struct wl_display *remote_display; + bool own_remote_display; struct wl_event_source *remote_display_src; struct wl_registry *registry; struct wl_compositor *compositor; diff --git a/include/wlr/backend/wayland.h b/include/wlr/backend/wayland.h index 770d6a03..45df69e1 100644 --- a/include/wlr/backend/wayland.h +++ b/include/wlr/backend/wayland.h @@ -12,12 +12,11 @@ struct wlr_input_device; * Creates a new Wayland backend. This backend will be created with no outputs; * you must use wlr_wl_output_create() to add them. * - * The `remote` argument is the name of the host compositor wayland socket. Set - * to NULL for the default behaviour (WAYLAND_DISPLAY env variable or wayland-0 - * default). + * The remote_display argument is an existing libwayland-client struct wl_display + * to use. Leave it NULL to create a new connection to the compositor. */ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display, - const char *remote); + struct wl_display *remote_display); /** * Returns the remote struct wl_display used by the Wayland backend. |