aboutsummaryrefslogtreecommitdiff
path: root/grid.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-05-15 13:15:32 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-05-17 15:57:41 +0000
commit11c7990ec8932b750f20f4d42f2414ba73b68368 (patch)
treecd2409ed4e8515ea27c1dfd8e2b2554bf2195fb8 /grid.c
parentMerge branch 'font-scaling-factor-wrong' (diff)
grid: reflow: don’t initialize newly allocated rows
We’re going to write to it immediately anyway. In most cases, *all* newly allocated, and zero-initialized, cells are overwritten. So let’s skip the zero-initialization of the new cells. There are two cases where we need to explicitly clear cells now: * When inserting a hard line break - erase the remaining cells * When done, the *last* row may not have been completely written - erase the remaining cells
Diffstat (limited to 'grid.c')
-rw-r--r--grid.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/grid.c b/grid.c
index eb923756..996cf8d4 100644
--- a/grid.c
+++ b/grid.c
@@ -341,11 +341,10 @@ _line_wrap(struct grid *old_grid, struct row **new_grid, struct row *row,
if (new_row == NULL) {
/* Scrollback not yet full, allocate a completely new row */
- new_row = grid_row_alloc(col_count, true);
+ new_row = grid_row_alloc(col_count, false);
new_grid[*row_idx] = new_row;
} else {
/* Scrollback is full, need to re-use a row */
- memset(new_row->cells, 0, col_count * sizeof(new_row->cells[0]));
grid_row_reset_extra(new_row);
new_row->linebreak = false;
@@ -451,7 +450,7 @@ grid_resize_and_reflow(
struct row *new_row = new_grid[new_row_idx];
xassert(new_row == NULL);
- new_row = grid_row_alloc(new_cols, true);
+ new_row = grid_row_alloc(new_cols, false);
new_grid[new_row_idx] = new_row;
/* Start at the beginning of the old grid's scrollback. That is,
@@ -649,6 +648,9 @@ grid_resize_and_reflow(
}
if (old_row->linebreak) {
+ /* Erase the remaining cells */
+ memset(&new_row->cells[new_col_idx], 0,
+ (new_cols - new_col_idx) * sizeof(new_row->cells[0]));
new_row->linebreak = true;
line_wrap();
}
@@ -657,6 +659,10 @@ grid_resize_and_reflow(
#undef line_wrap
}
+ /* Erase the remaining cells */
+ memset(&new_row->cells[new_col_idx], 0,
+ (new_cols - new_col_idx) * sizeof(new_row->cells[0]));
+
xassert(old_rows == 0 || *next_tp == &terminator);
#if defined(_DEBUG)