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.
This commit is contained in:
Rouven Czerwinski 2019-01-07 13:23:28 +01:00 committed by Brian Ashworth
parent 0b18560952
commit cc858e605a
2 changed files with 5 additions and 0 deletions

View file

@ -1231,4 +1231,8 @@ void seat_consider_warp_to_focus(struct sway_seat *seat) {
} else { } else {
cursor_warp_to_workspace(seat->cursor, focus->sway_workspace); 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));
}
} }

View file

@ -654,6 +654,7 @@ void view_unmap(struct sway_view *view) {
struct sway_seat *seat; struct sway_seat *seat;
wl_list_for_each(seat, &server.input->seats, link) { wl_list_for_each(seat, &server.input->seats, link) {
seat->cursor->image_surface = NULL;
seat_consider_warp_to_focus(seat); seat_consider_warp_to_focus(seat);
} }