Refactor out wlr_input_device_state

3 files changed, 33 insertions, 30 deletions

diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c
index 18e4826c..a8f43fbc 100644
--- a/backend/libinput/backend.c
+++ b/backend/libinput/backend.c
@@ -151,6 +151,7 @@ error_backend:
 	return NULL;
 }
 
-struct libinput_device *wlr_libinput_get_device_handle(struct wlr_input_device *dev) {
-	return dev->state->handle;
+struct libinput_device *wlr_libinput_get_device_handle(struct wlr_input_device *_dev) {
+	struct wlr_libinput_input_device *dev = (struct wlr_libinput_input_device *)_dev;
+	return dev->handle;
 }
diff --git a/backend/libinput/events.c b/backend/libinput/events.c
index a7c781c2..0e434b7c 100644
--- a/backend/libinput/events.c
+++ b/backend/libinput/events.c
@@ -23,9 +23,10 @@ struct wlr_input_device *get_appropriate_device(
 	return NULL;
 }
 
-static void wlr_libinput_device_destroy(struct wlr_input_device_state *state) {
-	libinput_device_unref(state->handle);
-	free(state);
+static void wlr_libinput_device_destroy(struct wlr_input_device *_dev) {
+	struct wlr_libinput_input_device *dev = (struct wlr_libinput_input_device *)_dev;
+	libinput_device_unref(dev->handle);
+	free(dev);
 }
 
 static struct wlr_input_device_impl input_device_impl = {
@@ -38,13 +39,13 @@ static struct wlr_input_device *allocate_device(
 	int vendor = libinput_device_get_id_vendor(libinput_dev);
 	int product = libinput_device_get_id_product(libinput_dev);
 	const char *name = libinput_device_get_name(libinput_dev);
-	struct wlr_input_device_state *devstate =
-		calloc(1, sizeof(struct wlr_input_device_state));
-	devstate->handle = libinput_dev;
+	struct wlr_libinput_input_device *wlr_libinput_dev =
+		calloc(1, sizeof(struct wlr_libinput_input_device));
+	struct wlr_input_device *wlr_dev = &wlr_libinput_dev->wlr_input_device;
+	wlr_libinput_dev->handle = libinput_dev;
 	libinput_device_ref(libinput_dev);
-	struct wlr_input_device *wlr_dev = wlr_input_device_create(
-		type, &input_device_impl, devstate,
-		name, vendor, product);
+	wlr_input_device_init(wlr_dev, type, &input_device_impl,
+			name, vendor, product);
 	list_add(wlr_devices, wlr_dev);
 	return wlr_dev;
 }
diff --git a/backend/wayland/wl_seat.c b/backend/wayland/wl_seat.c
index 99a67df5..9b54a328 100644
--- a/backend/wayland/wl_seat.c
+++ b/backend/wayland/wl_seat.c
@@ -16,9 +16,10 @@ static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer,
 		uint32_t serial, struct wl_surface *surface, wl_fixed_t surface_x,
 		wl_fixed_t surface_y) {
 	struct wlr_input_device *dev = data;
+	struct wlr_wl_input_device *wlr_wl_dev = (struct wlr_wl_input_device *)dev;
 	assert(dev && dev->pointer && dev->pointer->state);
 	struct wlr_wl_backend_output* output =
-		wlr_wl_output_for_surface(dev->state->backend, surface);
+		wlr_wl_output_for_surface(wlr_wl_dev->backend, surface);
 	assert(output);
 	dev->pointer->state->current_output = output;
 }
@@ -160,11 +161,12 @@ static struct wl_keyboard_listener keyboard_listener = {
 	.repeat_info = keyboard_handle_repeat_info
 };
 
-static void input_device_destroy(struct wlr_input_device_state *state) {
-	wl_signal_emit(&state->backend->backend.events.input_remove, state->wlr_device);
-	if (state->resource)
-		wl_proxy_destroy(state->resource);
-	free(state);
+static void input_device_destroy(struct wlr_input_device *_dev) {
+	struct wlr_wl_input_device *dev = (struct wlr_wl_input_device *)_dev;
+	wl_signal_emit(&dev->backend->backend.events.input_remove, &dev->wlr_input_device);
+	if (dev->resource)
+		wl_proxy_destroy(dev->resource);
+	free(dev);
 }
 
 static struct wlr_input_device_impl input_device_impl = {
@@ -181,25 +183,20 @@ static struct wlr_pointer_impl pointer_impl = {
 
 static struct wlr_input_device *allocate_device(struct wlr_wl_backend *backend,
 		enum wlr_input_device_type type) {
-	struct wlr_input_device_state *devstate;
-	if (!(devstate = calloc(1, sizeof(struct wlr_input_device_state)))) {
+	struct wlr_wl_input_device *wlr_wl_dev;
+	if (!(wlr_wl_dev = calloc(1, sizeof(struct wlr_wl_input_device)))) {
 		wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
 		return NULL;
 	}
 
-	devstate->backend = backend;
+	wlr_wl_dev->backend = backend;
 
 	int vendor = 0;
 	int product = 0;
 	const char *name = "wayland";
-	struct wlr_input_device *wlr_device = wlr_input_device_create(
-		type, &input_device_impl, devstate,
-		name, vendor, product);
-	if (!wlr_device) {
-		free(devstate);
-		return NULL;
-	}
-	devstate->wlr_device = wlr_device;
+	struct wlr_input_device *wlr_device = &wlr_wl_dev->wlr_input_device;
+	wlr_input_device_init(wlr_device, type, &input_device_impl,
+			name, vendor, product);
 	list_add(backend->devices, wlr_device);
 	return wlr_device;
 }
@@ -223,11 +220,13 @@ static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
 			wlr_log(L_ERROR, "Unable to allocate wlr_device for pointer");
 			return;
 		}
+		struct wlr_wl_input_device *wlr_wl_device =
+			(struct wlr_wl_input_device *)wlr_device;
 
 		struct wl_pointer *wl_pointer = wl_seat_get_pointer(wl_seat);
 		wl_pointer_add_listener(wl_pointer, &pointer_listener, wlr_device);
 		wlr_device->pointer = wlr_pointer_create(&pointer_impl, pointer_state);
-		wlr_device->state->resource = wl_pointer;
+		wlr_wl_device->resource = wl_pointer;
 		wl_signal_emit(&backend->backend.events.input_add, wlr_device);
 	}
 	if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) {
@@ -238,11 +237,13 @@ static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
 			wlr_log(L_ERROR, "Unable to allocate wl_pointer device");
 			return;
 		}
+		struct wlr_wl_input_device *wlr_wl_device =
+			(struct wlr_wl_input_device *)wlr_device;
 
 		struct wl_keyboard *wl_keyboard = wl_seat_get_keyboard(wl_seat);
 		wl_keyboard_add_listener(wl_keyboard, &keyboard_listener, wlr_device);
 		wlr_device->keyboard = wlr_keyboard_create(NULL, NULL);
-		wlr_device->state->resource = wl_keyboard;
+		wlr_wl_device->resource = wl_keyboard;
 		wl_signal_emit(&backend->backend.events.input_add, wlr_device);
 	}
 }