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. --- grid.h | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'grid.h') diff --git a/grid.h b/grid.h index ba31fe4e..47b68839 100644 --- a/grid.h +++ b/grid.h @@ -3,18 +3,34 @@ #include #include "terminal.h" +void grid_swap_row(struct grid *grid, int row_a, int row_b); +struct row *grid_row_alloc(int cols); +void grid_row_free(struct row *row); + static inline struct row * -grid_row(struct grid *grid, int row) +grid_row(struct grid *grid, int row_no) { assert(grid->offset >= 0); - return grid->rows[(grid->offset + row + grid->num_rows) % grid->num_rows]; + + int real_row = (grid->offset + row_no + grid->num_rows) % grid->num_rows; + struct row *row = grid->rows[real_row]; + + if (row == NULL) { + row = grid_row_alloc(grid->num_cols); + grid->rows[real_row] = row; + } + + return row; } static inline struct row * -grid_row_in_view(struct grid *grid, int row) +grid_row_in_view(struct grid *grid, int row_no) { assert(grid->view >= 0); - return grid->rows[(grid->view + row + grid->num_rows) % grid->num_rows]; -} -void grid_swap_row(struct grid *grid, int row_a, int row_b); + int real_row = (grid->offset + row_no + grid->num_rows) % grid->num_rows; + struct row *row = grid->rows[real_row]; + + assert(row != NULL); + return row; +} -- cgit v1.3