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

grid: reflow: handle multi column character spacers

Browse source 
Ignore *old* cells containing spacers.

Pad new grid with spacers if a multi-column character doesn't fit at
the end of a line.

Insert spacers after a multi-column character.
This commit is contained in:
Daniel Eklöf 2020-07-14 17:04:59 +02:00
parent 6d7aba3ea0
commit 9ea42ef226
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

24
grid.c
View file

@ -222,12 +222,22 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols,
/* Multi-column characters are never cut in half */ /* Multi-column characters are never cut in half */
assert(c + width <= old_cols); assert(c + width <= old_cols);
for (int i = 0; i < empty_count + width; i++) { for (int i = 0; i < empty_count + 1; i++) {
const struct cell *old_cell = &old_row->cells[c - empty_count + i]; const struct cell *old_cell = &old_row->cells[c - empty_count + i];
if (old_cell->wc == CELL_MULT_COL_SPACER)
continue;
/* Out of columns on current row in new grid? */ /* Out of columns on current row in new grid? */
if (new_col_idx + max(1, wcwidth(old_cell->wc)) > new_cols) if (new_col_idx + max(1, wcwidth(old_cell->wc)) > new_cols) {
/* Pad to end-of-line with spacers, then line-wrap */
for (;new_col_idx < new_cols; new_col_idx++) {
new_row->cells[new_col_idx] = (struct cell){};
new_row->cells[new_col_idx].wc = CELL_MULT_COL_SPACER;
new_row->cells[new_col_idx].attrs.clean = 1;
}
line_wrap(); line_wrap();
}
assert(new_row != NULL); assert(new_row != NULL);
assert(new_col_idx >= 0); assert(new_col_idx >= 0);
@ -247,6 +257,16 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols,
} }
} }
new_col_idx++; new_col_idx++;
/* For multi-column characters, insert spacers in the
* subsequent cells */
for (size_t i = 0; i < width - 1; i++) {
assert(new_col_idx < new_cols);
new_row->cells[new_col_idx] = (struct cell){};
new_row->cells[new_col_idx].wc = CELL_MULT_COL_SPACER;
new_row->cells[new_col_idx].attrs.clean = 1;
new_col_idx++;
}
} }
c += width - 1; c += width - 1;