aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-02-12 19:39:43 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-02-12 19:39:43 +0000
commit4b328ead5e7b7fd96576187429afe210b252bddc (patch)
treebebd0e43176c2accff84f94b4605a94f544830d3 /render.c
parentrender: resize; heuristics to prevent prompt from being printed on a newline (diff)
render: resize: do linefeed *after* updating cursor position
Diffstat (limited to 'render.c')
-rw-r--r--render.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/render.c b/render.c
index 6c7c5ee4..1857a63d 100644
--- a/render.c
+++ b/render.c
@@ -1057,7 +1057,7 @@ reflow(struct terminal *term, struct row **new_grid, int new_cols, int new_rows,
*/
if (empty_count < old_cols &&
- r < old_rows - 1 &&
+ //r < old_rows - 1 &&
(old_row->cells[old_cols - 1].wc == 0 ||
old_row->cells[old_cols - 1].attrs.linefeed))
{
@@ -1230,16 +1230,20 @@ maybe_resize(struct terminal *term, int width, int height, bool force)
cursor_row += term->grid->num_rows;
/* Heuristic to prevent a new prompt from being printed a new line */
+ bool do_linefeed = false;
if (term->cursor.point.col > 0)
cursor_row--;
else if (cursor_row >= term->rows)
- term_linefeed(term);
+ do_linefeed = true;
term_cursor_to(
term,
min(max(cursor_row, 0), term->rows - 1),
min(term->cursor.point.col, term->cols - 1));
+ if (do_linefeed)
+ term_linefeed(term);
+
term->render.last_cursor.cell = NULL;
tll_free(term->normal.scroll_damage);
tll_free(term->alt.scroll_damage);