mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-14 05:33:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pgo: don’t re-use the rows between the ‘normal’ and ‘alt’ grids

Browse source 
This used to work because we never free:d any of the rows. Now
however, we do free (some of) them when reverse scrolling. This means
we can no longer re-use the rows between the two screens.

Closes #1196
This commit is contained in:
Daniel Eklöf 2022-10-18 18:31:18 +02:00
parent c4f08a3b9a
commit 3ba03901b8
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

30
pgo/pgo.c
View file

@ -228,10 +228,14 @@ main(int argc, const char *const *argv)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
struct row **rows = calloc(grid_row_count, sizeof(rows[0])); struct row **normal_rows = calloc(grid_row_count, sizeof(normal_rows[0]));
struct row **alt_rows = calloc(grid_row_count, sizeof(alt_rows[0]));
for (int i = 0; i < grid_row_count; i++) { for (int i = 0; i < grid_row_count; i++) {
rows[i] = calloc(1, sizeof(*rows[i])); normal_rows[i] = calloc(1, sizeof(*normal_rows[i]));
rows[i]->cells = calloc(col_count, sizeof(rows[i]->cells[0])); normal_rows[i]->cells = calloc(col_count, sizeof(normal_rows[i]->cells[0]));
alt_rows[i] = calloc(1, sizeof(*alt_rows[i]));
alt_rows[i]->cells = calloc(col_count, sizeof(alt_rows[i]->cells[0]));
} }
struct config conf = { struct config conf = {
@ -254,14 +258,14 @@ main(int argc, const char *const *argv)
.normal = { .normal = {
.num_rows = grid_row_count, .num_rows = grid_row_count,
.num_cols = col_count, .num_cols = col_count,
.rows = rows, .rows = normal_rows,
.cur_row = rows[0], .cur_row = normal_rows[0],
}, },
.alt = { .alt = {
.num_rows = grid_row_count, .num_rows = grid_row_count,
.num_cols = col_count, .num_cols = col_count,
.rows = rows, .rows = alt_rows,
.cur_row = rows[0], .cur_row = alt_rows[0],
}, },
.scale = 1, .scale = 1,
.width = col_count * 8, .width = col_count * 8,
@ -371,11 +375,17 @@ out:
tll_free(wayl.terms); tll_free(wayl.terms);
for (int i = 0; i < grid_row_count; i++) { for (int i = 0; i < grid_row_count; i++) {
free(rows[i]->cells); if (normal_rows[i] != NULL)
free(rows[i]); free(normal_rows[i]->cells);
free(normal_rows[i]);
if (alt_rows[i] != NULL)
free(alt_rows[i]->cells);
free(alt_rows[i]);
} }
free(rows); free(normal_rows);
free(alt_rows);
close(lower_fd); close(lower_fd);
close(upper_fd); close(upper_fd);
return ret; return ret;