aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-07-14 15:04:59 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-07-14 15:04:59 +0000
commit9ea42ef226cdc92c09470a522516a2209b986281 (patch)
tree18e2d505b2f228aec5493d6153a5b0a51adba165
parentterm: print: linewrap + insert *before* inserting SPACERS (diff)
grid: reflow: handle multi column character spacers
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.
-rw-r--r--grid.c24
1 files changed, 22 insertions, 2 deletions
diff --git a/grid.c b/grid.c
index d2905a93..3a595b61 100644
--- a/grid.c
+++ b/grid.c
@@ -222,12 +222,22 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols,
/* Multi-column characters are never cut in half */
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];
+ if (old_cell->wc == CELL_MULT_COL_SPACER)
+ continue;
+
/* 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();
+ }
assert(new_row != NULL);
assert(new_col_idx >= 0);
@@ -247,6 +257,16 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols,
}
}
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;