diff options
Diffstat (limited to 'sway/input/cursor.c')
-rw-r--r-- | sway/input/cursor.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index fb1edd0b..fb4728b4 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -353,7 +353,6 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, | |||
353 | } | 353 | } |
354 | 354 | ||
355 | struct sway_seat *seat = cursor->seat; | 355 | struct sway_seat *seat = cursor->seat; |
356 | struct wlr_seat *wlr_seat = seat->wlr_seat; | ||
357 | 356 | ||
358 | if (seat_doing_seatop(seat)) { | 357 | if (seat_doing_seatop(seat)) { |
359 | seatop_motion(seat, time_msec); | 358 | seatop_motion(seat, time_msec); |
@@ -404,10 +403,11 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, | |||
404 | 403 | ||
405 | cursor_do_rebase(cursor, time_msec, node, surface, sx, sy); | 404 | cursor_do_rebase(cursor, time_msec, node, surface, sx, sy); |
406 | 405 | ||
407 | struct wlr_drag_icon *wlr_drag_icon; | 406 | struct sway_drag_icon *drag_icon; |
408 | wl_list_for_each(wlr_drag_icon, &wlr_seat->drag_icons, link) { | 407 | wl_list_for_each(drag_icon, &root->drag_icons, link) { |
409 | struct sway_drag_icon *drag_icon = wlr_drag_icon->data; | 408 | if (drag_icon->seat == seat) { |
410 | drag_icon_update_position(drag_icon); | 409 | drag_icon_update_position(drag_icon); |
410 | } | ||
411 | } | 411 | } |
412 | } | 412 | } |
413 | 413 | ||
@@ -991,10 +991,11 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) { | |||
991 | seat->touch_x = lx; | 991 | seat->touch_x = lx; |
992 | seat->touch_y = ly; | 992 | seat->touch_y = ly; |
993 | 993 | ||
994 | struct wlr_drag_icon *wlr_drag_icon; | 994 | struct sway_drag_icon *drag_icon; |
995 | wl_list_for_each(wlr_drag_icon, &wlr_seat->drag_icons, link) { | 995 | wl_list_for_each(drag_icon, &root->drag_icons, link) { |
996 | struct sway_drag_icon *drag_icon = wlr_drag_icon->data; | 996 | if (drag_icon->seat == seat) { |
997 | drag_icon_update_position(drag_icon); | 997 | drag_icon_update_position(drag_icon); |
998 | } | ||
998 | } | 999 | } |
999 | } | 1000 | } |
1000 | 1001 | ||