storage commit #2

2 files changed, 30 insertions, 0 deletions

diff --git a/include/wlr/types/wlr_tablet_pad.h b/include/wlr/types/wlr_tablet_pad.h
index 73082c56..b633f439 100644
--- a/include/wlr/types/wlr_tablet_pad.h
+++ b/include/wlr/types/wlr_tablet_pad.h
@@ -22,9 +22,31 @@ struct wlr_tablet_pad {
 		struct wl_signal strip;
 	} events;
 
+	size_t button_count;
+	size_t ring_count;
+	size_t strip_count;
+
+	struct wl_list groups; // wlr_tablet_pad_group::link
+	struct wl_list paths; // wlr_tablet_path::link
+
 	void *data;
 };
 
+struct wlr_tablet_pad_group_v2 {
+	struct wl_list link;
+
+	size_t button_count;
+	unsigned int *buttons;
+
+	size_t strip_count;
+	unsigned int *strips;
+
+	size_t ring_count;
+	unsigned int *rings;
+
+	unsigned int mode_count;
+};
+
 struct wlr_event_tablet_pad_button {
 	uint32_t time_msec;
 	uint32_t button;
diff --git a/include/wlr/types/wlr_tablet_tool.h b/include/wlr/types/wlr_tablet_tool.h
index 08d37f68..884b486a 100644
--- a/include/wlr/types/wlr_tablet_tool.h
+++ b/include/wlr/types/wlr_tablet_tool.h
@@ -42,6 +42,11 @@ struct wlr_tablet_tool_tool {
 
 struct wlr_tablet_tool_impl;
 
+struct wlr_tablet_path {
+	struct wl_list link;
+	char *path;
+};
+
 struct wlr_tablet_tool {
 	struct wlr_tablet_tool_impl *impl;
 
@@ -52,6 +57,9 @@ struct wlr_tablet_tool {
 		struct wl_signal button;
 	} events;
 
+	const char *name;
+	struct wl_list paths; // wlr_table_path::link
+
 	void *data;
 };