sway

commit cc858e605a465a40abfce0fb53a70e59a79c248d
parent 0b18560952c8615b945ab62ee365b95fede647cc
Author: Rouven Czerwinski <rouven@czerwinskis.de>
Date:   Mon,  7 Jan 2019 13:23:28 +0100

seat: unhide the cursor if it is warped to focus

Unhide the cursor if container warping is enabled.
Also set the image_surface to NULL during view_unmap, otherwise the cursor will
try to access the surface which is currently being unmapped.

Diffstat:
M
sway/input/seat.c
 | 
4
++++
M
sway/tree/view.c
 | 
1
+

2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/sway/input/seat.c b/sway/input/seat.c
@@ -1231,4 +1231,8 @@ void seat_consider_warp_to_focus(struct sway_seat *seat) {
 	} else {
 		cursor_warp_to_workspace(seat->cursor, focus->sway_workspace);
 	}
+	if (seat->cursor->hidden){
+		cursor_unhide(seat->cursor);
+		wl_event_source_timer_update(seat->cursor->hide_source, cursor_get_timeout(seat->cursor));
+	}
 }
diff --git a/sway/tree/view.c b/sway/tree/view.c
@@ -654,6 +654,7 @@ void view_unmap(struct sway_view *view) {
 
 	struct sway_seat *seat;
 	wl_list_for_each(seat, &server.input->seats, link) {
+		seat->cursor->image_surface = NULL;
 		seat_consider_warp_to_focus(seat);
 	}