rootston: move device init to seat

4 files changed, 50 insertions, 62 deletions

diff --git a/include/rootston/pointer.h b/include/rootston/pointer.h
deleted file mode 100644
index b3fc8c3a..00000000
--- a/include/rootston/pointer.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _ROOTSTON_POINTER_H
-#define _ROOTSTON_POINTER_H
-
-#include <wayland-server.h>
-#include <wlr/types/wlr_input_device.h>
-
-struct roots_pointer {
-	struct roots_input *input;
-	struct wlr_input_device *device;
-	struct wl_list link;
-};
-
-void pointer_add(struct wlr_input_device *device, struct roots_input *input);
-void pointer_remove(struct wlr_input_device *device, struct roots_input *input);
-
-#endif
diff --git a/include/rootston/seat.h b/include/rootston/seat.h
index f6db63cc..e4130e5a 100644
--- a/include/rootston/seat.h
+++ b/include/rootston/seat.h
@@ -9,7 +9,53 @@
 struct roots_seat {
 	struct roots_input *input;
 	struct wlr_seat *seat;
+	struct wlr_cursor *cursor;
+	struct wl_list link;
+
 	struct wl_list keyboards;
+	struct wl_list pointers;
+	struct wl_list touch;
+	struct wl_list tablet_tools;
+
+	struct wl_listener cursor_motion;
+	struct wl_listener cursor_motion_absolute;
+	struct wl_listener cursor_button;
+	struct wl_listener cursor_axis;
+
+	struct wl_listener cursor_touch_down;
+	struct wl_listener cursor_touch_up;
+	struct wl_listener cursor_touch_motion;
+
+	struct wl_listener cursor_tool_axis;
+	struct wl_listener cursor_tool_tip;
+};
+
+struct roots_pointer {
+	struct roots_seat *seat;
+	struct wlr_input_device *device;
+	struct wl_list link;
+};
+
+struct roots_touch {
+	struct roots_seat *seat;
+	struct wlr_input_device *device;
+	struct wl_list link;
+};
+
+struct roots_touch_point {
+	struct roots_touch *device;
+	int32_t slot;
+	double x, y;
+	struct wl_list link;
+};
+
+struct roots_tablet_tool {
+	struct roots_seat *seat;
+	struct wlr_input_device *device;
+	struct wl_listener axis;
+	struct wl_listener proximity;
+	struct wl_listener tip;
+	struct wl_listener button;
 	struct wl_list link;
 };
 
@@ -17,10 +63,10 @@ struct roots_seat *roots_seat_create(struct roots_input *input, char *name);
 
 void roots_seat_destroy(struct roots_seat *seat);
 
-void roots_seat_add_keyboard(struct roots_seat *seat,
-		struct roots_keyboard *keyboard);
+void roots_seat_add_device(struct roots_seat *seat,
+		struct wlr_input_device *device);
 
-void roots_seat_remove_keyboard(struct roots_seat *seat,
-		struct roots_keyboard *keyboard);
+void roots_seat_remove_device(struct roots_seat *seat,
+		struct wlr_input_device *device);
 
 #endif
diff --git a/include/rootston/tablet_tool.h b/include/rootston/tablet_tool.h
deleted file mode 100644
index 72ebf6d8..00000000
--- a/include/rootston/tablet_tool.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _ROOTSTON_TABLET_TOOL_H
-#define _ROOTSTON_TABLET_TOOL_H
-
-#include <wayland-server.h>
-#include "rootston/input.h"
-
-struct roots_tablet_tool {
-	struct roots_input *input;
-	struct wlr_input_device *device;
-	struct wl_listener axis;
-	struct wl_listener proximity;
-	struct wl_listener tip;
-	struct wl_listener button;
-	struct wl_list link;
-};
-
-void tablet_tool_add(struct wlr_input_device *device, struct roots_input *input);
-void tablet_tool_remove(struct wlr_input_device *device, struct roots_input *input);
-
-#endif
diff --git a/include/rootston/touch.h b/include/rootston/touch.h
deleted file mode 100644
index 1624c3ad..00000000
--- a/include/rootston/touch.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _ROOTSTON_TOUCH_H
-#define _ROOTSTON_TOUCH_H
-
-#include <wayland-server.h>
-
-struct roots_touch {
-	struct roots_input *input;
-	struct wlr_input_device *device;
-	struct wl_list link;
-};
-
-struct roots_touch_point {
-	struct roots_touch *device;
-	int32_t slot;
-	double x, y;
-	struct wl_list link;
-};
-
-void touch_add(struct wlr_input_device *device, struct roots_input *input);
-void touch_remove(struct wlr_input_device *device, struct roots_input *input);
-
-#endif