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

grid: reflow: always run qsort_r(), handle rows == 0 in tp_cmp() instead

Browse source
This commit is contained in:
Daniel Eklöf 2021-05-15 13:00:46 +02:00
parent 528e91aece
commit c7e51bdf72
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
grid.c
View file

@ -400,9 +400,9 @@ tp_cmp(const void *_a, const void *_b, void *_arg)
int b_row = (b->row - ctx->scrollback_start + ctx->rows) & (ctx->rows - 1); int b_row = (b->row - ctx->scrollback_start + ctx->rows) & (ctx->rows - 1);
xassert(a_row >= 0); xassert(a_row >= 0);
xassert(a_row < ctx->rows); xassert(a_row < ctx->rows || ctx->rows == 0);
xassert(b_row >= 0); xassert(b_row >= 0);
xassert(b_row < ctx->rows); xassert(b_row < ctx->rows || ctx->rows == 0);
if (a_row < b_row) if (a_row < b_row)
return -1; return -1;
@ -485,11 +485,9 @@ grid_resize_and_reflow(
if (!view_follows) if (!view_follows)
tracking_points[tracking_points_count + 2] = &viewport; tracking_points[tracking_points_count + 2] = &viewport;
if (old_rows > 0) { qsort_r(
qsort_r( tracking_points, tp_count - 1, sizeof(tracking_points[0]), &tp_cmp,
tracking_points, tp_count - 1, sizeof(tracking_points[0]), &tp_cmp, &(struct tp_cmp_ctx){.scrollback_start = offset, .rows = old_rows});
&(struct tp_cmp_ctx){.scrollback_start = offset, .rows = old_rows});
}
/* NULL terminate */ /* NULL terminate */
struct coord terminator = {-1, -1}; struct coord terminator = {-1, -1};