From 1006608093fbbe19103f63fc1140b122a3904500 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 16 Mar 2020 12:00:25 +0100 Subject: alt-screen: use a custom 'saved' cursor when switching to alt screen This fixes an issue where we failed to restore the cursor correctly when exiting from the alternate screen, if the client had sent escapes to save the cursor position while inside the alternate screen. This was because we used the *same* storage for saving the cursor position through escapes, as for saving it when entering the alternate screen. Fix by using a custom variable dedicated to normal <--> alt screen switching. --- csi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'csi.c') diff --git a/csi.c b/csi.c index 6147f27b..189188c6 100644 --- a/csi.c +++ b/csi.c @@ -761,7 +761,7 @@ csi_dispatch(struct terminal *term, uint8_t final) break; case 'u': - term_restore_cursor(term); + term_restore_cursor(term, &term->saved_cursor); break; case 't': { @@ -1014,7 +1014,7 @@ csi_dispatch(struct terminal *term, uint8_t final) selection_cancel(term); term->grid = &term->alt; - term->saved_cursor = term->cursor; + term->alt_saved_cursor = term->cursor; term_cursor_to(term, term->cursor.point.row, term->cursor.point.col); @@ -1137,7 +1137,7 @@ csi_dispatch(struct terminal *term, uint8_t final) selection_cancel(term); term->grid = &term->normal; - term_restore_cursor(term); + term_restore_cursor(term, &term->alt_saved_cursor); tll_free(term->alt.damage); tll_free(term->alt.scroll_damage); -- cgit v1.3