aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurkan Sahin <furkan-dev@proton.me>2020-09-14 19:49:01 +0200
committerFurkan Sahin <furkan-dev@proton.me>2020-09-14 19:49:01 +0200
commitd53df1e374e5010f4530bd7b776ee785a3fdcc2f (patch)
tree2ee5bfc93496c910e867898b09f81957cabbeb80
parent0db173b492b23600216f89403b5dd3e320e2121f (diff)
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
-rw-r--r--sway/input/cursor.c1
-rw-r--r--sway/input/seat.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index e43a0e71..dbb8c48d 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 e16d747c..8c80e41c 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));
}
}