Refactor out wlr_tablet_tool_state

backend/libinput/tablet_tool.c

@@ -10,7 +10,13 @@
 struct wlr_tablet_tool *wlr_libinput_tablet_tool_create(
 		struct libinput_device *libinput_dev) {
 	assert(libinput_dev);
-	return wlr_tablet_tool_create(NULL, NULL);
+	struct wlr_tablet_tool *wlr_tablet_tool = calloc(1, sizeof(struct wlr_tablet_tool));
+	if (!wlr_tablet_tool) {
+		wlr_log(L_ERROR, "Unable to allocate wlr_tablet_tool");
+		return NULL;
+	}
+	wlr_tablet_tool_init(wlr_tablet_tool, NULL);
+	return wlr_tablet_tool;
 }
 
 void handle_tablet_tool_axis(struct libinput_event *event,

include/wlr/interfaces/wlr_tablet_tool.h

@@ -3,11 +3,11 @@
 #include <wlr/types/wlr_tablet_tool.h>
 
 struct wlr_tablet_tool_impl {
-	void (*destroy)(struct wlr_tablet_tool_state *tool);
+	void (*destroy)(struct wlr_tablet_tool *tool);
 };
 
-struct wlr_tablet_tool *wlr_tablet_tool_create(struct wlr_tablet_tool_impl *impl,
+void wlr_tablet_tool_init(struct wlr_tablet_tool *tool,
-		struct wlr_tablet_tool_state *state);
+		struct wlr_tablet_tool_impl *impl);
 void wlr_tablet_tool_destroy(struct wlr_tablet_tool *tool);
 
 #endif

include/wlr/types/wlr_tablet_tool.h

@@ -5,11 +5,9 @@
 #include <stdint.h>
 
 struct wlr_tablet_tool_impl;
-struct wlr_tablet_tool_state;
 
 struct wlr_tablet_tool {
 	struct wlr_tablet_tool_impl *impl;
-	struct wlr_tablet_tool_state *state;
 
 	struct {
 		struct wl_signal axis;

types/wlr_tablet_tool.c

@@ -4,22 +4,20 @@
 #include <wlr/types/wlr_tablet_tool.h>
 #include <wlr/interfaces/wlr_tablet_tool.h>
 
-struct wlr_tablet_tool *wlr_tablet_tool_create(struct wlr_tablet_tool_impl *impl,
+void wlr_tablet_tool_init(struct wlr_tablet_tool *tool,
-		struct wlr_tablet_tool_state *state) {
+		struct wlr_tablet_tool_impl *impl) {
-	struct wlr_tablet_tool *tool = calloc(1, sizeof(struct wlr_tablet_tool));
 	tool->impl = impl;
-	tool->state = state;
 	wl_signal_init(&tool->events.axis);
 	wl_signal_init(&tool->events.proximity);
 	wl_signal_init(&tool->events.tip);
 	wl_signal_init(&tool->events.button);
-	return tool;
 }
 
 void wlr_tablet_tool_destroy(struct wlr_tablet_tool *tool) {
 	if (!tool) return;
-	if (tool->impl) {
+	if (tool->impl && tool->impl->destroy) {
-		tool->impl->destroy(tool->state);
+		tool->impl->destroy(tool);
+	} else {
+		free(tool);
 	}
-	free(tool);
 }