Clean up serial handling

2 files changed, 30 insertions, 35 deletions

diff --git a/include/types/wlr_tablet_v2.h b/include/types/wlr_tablet_v2.h
index a59c014f..f2d9b8e4 100644
--- a/include/types/wlr_tablet_v2.h
+++ b/include/types/wlr_tablet_v2.h
@@ -49,10 +49,6 @@ struct wlr_tablet_pad_client_v2 {
 	struct wl_resource *resource;
 	struct wlr_tablet_v2_tablet_pad *pad;
 
-	uint32_t enter_serial;
-	uint32_t mode_serial;
-	uint32_t leave_serial;
-
 	size_t button_count;
 
 	size_t group_count;
@@ -73,8 +69,6 @@ struct wlr_tablet_tool_client_v2 {
 	struct wlr_tablet_v2_tablet_tool *tool;
 	struct wlr_tablet_seat_client_v2 *seat;
 
-	uint32_t proximity_serial;
-
 	struct wl_event_source *frame_source;
 };
 
diff --git a/include/wlr/types/wlr_tablet_v2.h b/include/wlr/types/wlr_tablet_v2.h
index 3268c0b5..18fafcc3 100644
--- a/include/wlr/types/wlr_tablet_v2.h
+++ b/include/wlr/types/wlr_tablet_v2.h
@@ -47,11 +47,12 @@ struct wlr_tablet_v2_tablet_tool {
 	struct wl_listener surface_destroy;
 	struct wl_listener client_destroy;
 
-	uint32_t down_serial;
+	uint32_t proximity_serial;
 	bool is_down;
-	uint32_t button_serial;
+	uint32_t down_serial;
 	size_t num_buttons;
 	uint32_t pressed_buttons[WLR_TABLEt_V2_TOOL_BUTTONS_CAP];
+	uint32_t pressed_serials[WLR_TABLEt_V2_TOOL_BUTTONS_CAP];
 
 	struct {
 		struct wl_signal set_cursor; // struct wlr_tablet_v2_event_cursor
@@ -93,42 +94,42 @@ struct wlr_tablet_v2_event_feedback {
 };
 
 struct wlr_tablet_v2_tablet *wlr_tablet_create(
-		struct wlr_tablet_manager_v2 *manager,
-		struct wlr_seat *wlr_seat,
-		struct wlr_input_device *wlr_device);
+	struct wlr_tablet_manager_v2 *manager,
+	struct wlr_seat *wlr_seat,
+	struct wlr_input_device *wlr_device);
 
 struct wlr_tablet_v2_tablet_pad *wlr_tablet_pad_create(
-		struct wlr_tablet_manager_v2 *manager,
-		struct wlr_seat *wlr_seat,
-		struct wlr_input_device *wlr_device);
+	struct wlr_tablet_manager_v2 *manager,
+	struct wlr_seat *wlr_seat,
+	struct wlr_input_device *wlr_device);
 
 struct wlr_tablet_v2_tablet_tool *wlr_tablet_tool_create(
-		struct wlr_tablet_manager_v2 *manager,
-		struct wlr_seat *wlr_seat,
-		struct wlr_tablet_tool_tool *wlr_tool);
+	struct wlr_tablet_manager_v2 *manager,
+	struct wlr_seat *wlr_seat,
+	struct wlr_tablet_tool_tool *wlr_tool);
 
 struct wlr_tablet_manager_v2 *wlr_tablet_v2_create(struct wl_display *display);
 void wlr_tablet_v2_destroy(struct wlr_tablet_manager_v2 *manager);
 
