aboutsummaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-07-10 14:27:55 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-07-10 14:27:55 +0000
commit1ff1b3a71e8edcad62c98a3c80b6e1d8a77bc26f (patch)
tree304f6289d1f9c1066cb3e198fa0b3e9120ba82ca /main.c
parentgrid: don't implement grid_swap_row() in the header file (diff)
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.
Diffstat (limited to 'main.c')
-rw-r--r--main.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/main.c b/main.c
index dd16d277..0b3485bc 100644
--- a/main.c
+++ b/main.c
@@ -624,15 +624,11 @@ out:
if (term.kbd.xkb != NULL)
xkb_context_unref(term.kbd.xkb);
- for (int row = 0; row < term.normal.num_rows; row++) {
- free(term.normal.rows[row]->cells);
- free(term.normal.rows[row]);
- }
+ for (int row = 0; row < term.normal.num_rows; row++)
+ grid_row_free(term.normal.rows[row]);
free(term.normal.rows);
- for (int row = 0; row < term.alt.num_rows; row++) {
- free(term.alt.rows[row]->cells);
- free(term.alt.rows[row]);
- }
+ for (int row = 0; row < term.alt.num_rows; row++)
+ grid_row_free(term.alt.rows[row]);
free(term.alt.rows);
for (size_t i = 0; i < sizeof(term.fonts) / sizeof(term.fonts[0]); i++) {