From 904739c40596cb4e9e9d48c89b1d864051237441 Mon Sep 17 00:00:00 2001 From: nyorain Date: Mon, 19 Jun 2017 17:46:50 +0200 Subject: 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). --- include/backend/wayland.h | 5 +++-- include/wlr/backend/wayland.h | 11 ++++------- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'include') 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 #include #include +#include -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 #include -#include +#include -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 -- cgit v1.2.3