aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--grid.c38
1 files changed, 26 insertions, 12 deletions
diff --git a/grid.c b/grid.c
index 459bf8f5..e0b18881 100644
--- a/grid.c
+++ b/grid.c
@@ -1087,21 +1087,35 @@ grid_resize_and_reflow(
new_row->shell_integration.cmd_end = new_col_idx;
if (unlikely(width > new_cols)) {
- /* Wide character no longer fits on a row, replace
- it with a single space */
- new_row->cells[new_col_idx++].wc = 0;
- c++;
-
- /* Walk past the SPACER cells */
- for (int i = 1; i < width; i++, c++, old++)
- ;
+ /*
+ * Wide character no longer fits on a row, replace
+ * it with a single space.
+ */
+ if (i == 0) {
+ /*
+ * Don't increment new_col_idx here, to ensure
+ * all the TP logic above maps to *this* cell
+ * for the subsequent SPACER cells we're
+ * skipping.
+ */
+ new_row->cells[new_col_idx] = *old;
+ new_row->cells[new_col_idx].wc = 0;
+ }
- /* Continue with next character in the *old* grid */
- break;
+ if (i == width - 1) {
+ /*
+ * Last SPACER - advance new_col_idx. This
+ * ensures we're consistent with the above -
+ * we've replaced a wide character with a
+ * single, empty cell, and advanced
+ * new_col_idx *once*.
+ */
+ new_col_idx++;
+ }
+ } else {
+ new_row->cells[new_col_idx++] = *old;
}
- new_row->cells[new_col_idx++] = *old;
-
/*
* TODO: simulate LCF instead?
*