From afa890e8e9f10667a56e896a114bf81fbc3ff54a Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Mon, 14 Sep 2020 19:49:01 +0200 Subject: [PATCH] input/cursor: reset event source after unhide Reset the event source after unhiding the cursor, to ensure that the timeout starts after showing the cursor. Also remove the open coded variant in seat_consider_warp_to_focus(). Fixes #5679 --- sway/input/cursor.c | 1 + sway/input/seat.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sway/input/cursor.c b/sway/input/cursor.c index e43a0e719..dbb8c48d7 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -299,6 +299,7 @@ void cursor_unhide(struct sway_cursor *cursor) { cursor_set_image(cursor, image, cursor->image_client); } cursor_rebase(cursor); + wl_event_source_timer_update(cursor->hide_source, cursor_get_timeout(cursor)); } static void pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, diff --git a/sway/input/seat.c b/sway/input/seat.c index e16d747cf..8c80e41c3 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -1482,7 +1482,6 @@ void seat_consider_warp_to_focus(struct sway_seat *seat) { } if (seat->cursor->hidden){ cursor_unhide(seat->cursor); - wl_event_source_timer_update(seat->cursor->hide_source, cursor_get_timeout(seat->cursor)); } }