diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | csi.c | 6 | ||||
| -rw-r--r-- | terminal.c | 10 | ||||
| -rw-r--r-- | terminal.h | 2 | ||||
| -rw-r--r-- | vt.c | 2 |
5 files changed, 11 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 00fda7e8..a4e76cbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ ### Fixed * Sixel images moved or deleted on window resize. +* Cursor sometimes incorrectly restored on exit from alternate screen. ### Security @@ -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); @@ -1120,7 +1120,7 @@ term_reset(struct terminal *term, bool hard) if (term->grid == &term->alt) { term->grid = &term->normal; - term_restore_cursor(term); + term_restore_cursor(term, &term->alt_saved_cursor); selection_cancel(term); } @@ -1645,12 +1645,12 @@ term_reset_view(struct terminal *term) } void -term_restore_cursor(struct terminal *term) +term_restore_cursor(struct terminal *term, const struct cursor *cursor) { - int row = min(term->saved_cursor.point.row, term->rows - 1); - int col = min(term->saved_cursor.point.col, term->cols - 1); + int row = min(cursor->point.row, term->rows - 1); + int col = min(cursor->point.col, term->cols - 1); term_cursor_to(term, row, col); - term->cursor.lcf = term->saved_cursor.lcf; + term->cursor.lcf = cursor->lcf; } void @@ -486,7 +486,7 @@ void term_reverse_index(struct terminal *term); void term_arm_blink_timer(struct terminal *term); -void term_restore_cursor(struct terminal *term); +void term_restore_cursor(struct terminal *term, const struct cursor *cursor); void term_visual_focus_in(struct terminal *term); void term_visual_focus_out(struct terminal *term); @@ -347,7 +347,7 @@ action_esc_dispatch(struct terminal *term, uint8_t final) break; case '8': - term_restore_cursor(term); + term_restore_cursor(term, &term->saved_cursor); term->vt.attrs = term->vt.saved_attrs; term->charsets = term->saved_charsets; break; |
