Refactor out wlr_backend_state from wl/multi

6 files changed, 22 insertions, 22 deletions

diff --git a/include/backend/drm.h b/include/backend/drm.h
index 35265e21..26e3eddb 100644
--- a/include/backend/drm.h
+++ b/include/backend/drm.h
@@ -81,8 +81,9 @@ void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer);
 
 struct wlr_drm_interface;
 
-struct wlr_backend_state {
-	struct wlr_backend *base;
+struct wlr_drm_backend_state {
+	struct wlr_backend backend;
+
 	const struct wlr_drm_interface *iface;
 
 	int fd;
diff --git a/include/backend/libinput.h b/include/backend/libinput.h
index bb83c749..0a93e1f6 100644
--- a/include/backend/libinput.h
+++ b/include/backend/libinput.h
@@ -7,8 +7,9 @@
 #include <wlr/util/list.h>
 #include "backend/udev.h"
 
-struct wlr_backend_state {
-	struct wlr_backend *backend;
+struct wlr_libinput_backend_state {
+	struct wlr_backend backend;
+
 	struct wlr_session *session;
 	struct wlr_udev *udev;
 	struct wl_display *display;
diff --git a/include/backend/multi.h b/include/backend/multi.h
index 5ac9cc1d..af747332 100644
--- a/include/backend/multi.h
+++ b/include/backend/multi.h
@@ -7,8 +7,9 @@
 #include <wlr/util/list.h>
 #include <wlr/backend/session.h>
 
-struct wlr_backend_state {
-	struct wlr_backend *backend;
+struct wlr_multi_backend {
+	struct wlr_backend backend;
+
 	struct wlr_session *session;
 	struct wlr_udev *udev;
 	list_t *backends;
diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index be96128e..3097c8cf 100644
--- a/include/backend/wayland.h
+++ b/include/backend/wayland.h
@@ -9,10 +9,11 @@
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/util/list.h>
 
-struct wlr_backend_state {
+struct wlr_wl_backend {
+	struct wlr_backend backend;
+
 	/* local state */
 	struct wl_display *local_display;
-	struct wlr_backend *backend;
 	list_t *devices;
 	list_t *outputs;
 	struct wlr_egl egl;
@@ -25,11 +26,11 @@ struct wlr_backend_state {
 	struct wl_shell *shell;
 	struct wl_shm *shm;
 	struct wl_seat *seat;
-	char *seatName;
+	char *seat_name;
 };
 
 struct wlr_output_state {
-	struct wlr_backend_state *backend;
+	struct wlr_wl_backend *backend;
 	struct wlr_output *wlr_output;
 	struct wl_surface *surface;
 	struct wl_shell_surface *shell_surface;
@@ -39,7 +40,7 @@ struct wlr_output_state {
 };
 
 struct wlr_input_device_state {
-	struct wlr_backend_state *backend;
+	struct wlr_wl_backend *backend;
 	struct wlr_input_device *wlr_device;
 	void *resource;
 };
@@ -49,8 +50,8 @@ struct wlr_pointer_state {
 	struct wlr_output *current_output;
 };
 
-void wlr_wl_registry_poll(struct wlr_backend_state *backend);
-struct wlr_output *wlr_wl_output_for_surface(struct wlr_backend_state *backend,
+void wlr_wl_registry_poll(struct wlr_wl_backend *backend);
+struct wlr_output *wlr_wl_output_for_surface(struct wlr_wl_backend *backend,
 	struct wl_surface *surface);
 
 extern const struct wl_seat_listener seat_listener;
diff --git a/include/wlr/backend.h b/include/wlr/backend.h
index ce5b2568..f87e88bd 100644
--- a/include/wlr/backend.h
+++ b/include/wlr/backend.h
@@ -6,11 +6,9 @@
 #include <wlr/egl.h>
 
 struct wlr_backend_impl;
-struct wlr_backend_state;
 
 struct wlr_backend {
 	const struct wlr_backend_impl *impl;
-	struct wlr_backend_state *state;
 
 	struct {
 		struct wl_signal input_add;
diff --git a/include/wlr/backend/interface.h b/include/wlr/backend/interface.h
index e791bdcf..adca23eb 100644
--- a/include/wlr/backend/interface.h
+++ b/include/wlr/backend/interface.h
@@ -5,15 +5,13 @@
 #include <wlr/backend.h>
 #include <wlr/egl.h>
 
-struct wlr_backend_state;
-
 struct wlr_backend_impl {
-	bool (*init)(struct wlr_backend_state *state);
-	void (*destroy)(struct wlr_backend_state *state);
-	struct wlr_egl *(*get_egl)(struct wlr_backend_state *state);
+	bool (*init)(struct wlr_backend *backend);
+	void (*destroy)(struct wlr_backend *backend);
+	struct wlr_egl *(*get_egl)(struct wlr_backend *backend);
 };
 
-struct wlr_backend *wlr_backend_create(const struct wlr_backend_impl *impl,
-		struct wlr_backend_state *state);
+void wlr_backend_create(struct wlr_backend *backend,
+		const struct wlr_backend_impl *impl);
 
 #endif