3 files changed, 41 insertions, 4 deletions
diff --git a/include/rootston/cursor.h b/include/rootston/cursor.h
index a1a466c2..f7410dec 100644
--- a/include/rootston/cursor.h
+++ b/include/rootston/cursor.h
@@ -40,6 +40,8 @@ struct roots_cursor {
 
 	struct wl_listener tool_axis;
 	struct wl_listener tool_tip;
+	struct wl_listener tool_proximity;
+	struct wl_listener tool_button;
 
 	struct wl_listener request_set_cursor;
 };
diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index 88c5ca90..2d28fa10 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -8,7 +8,7 @@
 #include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_input_inhibitor.h>
 #include <wlr/types/wlr_layer_shell.h>
-#include <wlr/types/wlr_linux_dmabuf.h>
+#include <wlr/types/wlr_linux_dmabuf_v1.h>
 #include <wlr/types/wlr_list.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
@@ -52,10 +52,11 @@ struct roots_desktop {
 	struct wlr_idle *idle;
 	struct wlr_idle_inhibit_manager_v1 *idle_inhibit;
 	struct wlr_input_inhibit_manager *input_inhibit;
-	struct wlr_linux_dmabuf *linux_dmabuf;
+	struct wlr_linux_dmabuf_v1 *linux_dmabuf;
 	struct wlr_layer_shell *layer_shell;
 	struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard;
 	struct wlr_screencopy_manager_v1 *screencopy;
+	struct wlr_tablet_manager_v2 *tablet_v2;
 
 	struct wl_listener new_output;
 	struct wl_listener layout_change;
diff --git a/include/rootston/seat.h b/include/rootston/seat.h
index 0e3043dd..3ddb97c5 100644
--- a/include/rootston/seat.h
+++ b/include/rootston/seat.h
@@ -30,7 +30,8 @@ struct roots_seat {
 	struct wl_list keyboards;
 	struct wl_list pointers;
 	struct wl_list touch;
-	struct wl_list tablet_tools;
+	struct wl_list tablets;
+	struct wl_list tablet_pads;
 
 	struct wl_listener new_drag_icon;
 	struct wl_listener destroy;
@@ -77,9 +78,11 @@ struct roots_touch {
 	struct wl_list link;
 };
 
-struct roots_tablet_tool {
+struct roots_tablet {
 	struct roots_seat *seat;
 	struct wlr_input_device *device;
+	struct wlr_tablet_v2_tablet *tablet_v2;
+
 	struct wl_listener device_destroy;
 	struct wl_listener axis;
 	struct wl_listener proximity;
@@ -88,6 +91,37 @@ struct roots_tablet_tool {
 	struct wl_list link;
 };
 
+struct roots_tablet_pad {
+	struct wl_list link;
+	struct wlr_tablet_v2_tablet_pad *tablet_v2_pad;
+
+	struct roots_seat *seat;
+	struct wlr_input_device *device;
+
+	struct wl_listener device_destroy;
+	struct wl_listener attach;
+	struct wl_listener button;
+	struct wl_listener ring;
+	struct wl_listener strip;
+
+	struct roots_tablet *tablet;
+	struct wl_listener tablet_destroy;
+};
+
+struct roots_tablet_tool {
+	struct wl_list link;
+	struct wl_list tool_link;
+	struct wlr_tablet_v2_tablet_tool *tablet_v2_tool;
+
+	struct roots_seat *seat;
+
+	struct wl_listener set_cursor;
+	struct wl_listener tool_destroy;
+
+	struct roots_tablet *current_tablet;
+	struct wl_listener tablet_destroy;
+};
+
 struct roots_seat *roots_seat_create(struct roots_input *input, char *name);
 
 void roots_seat_destroy(struct roots_seat *seat);