mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-24 01:40:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

grid: grid_reflow() now translates cursor coordinates

Browse source
This commit is contained in:
Daniel Eklöf 2020-04-16 19:38:30 +02:00
parent 89559d5466
commit 5546b40369
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 54 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

36
render.c
View file

@ -1754,10 +1754,8 @@ maybe_resize(struct terminal *term, int width, int height, bool force)
}
/* Reflow grids */
int last_normal_row = grid_reflow(
&term->normal, new_normal_grid_rows, new_cols, old_rows, new_rows);
int last_alt_row = grid_reflow(
&term->alt, new_alt_grid_rows, new_cols, old_rows, new_rows);
grid_reflow(&term->normal, new_normal_grid_rows, new_cols, old_rows, new_rows);
grid_reflow(&term->alt, new_alt_grid_rows, new_cols, old_rows, new_rows);
/* Reset tab stops */
tll_free(term->tab_stops);
@ -1789,36 +1787,6 @@ maybe_resize(struct terminal *term, int width, int height, bool force)
if (term->scroll_region.end >= old_rows)
term->scroll_region.end = term->rows;
/* Position cursor at the last copied row */
/* TODO: can we do better? */
int cursor_row = term->grid == &term->normal
? last_normal_row - term->normal.offset
: last_alt_row - term->alt.offset;
while (cursor_row < 0)
cursor_row += term->grid->num_rows;
assert(cursor_row >= 0);
assert(cursor_row < term->rows);
term_cursor_to(
term,
cursor_row,
min(term->grid->cursor.point.col, term->cols - 1));
/* If in alt screen, update the saved 'normal' cursor too */
if (term->grid == &term->alt) {
int cursor_row = last_normal_row - term->normal.offset;
while (cursor_row < 0)
cursor_row += term->grid->num_rows;
term->normal.cursor.lcf = false;
term->normal.cursor.point.row = cursor_row;
term->normal.cursor.point.col = min(
term->normal.cursor.point.col, term->cols - 1);
}
term->render.last_cursor.cell = NULL;
damage_view: