types/wlr_tablet_tool: uniformize events name

6 files changed, 40 insertions, 41 deletions

diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c
index 0aa960ab..31cd18b8 100644
--- a/backend/libinput/tablet_tool.c
+++ b/backend/libinput/tablet_tool.c
@@ -130,9 +130,8 @@ void handle_tablet_tool_axis(struct libinput_event *event,
 	struct tablet_tool *tool =
 		get_tablet_tool(dev, libinput_event_tablet_tool_get_tool(tevent));
 
-	struct wlr_event_tablet_tool_axis wlr_event = { 0 };
-
-	wlr_event.device = &wlr_tablet->base;
+	struct wlr_tablet_tool_axis_event wlr_event = { 0 };
+	wlr_event.tablet = wlr_tablet;
 	wlr_event.tool = &tool->wlr_tool;
 	wlr_event.time_msec =
 		usec_to_msec(libinput_event_tablet_tool_get_time_usec(tevent));
@@ -185,9 +184,9 @@ void handle_tablet_tool_proximity(struct libinput_event *event,
 	struct tablet_tool *tool =
 		get_tablet_tool(dev, libinput_event_tablet_tool_get_tool(tevent));
 
-	struct wlr_event_tablet_tool_proximity wlr_event = { 0 };
+	struct wlr_tablet_tool_proximity_event wlr_event = { 0 };
+	wlr_event.tablet = wlr_tablet;
 	wlr_event.tool = &tool->wlr_tool;
-	wlr_event.device = &wlr_tablet->base;
 	wlr_event.time_msec =
 		usec_to_msec(libinput_event_tablet_tool_get_time_usec(tevent));
 	wlr_event.x = libinput_event_tablet_tool_get_x_transformed(tevent, 1);
@@ -227,8 +226,8 @@ void handle_tablet_tool_tip(struct libinput_event *event,
 	struct tablet_tool *tool =
 		get_tablet_tool(dev, libinput_event_tablet_tool_get_tool(tevent));
 
-	struct wlr_event_tablet_tool_tip wlr_event = { 0 };
-	wlr_event.device = &wlr_tablet->base;
+	struct wlr_tablet_tool_tip_event wlr_event = { 0 };
+	wlr_event.tablet = wlr_tablet;
 	wlr_event.tool = &tool->wlr_tool;
 	wlr_event.time_msec =
 		usec_to_msec(libinput_event_tablet_tool_get_time_usec(tevent));
@@ -255,8 +254,8 @@ void handle_tablet_tool_button(struct libinput_event *event,
 	struct tablet_tool *tool =
 		get_tablet_tool(dev, libinput_event_tablet_tool_get_tool(tevent));
 
-	struct wlr_event_tablet_tool_button wlr_event = { 0 };
-	wlr_event.device = &wlr_tablet->base;
+	struct wlr_tablet_tool_button_event wlr_event = { 0 };
+	wlr_event.tablet = wlr_tablet;
 	wlr_event.tool = &tool->wlr_tool;
 	wlr_event.time_msec =
 		usec_to_msec(libinput_event_tablet_tool_get_time_usec(tevent));
diff --git a/backend/wayland/tablet_v2.c b/backend/wayland/tablet_v2.c
index 04ce2377..bedaabf2 100644
--- a/backend/wayland/tablet_v2.c
+++ b/backend/wayland/tablet_v2.c
@@ -582,8 +582,8 @@ static void handle_tablet_tool_button(void *data,
 	struct wlr_wl_seat *seat = tool->seat;
 	struct wlr_tablet *tablet = &seat->wlr_tablet;
 
-	struct wlr_event_tablet_tool_button evt = {
-		.device = &tablet->base,
+	struct wlr_tablet_tool_button_event evt = {
+		.tablet = tablet,
 		.tool = &seat->wlr_tablet_tool,
 		.time_msec = get_current_time_msec(),
 		.button = button,
@@ -620,8 +620,8 @@ static void handle_tablet_tool_frame(void *data,
 	struct wlr_tablet *tablet = &seat->wlr_tablet;
 
 	if (tool->is_in) {
-		struct wlr_event_tablet_tool_proximity evt = {
-			.device = &tablet->base,
+		struct wlr_tablet_tool_proximity_event evt = {
+			.tablet = tablet,
 			.tool = &seat->wlr_tablet_tool,
 			.time_msec = time,
 			.x = tool->x,
@@ -633,8 +633,8 @@ static void handle_tablet_tool_frame(void *data,
 	}
 
 	{
-		struct wlr_event_tablet_tool_axis evt = {
-			.device = &tablet->base,
+		struct wlr_tablet_tool_axis_event evt = {
+			.tablet = tablet,
 			.tool = &seat->wlr_tablet_tool,
 			.time_msec = time,
 			.updated_axes = 0,
@@ -696,8 +696,8 @@ static void handle_tablet_tool_frame(void *data,
 	 * Downside: Here we have the frame time, if we sent right away, we
 	 * need to generate the time */
 	if (tool->is_down) {
-		struct wlr_event_tablet_tool_tip evt = {
-			.device = &tablet->base,
+		struct wlr_tablet_tool_tip_event evt = {
+			.tablet = tablet,
 			.tool = &seat->wlr_tablet_tool,
 			.time_msec = time,
 			.x = tool->x,
@@ -709,8 +709,8 @@ static void handle_tablet_tool_frame(void *data,
 	}
 
 	if (tool->is_up) {
-		struct wlr_event_tablet_tool_tip evt = {
-			.device = &tablet->base,
+		struct wlr_tablet_tool_tip_event evt = {
+			.tablet = tablet,
 			.tool = &seat->wlr_tablet_tool,
 			.time_msec = time,
 			.x = tool->x,
@@ -722,8 +722,8 @@ static void handle_tablet_tool_frame(void *data,
 	}
 
 	if (tool->is_out) {
-		struct wlr_event_tablet_tool_proximity evt = {
-			.device = &tablet->base,
+		struct wlr_tablet_tool_proximity_event evt = {
+			.tablet = tablet,
 			.tool = &seat->wlr_tablet_tool,
 			.time_msec = time,
 			.x = tool->x,
diff --git a/examples/pointer.c b/examples/pointer.c
index d22047de..d1dab770 100644
--- a/examples/pointer.c
+++ b/examples/pointer.c
@@ -217,11 +217,11 @@ static void handle_touch_cancel(struct wl_listener *listener, void *data) {
 static void handle_tablet_tool_axis(struct wl_listener *listener, void *data) {
 	struct sample_state *sample =
 		wl_container_of(listener, sample, tablet_tool_axis);
-	struct wlr_event_tablet_tool_axis *event = data;
+	struct wlr_tablet_tool_axis_event *event = data;
 	if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_X) &&
 			(event->updated_axes & WLR_TABLET_TOOL_AXIS_Y)) {
-		wlr_cursor_warp_absolute(sample->cursor,
-				event->device, event->x, event->y);
+		wlr_cursor_warp_absolute(sample->cursor, &event->tablet->base,
+			event->x, event->y);
 	}
 }
 
diff --git a/examples/tablet.c b/examples/tablet.c
index 9903bbf1..35def700 100644
--- a/examples/tablet.c
+++ b/examples/tablet.c
@@ -136,7 +136,7 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
 
 static void tablet_tool_axis_notify(struct wl_listener *listener, void *data) {
 	struct tablet_tool_state *tstate = wl_container_of(listener, tstate, axis);
-	struct wlr_event_tablet_tool_axis *event = data;
+	struct wlr_tablet_tool_axis_event *event = data;
 	struct sample_state *sample = tstate->sample;
 	if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_X)) {
 		sample->x = event->x;
@@ -160,14 +160,14 @@ static void tablet_tool_axis_notify(struct wl_listener *listener, void *data) {
 
 static void tablet_tool_proximity_notify(struct wl_listener *listener, void *data) {
 	struct tablet_tool_state *tstate = wl_container_of(listener, tstate, proximity);
-	struct wlr_event_tablet_tool_proximity *event = data;
+	struct wlr_tablet_tool_proximity_event *event = data;
 	struct sample_state *sample = tstate->sample;
 	sample->proximity = event->state == WLR_TABLET_TOOL_PROXIMITY_IN;
 }
 
 static void tablet_tool_button_notify(struct wl_listener *listener, void *data) {
 	struct tablet_tool_state *tstate = wl_container_of(listener, tstate, button);
-	struct wlr_event_tablet_tool_button *event = data;
+	struct wlr_tablet_tool_button_event *event = data;
 	struct sample_state *sample = tstate->sample;
 	if (event->state == WLR_BUTTON_RELEASED) {
 		sample->button = false;
diff --git a/include/wlr/types/wlr_tablet_tool.h b/include/wlr/types/wlr_tablet_tool.h
index 2819bcc4..ec0fc42a 100644
--- a/include/wlr/types/wlr_tablet_tool.h
+++ b/include/wlr/types/wlr_tablet_tool.h
@@ -90,8 +90,8 @@ enum wlr_tablet_tool_axes {
 	WLR_TABLET_TOOL_AXIS_WHEEL = 1 << 8,
 };
 
-struct wlr_event_tablet_tool_axis {
-	struct wlr_input_device *device;
+struct wlr_tablet_tool_axis_event {
+	struct wlr_tablet *tablet;
 	struct wlr_tablet_tool *tool;
 
 	uint32_t time_msec;
@@ -113,8 +113,8 @@ enum wlr_tablet_tool_proximity_state {
 	WLR_TABLET_TOOL_PROXIMITY_IN,
 };
 
-struct wlr_event_tablet_tool_proximity {
-	struct wlr_input_device *device;
+struct wlr_tablet_tool_proximity_event {
+	struct wlr_tablet *tablet;
 	struct wlr_tablet_tool *tool;
 	uint32_t time_msec;
 	// From 0..1
@@ -123,12 +123,12 @@ struct wlr_event_tablet_tool_proximity {
 };
 
 enum wlr_tablet_tool_tip_state {
-	WLR_TABLET_TOOL_TIP_UP,
-	WLR_TABLET_TOOL_TIP_DOWN,
+	WLR_TABLET_TOOL_TIP_UP = 1 << 0,
+	WLR_TABLET_TOOL_TIP_DOWN = 1 << 1,
 };
 
-struct wlr_event_tablet_tool_tip {
-	struct wlr_input_device *device;
+struct wlr_tablet_tool_tip_event {
+	struct wlr_tablet *tablet;
 	struct wlr_tablet_tool *tool;
 	uint32_t time_msec;
 	// From 0..1
@@ -136,8 +136,8 @@ struct wlr_event_tablet_tool_tip {
 	enum wlr_tablet_tool_tip_state state;
 };
 
-struct wlr_event_tablet_tool_button {
-	struct wlr_input_device *device;
+struct wlr_tablet_tool_button_event {
+	struct wlr_tablet *tablet;
 	struct wlr_tablet_tool *tool;
 	uint32_t time_msec;
 	uint32_t button;
diff --git a/types/wlr_cursor.c b/types/wlr_cursor.c
index aabc1f9e..b9550959 100644
--- a/types/wlr_cursor.c
+++ b/types/wlr_cursor.c
@@ -556,7 +556,7 @@ static void handle_touch_frame(struct wl_listener *listener, void *data) {
 }
 
 static void handle_tablet_tool_tip(struct wl_listener *listener, void *data) {
-	struct wlr_event_tablet_tool_tip *event = data;
+	struct wlr_tablet_tool_tip_event *event = data;
 	struct wlr_cursor_device *device;
 	device = wl_container_of(listener, device, tablet_tool_tip);
 
@@ -569,7 +569,7 @@ static void handle_tablet_tool_tip(struct wl_listener *listener, void *data) {
 }
 
 static void handle_tablet_tool_axis(struct wl_listener *listener, void *data) {
-	struct wlr_event_tablet_tool_axis *event = data;
+	struct wlr_tablet_tool_axis_event *event = data;
 	struct wlr_cursor_device *device;
 	device = wl_container_of(listener, device, tablet_tool_axis);
 
@@ -605,7 +605,7 @@ static void handle_tablet_tool_axis(struct wl_listener *listener, void *data) {
 
 static void handle_tablet_tool_button(struct wl_listener *listener,
 		void *data) {
-	struct wlr_event_tablet_tool_button *event = data;
+	struct wlr_tablet_tool_button *event = data;
 	struct wlr_cursor_device *device;
 	device = wl_container_of(listener, device, tablet_tool_button);
 	wlr_signal_emit_safe(&device->cursor->events.tablet_tool_button, event);
@@ -613,7 +613,7 @@ static void handle_tablet_tool_button(struct wl_listener *listener,
 
 static void handle_tablet_tool_proximity(struct wl_listener *listener,
 		void *data) {
-	struct wlr_event_tablet_tool_proximity *event = data;
+	struct wlr_tablet_tool_proximity_event *event = data;
 	struct wlr_cursor_device *device;
 	device = wl_container_of(listener, device, tablet_tool_proximity);