From 1ff1b3a71e8edcad62c98a3c80b6e1d8a77bc26f Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 10 Jul 2019 16:27:55 +0200 Subject: grid: don't pre-allocate the entire grid (with all scrollback lines) The row array may now contain NULL pointers. This means the corresponding row hasn't yet been allocated and initialized. On a resize, we explicitly allocate the visible rows. Uninitialized rows are then allocated the first time they are referenced. --- commands.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'commands.c') diff --git a/commands.c b/commands.c index 472cf880..75ce8cee 100644 --- a/commands.c +++ b/commands.c @@ -26,7 +26,7 @@ cmd_scrollback_up(struct terminal *term, int rows) assert(new_view < term->grid->num_rows); /* Avoid scrolling in uninitialized rows */ - while (!term->grid->rows[new_view]->initialized) + while (term->grid->rows[new_view] == NULL) new_view = (new_view + 1) % term->grid->num_rows; if (new_view == term->grid->view) { @@ -87,7 +87,7 @@ cmd_scrollback_down(struct terminal *term, int rows) for (int i = 0; i < term->rows; i++) { int row_no = (new_view + i) % term->grid->num_rows; - if (!term->grid->rows[row_no]->initialized) { + if (term->grid->rows[row_no] == NULL) { all_initialized = false; new_view--; break; -- cgit v1.3