-uint32_t wlr_send_tablet_v2_tablet_tool_proximity_in(
+void wlr_send_tablet_v2_tablet_tool_proximity_in(
 	struct wlr_tablet_v2_tablet_tool *tool,
 	struct wlr_tablet_v2_tablet *tablet,
 	struct wlr_surface *surface);
 
-uint32_t wlr_send_tablet_v2_tablet_tool_down(struct wlr_tablet_v2_tablet_tool *tool);
+void wlr_send_tablet_v2_tablet_tool_down(struct wlr_tablet_v2_tablet_tool *tool);
 void wlr_send_tablet_v2_tablet_tool_up(struct wlr_tablet_v2_tablet_tool *tool);
 
 void wlr_send_tablet_v2_tablet_tool_motion(
-		struct wlr_tablet_v2_tablet_tool *tool, double x, double y);
+	struct wlr_tablet_v2_tablet_tool *tool, double x, double y);
 
 void wlr_send_tablet_v2_tablet_tool_pressure(
-		struct wlr_tablet_v2_tablet_tool *tool, uint32_t pressure);
+	struct wlr_tablet_v2_tablet_tool *tool, uint32_t pressure);
 
 void wlr_send_tablet_v2_tablet_tool_distance(
 	struct wlr_tablet_v2_tablet_tool *tool, uint32_t distance);
 
 void wlr_send_tablet_v2_tablet_tool_tilt(
-		struct wlr_tablet_v2_tablet_tool *tool, double x, double y);
+	struct wlr_tablet_v2_tablet_tool *tool, double x, double y);
 
 void wlr_send_tablet_v2_tablet_tool_rotation(
 	struct wlr_tablet_v2_tablet_tool *tool, double degrees);
@@ -142,30 +143,30 @@ void wlr_send_tablet_v2_tablet_tool_wheel(
 void wlr_send_tablet_v2_tablet_tool_proximity_out(
 	struct wlr_tablet_v2_tablet_tool *tool);
 
-uint32_t wlr_send_tablet_v2_tablet_tool_button(
-		struct wlr_tablet_v2_tablet_tool *tool, uint32_t button,
-		enum zwp_tablet_pad_v2_button_state state);
+void wlr_send_tablet_v2_tablet_tool_button(
+	struct wlr_tablet_v2_tablet_tool *tool, uint32_t button,
+	enum zwp_tablet_pad_v2_button_state state);
 
 uint32_t wlr_send_tablet_v2_tablet_pad_enter(
-		struct wlr_tablet_v2_tablet_pad *pad,
-		struct wlr_tablet_v2_tablet *tablet,
-		struct wlr_surface *surface);
+	struct wlr_tablet_v2_tablet_pad *pad,
+	struct wlr_tablet_v2_tablet *tablet,
+	struct wlr_surface *surface);
 
 void wlr_send_tablet_v2_tablet_pad_button(
-		struct wlr_tablet_v2_tablet_pad *pad, size_t button,
-		uint32_t time, enum zwp_tablet_pad_v2_button_state state);
+	struct wlr_tablet_v2_tablet_pad *pad, size_t button,
+	uint32_t time, enum zwp_tablet_pad_v2_button_state state);
 
 void wlr_send_tablet_v2_tablet_pad_strip( struct wlr_tablet_v2_tablet_pad *pad,
-		uint32_t strip, double position, bool finger, uint32_t time);
+	uint32_t strip, double position, bool finger, uint32_t time);
 void wlr_send_tablet_v2_tablet_pad_ring(struct wlr_tablet_v2_tablet_pad *pad,
-		uint32_t ring, double position, bool finger, uint32_t time);
+	uint32_t ring, double position, bool finger, uint32_t time);
 
 uint32_t wlr_send_tablet_v2_tablet_pad_leave(struct wlr_tablet_v2_tablet_pad *pad,
-		struct wlr_surface *surface);
+	struct wlr_surface *surface);
 
 uint32_t wlr_send_tablet_v2_tablet_pad_mode(struct wlr_tablet_v2_tablet_pad *pad,
-		size_t group, uint32_t mode, uint32_t time);
+	size_t group, uint32_t mode, uint32_t time);
 
 bool wlr_surface_accepts_tablet_v2(struct wlr_tablet_v2_tablet *tablet,
-		struct wlr_surface *surface);
+	struct wlr_surface *surface);
 #endif /* WLR_TYPES_WLR_TABLET_V2_H */