Introduce wlr_xcursor_manager

3 files changed, 7 insertions, 37 deletions

diff --git a/include/rootston/cursor.h b/include/rootston/cursor.h
index 575c9d0e..f49b6439 100644
--- a/include/rootston/cursor.h
+++ b/include/rootston/cursor.h
@@ -30,7 +30,7 @@ struct roots_cursor {
 	enum roots_cursor_mode mode;
 
 	// state from input (review if this is necessary)
-	struct roots_xcursor_theme *xcursor_theme;
+	struct wlr_xcursor_manager *xcursor_manager;
 	struct wlr_seat *wl_seat;
 	struct wl_client *cursor_client;
 	int offs_x, offs_y;
diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index b12fff70..7371284f 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -30,9 +30,9 @@ struct roots_desktop {
 
 	struct roots_server *server;
 	struct roots_config *config;
-	struct roots_xcursor_theme *xcursor_theme;
 
 	struct wlr_output_layout *layout;
+	struct wlr_xcursor_manager *xcursor_manager;
 
 	struct wlr_compositor *compositor;
 	struct wlr_wl_shell *wl_shell;
diff --git a/include/rootston/xcursor.h b/include/rootston/xcursor.h
index 45fac481..bc00f79c 100644
--- a/include/rootston/xcursor.h
+++ b/include/rootston/xcursor.h
@@ -1,44 +1,14 @@
 #ifndef _ROOTSTON_XCURSOR_H
 #define _ROOTSTON_XCURSOR_H
 
-#include <wayland-server.h>
-#include <wlr/xcursor.h>
-#include <wlr/xwayland.h>
-#include <wlr/types/wlr_cursor.h>
+#include <stdint.h>
 
 #define ROOTS_XCURSOR_SIZE 16
 
-struct roots_xcursor_scaled_theme {
-	uint32_t scale;
-	struct wlr_xcursor_theme *theme;
-	struct wl_list link;
-};
+#define ROOTS_XCURSOR_DEFAULT "left_ptr"
+#define ROOTS_XCURSOR_MOVE "grabbing"
+#define ROOTS_XCURSOR_ROTATE "grabbing"
 
-struct roots_xcursor_theme {
-	char *name;
-	struct wl_list scaled_themes; // roots_xcursor_scaled_theme::link
-};
-
-struct roots_xcursor_theme *roots_xcursor_theme_create(const char *name);
-
-void roots_xcursor_theme_destroy(struct roots_xcursor_theme *theme);
-
-int roots_xcursor_theme_load(struct roots_xcursor_theme *theme,
-	uint32_t scale);
-
-void roots_xcursor_theme_set_default(struct roots_xcursor_theme *theme,
-	struct wlr_cursor *cursor);
-
-void roots_xcursor_theme_set_move(struct roots_xcursor_theme *theme,
-	struct wlr_cursor *cursor);
-
-void roots_xcursor_theme_set_resize(struct roots_xcursor_theme *theme,
-	struct wlr_cursor *cursor, uint32_t edges);
-
-void roots_xcursor_theme_set_rotate(struct roots_xcursor_theme *theme,
-	struct wlr_cursor *cursor);
-
-void roots_xcursor_theme_xwayland_set_default(struct roots_xcursor_theme *theme,
-	struct wlr_xwayland *xwayland);
+const char *roots_xcursor_get_resize_name(uint32_t edges);
 
 #endif