aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-02-12 19:16:42 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-02-12 19:16:42 +0000
commitea52d3e570c13c820633373522c3fe1f0e6b6e98 (patch)
tree8dff6d5ed435fe24cc44721b04052d56efd9dbef
parentrender: resize: only stay on current row if col is within grid width (diff)
render: resize: temporarily disable row adjustment
This was intended to prevent a new prompt from being printed on a newline. However, it breaks normal output under certain conditions, that have yet to be determined exactly what they are.
-rw-r--r--render.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/render.c b/render.c
index e854b6b0..27dfb86c 100644
--- a/render.c
+++ b/render.c
@@ -1057,6 +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 &&
(old_row->cells[old_cols - 1].wc == 0 ||
old_row->cells[old_cols - 1].attrs.linefeed))
{
@@ -1228,8 +1229,10 @@ maybe_resize(struct terminal *term, int width, int height, bool force)
while (cursor_row < 0)
cursor_row += term->grid->num_rows;
+#if 0
if (term->cursor.point.col < term->cols - 1)
cursor_row--;
+#endif
assert(cursor_row < term->rows);
term_cursor_to(