aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-08-04 16:07:54 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-08-04 16:07:54 +0000
commitc07d14e1c095ac36b4a85ce5bc88f6ba15a4ad8d (patch)
treec633885876359f0b903825d0c03a4ee8f16107bf
parentinput: disable debug loggin (diff)
grid: reflow: don't insert <width> spacer cells for *every* empty cell
Only do it for the last, non-empty cell.
-rw-r--r--CHANGELOG.md2
-rw-r--r--grid.c15
2 files changed, 10 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae73f58f..12566d45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,8 @@
* Command lines for **pipe-visible** and **pipe-scrollback** are now
tokenized (i.e. syntax checked) when the configuration is loaded,
instead of every time the key binding is executed.
+* Incorrect multi-column character spacer insertion when reflowing
+ text.
### Security
diff --git a/grid.c b/grid.c
index 4ccb27ac..4486393b 100644
--- a/grid.c
+++ b/grid.c
@@ -261,14 +261,15 @@ 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);
- print_spacer();
- new_col_idx++;
- }
+ /* For multi-column characters, insert spacers in the
+ * subsequent cells */
+ const struct cell *old_cell = &old_row->cells[c];
+ for (size_t i = 0; i < width - 1; i++) {
+ assert(new_col_idx < new_cols);
+ print_spacer();
+ new_col_idx++;
}
c += width - 1;