Set cursor when beginning resize and move operations

2 files changed, 10 insertions, 0 deletions

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index ee50dcde..771ad01d 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -215,6 +215,7 @@ static void calculate_floating_constraints(struct sway_container *con,
                 *max_height = config->floating_maximum_height;
         }
 }
+
 static void handle_resize_motion(struct sway_seat *seat,
                 struct sway_cursor *cursor) {
         struct sway_container *con = seat->op_container;
@@ -704,6 +705,9 @@ static void handle_request_set_cursor(struct wl_listener *listener,
                 void *data) {
         struct sway_cursor *cursor =
                 wl_container_of(listener, cursor, request_set_cursor);
+        if (cursor->seat->operation != OP_NONE) {
+                return;
+        }
         struct wlr_seat_pointer_request_set_cursor_event *event = data;
 
         struct wl_client *focused_client = NULL;
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 4e803efd..273223db 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -910,6 +910,7 @@ void seat_begin_move(struct sway_seat *seat, struct sway_container *con,
         seat->operation = OP_MOVE;
         seat->op_container = con;
         seat->op_button = button;
+        cursor_set_image(seat->cursor, "grab", NULL);
 }
 
 void seat_begin_resize(struct sway_seat *seat, struct sway_container *con,
@@ -932,6 +933,10 @@ void seat_begin_resize(struct sway_seat *seat, struct sway_container *con,
         seat->op_ref_con_ly = con->y;
         seat->op_ref_width = con->width;
         seat->op_ref_height = con->height;
+
+        const char *image = edge == WLR_EDGE_NONE ?
+                "se-resize" : wlr_xcursor_get_resize_name(edge);
+        cursor_set_image(seat->cursor, image, NULL);
 }
 
 void seat_end_mouse_operation(struct sway_seat *seat) {
@@ -951,6 +956,7 @@ void seat_end_mouse_operation(struct sway_seat *seat) {
         }
         seat->operation = OP_NONE;
         seat->op_container = NULL;
+        cursor_set_image(seat->cursor, "left_ptr", NULL);
 }
 
 void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec,