cursor: reload cursor on Reconfigure

This gives instant feedback when changing cursor theme or size.
It only works for server side cursors or clients using the
cursor-shape protocol.

Fixes: #1619

diff --git a/include/input/cursor.h b/include/input/cursor.h
index 70905c0fd95e9692d756edc5978a6e4e19fccb42..94c9df4751e616934b77c799051820b51ec22816 100644 (file)
--- a/include/input/cursor.h
+++ b/include/input/cursor.h
@@ -119,7 +119,7 @@ void cursor_update_focus(struct server *server);
 void cursor_update_image(struct seat *seat);
 
 void cursor_init(struct seat *seat);
-void cursor_load(struct seat *seat);
+void cursor_reload(struct seat *seat);
 void cursor_emulate_move_absolute(struct seat *seat,
                struct wlr_input_device *device,
                double x, double y, uint32_t time_msec);

diff --git a/src/input/cursor.c b/src/input/cursor.c
index 6e0e81aa33c3fbffacb36507a411941a0892da2f..01c3dbe7d22223776cfd51c2221290068fe3bd05 100644 (file)
--- a/src/input/cursor.c
+++ b/src/input/cursor.c
@@ -299,6 +299,7 @@ cursor_update_image(struct seat *seat)
                 */
                if (seat->seat->pointer_state.focused_surface) {
                        seat->server_cursor = LAB_CURSOR_DEFAULT;
+                       wlr_cursor_set_xcursor(seat->cursor, seat->xcursor_manager, "");
                        cursor_update_focus(seat->server);
                }
                return;
@@ -1254,7 +1255,7 @@ cursor_frame(struct wl_listener *listener, void *data)
        wlr_seat_pointer_notify_frame(seat->seat);
 }
 
-void
+static void
 cursor_load(struct seat *seat)
 {
        const char *xcursor_theme = getenv("XCURSOR_THEME");
@@ -1300,6 +1301,13 @@ cursor_load(struct seat *seat)
        }
 }
 
+void
+cursor_reload(struct seat *seat)
+{
+       cursor_load(seat);
+       cursor_update_image(seat);
+}
+
 void
 cursor_init(struct seat *seat)
 {

diff --git a/src/seat.c b/src/seat.c
index 6fbeb595e2ce868b88eac6d846cbedf99ca977b8..816e58dd3ea38d20f8fafa6b85bd128c9a82506d 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -587,7 +587,7 @@ seat_reconfigure(struct server *server)
 {
        struct seat *seat = &server->seat;
        struct input *input;
-       cursor_load(seat);
+       cursor_reload(seat);
        overlay_reconfigure(seat);
        wl_list_for_each(input, &seat->inputs, link) {
                switch (input->wlr_input_device->type) {