diff options
| author | nyorain <nyorain@gmail.com> | 2017-06-19 17:46:50 +0200 |
|---|---|---|
| committer | nyorain <nyorain@gmail.com> | 2017-06-19 17:46:50 +0200 |
| commit | 904739c40596cb4e9e9d48c89b1d864051237441 (patch) | |
| tree | 1b19731e758a4b0470f5a232ba939ea3ecccff0c /include | |
| parent | 325a331425c1771d16fa90d099fa33f3ab8772f3 (diff) | |
Start to fix wayland backend
Starts to update the wayland backend to the new backend api.
Not yet updated to libinput branch (not yet compiling).
Diffstat (limited to 'include')
| -rw-r--r-- | include/backend/wayland.h | 5 | ||||
| -rw-r--r-- | include/wlr/backend/wayland.h | 11 |
2 files changed, 7 insertions, 9 deletions
diff --git a/include/backend/wayland.h b/include/backend/wayland.h index 94aa0962..b576e564 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -5,8 +5,9 @@ #include <wayland-server.h> #include <wlr/common/list.h> #include <wlr/wayland.h> +#include <wlr/backend/wayland.h> -struct wlr_wl_backend { +struct wlr_backend_state { /* local state */ struct wl_display *local_display; /* remote state */ @@ -19,7 +20,7 @@ struct wlr_wl_backend { list_t *outputs; }; -void wlr_wlb_registry_poll(struct wlr_wl_backend *backend); +void wlr_wlb_registry_poll(struct wlr_backend_state *backend); extern const struct wl_seat_listener seat_listener; extern const struct wl_output_listener output_listener; diff --git a/include/wlr/backend/wayland.h b/include/wlr/backend/wayland.h index 4318cc26..83b465c1 100644 --- a/include/wlr/backend/wayland.h +++ b/include/wlr/backend/wayland.h @@ -1,14 +1,11 @@ -#ifndef _WLR_BACKEND_WAYLAND_INTERNAL_H -#define _WLR_BACKEND_WAYLAND_INTERNAL_H +#ifndef WLR_BACKEND_WAYLAND_H +#define WLR_BACKEND_WAYLAND_H #include <wayland-client.h> #include <wayland-server.h> -#include <wlr/wayland.h> +#include <wlr/backend.h> -struct wlr_wl_backend; - -void wlr_wl_backend_free(struct wlr_wl_backend *backend); -struct wlr_wl_backend *wlr_wl_backend_init(struct wl_display *display, +struct wlr_backend *wlr_wl_backend_create(struct wl_display *display, size_t outputs); #endif |