mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-04 07:15:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

term: make sure to update 'current row' when restoring saved cursor

Browse source
This commit is contained in:
Daniel Eklöf 2019-07-23 17:57:07 +02:00
parent f7519b5725
commit f5a6304850
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
csi.c
View file

@ -576,6 +576,14 @@ csi_dispatch(struct terminal *term, uint8_t final)
break; break;
} }
case 's':
term->saved_cursor = term->cursor;
break;
case 'u':
term_restore_cursor(term);
break;
case 't': { case 't': {
unsigned param = vt_param_get(term, 0, 0); unsigned param = vt_param_get(term, 0, 0);
@ -794,8 +802,7 @@ csi_dispatch(struct terminal *term, uint8_t final)
if (term->grid == &term->alt) { if (term->grid == &term->alt) {
term->grid = &term->normal; term->grid = &term->normal;
term->cursor = term->saved_cursor; term_restore_cursor(term);
term_cursor_to(term, term->cursor.row, term->cursor.col);
tll_free(term->alt.damage); tll_free(term->alt.damage);
tll_free(term->alt.scroll_damage); tll_free(term->alt.scroll_damage);

8
terminal.c
View file

@ -267,6 +267,14 @@ term_reverse_index(struct terminal *term)
term_cursor_up(term, 1); term_cursor_up(term, 1);
} }
void
term_restore_cursor(struct terminal *term)
{
int row = min(term->saved_cursor.row, term->rows - 1);
int col = min(term->saved_cursor.col, term->cols - 1);
term_cursor_to(term, row, col);
}
void void
term_focus_in(struct terminal *term) term_focus_in(struct terminal *term)
{ {

2
terminal.h
View file

@ -346,6 +346,8 @@ void term_scroll_reverse_partial(
void term_linefeed(struct terminal *term); void term_linefeed(struct terminal *term);
void term_reverse_index(struct terminal *term); void term_reverse_index(struct terminal *term);
void term_restore_cursor(struct terminal *term);
void term_focus_in(struct terminal *term); void term_focus_in(struct terminal *term);
void term_focus_out(struct terminal *term); void term_focus_out(struct terminal *term);
void term_mouse_down(struct terminal *term, int button, int row, int col, void term_mouse_down(struct terminal *term, int button, int row, int col,

2
vt.c
View file

@ -597,7 +597,7 @@ esc_dispatch(struct terminal *term, uint8_t final)
break; break;
case '8': case '8':
term->cursor = term->saved_cursor; term_restore_cursor(term);
term->vt.attrs = term->vt.saved_attrs; term->vt.attrs = term->vt.saved_attrs;
break; break;