1 files changed, 7 insertions, 5 deletions

diff --git a/rootston/seat.c b/rootston/seat.c
index 376da67f..ec4e9800 100644
--- a/rootston/seat.c
+++ b/rootston/seat.c
@@ -186,7 +186,9 @@ static void roots_seat_init_cursor(struct roots_seat *seat) {
 	struct roots_desktop *desktop = seat->input->server->desktop;
 	wlr_cursor_attach_output_layout(wlr_cursor, desktop->layout);
 
-	roots_xcursor_theme_set_default(desktop->xcursor_theme, wlr_cursor);
+	// TODO: be able to configure per-seat cursor themes
+	seat->cursor->xcursor_theme = desktop->xcursor_theme;
+	roots_xcursor_theme_set_default(seat->cursor->xcursor_theme, wlr_cursor);
 
 	wl_list_init(&seat->cursor->touch_points);
 
@@ -444,7 +446,7 @@ void roots_seat_remove_device(struct roots_seat *seat,
 }
 
 void roots_seat_configure_xcursor(struct roots_seat *seat) {
-	roots_xcursor_theme_set_default(seat->input->server->desktop->xcursor_theme,
+	roots_xcursor_theme_set_default(seat->cursor->xcursor_theme,
 		seat->cursor->cursor);
 	wlr_cursor_warp(seat->cursor->cursor, NULL, seat->cursor->cursor->x,
 		seat->cursor->cursor->y);
@@ -522,7 +524,7 @@ void roots_seat_begin_move(struct roots_seat *seat, struct roots_view *view) {
 	view_maximize(view, false);
 	wlr_seat_pointer_clear_focus(seat->seat);
 
-	roots_xcursor_theme_set_move(seat->input->server->desktop->xcursor_theme,
+	roots_xcursor_theme_set_move(seat->cursor->xcursor_theme,
 		seat->cursor->cursor);
 }
 
@@ -549,7 +551,7 @@ void roots_seat_begin_resize(struct roots_seat *seat, struct roots_view *view,
 	view_maximize(view, false);
 	wlr_seat_pointer_clear_focus(seat->seat);
 
-	roots_xcursor_theme_set_resize(seat->input->server->desktop->xcursor_theme,
+	roots_xcursor_theme_set_resize(seat->cursor->xcursor_theme,
 		seat->cursor->cursor, edges);
 }
 
@@ -562,6 +564,6 @@ void roots_seat_begin_rotate(struct roots_seat *seat, struct roots_view *view) {
 	view_maximize(view, false);
 	wlr_seat_pointer_clear_focus(seat->seat);
 
-	roots_xcursor_theme_set_rotate(seat->input->server->desktop->xcursor_theme,
+	roots_xcursor_theme_set_rotate(seat->cursor->xcursor_theme,
 		seat->cursor->cursor);
 }