aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-04-16 17:38:30 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-04-16 17:38:30 +0000
commit5546b40369b7bc20201a8f3a327be0ff84af7f5a (patch)
tree7c55ea4cdc30e60c8b60290c02e27b701082af5a /render.c
parentgrid: move 'cursor' state from terminal to grid (diff)
grid: grid_reflow() now translates cursor coordinates
Diffstat (limited to 'render.c')
-rw-r--r--render.c36
1 files changed, 2 insertions, 34 deletions
diff --git a/render.c b/render.c
index f0decd93..ef0f0608 100644
--- a/render.c
+++ b/render.c
@@ -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: