aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-07-14 14:49:11 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-07-14 14:49:11 +0000
commitdf2927e088ceb2119264d1a970c22a450f00005b (patch)
treef902d442373f54b7f69aa9e0d6d62175427ade34 /terminal.c
parentterm: rename COMB_CHARS_LO,HI -> CELL_COMB_CHARS_LO,HI (diff)
term: print: write special value CELL_MULT_COL_SPACER to extra cells
When printing a multi-column character, write CELL_MULT_COL_SPACER instead of '0' to both padding cells (when character doesn't fit at the end of the line), and to the cells following the actual character.
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/terminal.c b/terminal.c
index eda311da..2a232de3 100644
--- a/terminal.c
+++ b/terminal.c
@@ -2397,18 +2397,15 @@ term_print(struct terminal *term, wchar_t wc, int width)
term->grid->cursor.point.col + width > term->cols)
{
/* Multi-column character that doesn't fit on current line -
- * force a line wrap */
- term->grid->cursor.lcf = 1;
+ * pad with spacers */
+ for (size_t i = term->grid->cursor.point.col; i < term->cols; i++) {
+ struct cell *cell = &term->grid->cur_row->cells[i];
+ cell->wc = CELL_MULT_COL_SPACER;
+ cell->attrs.clean = 0;
+ }
- /*
- * TODO: should we insert place holder values in the remaining
- * cells? This would allow e.g. text extraction to simply
- * skip these, instead of trying to recognize a sequence of
- * empty cells at the end of the line followed by a
- * multi-column character...
- *
- * Might also make text reflow easier, or even more correct.
- */
+ /* And force a line-wrap */
+ term->grid->cursor.lcf = 1;
}
print_linewrap(term);
@@ -2431,7 +2428,7 @@ term_print(struct terminal *term, wchar_t wc, int width)
term->grid->cursor.point.col++;
struct cell *cell = &row->cells[term->grid->cursor.point.col];
- cell->wc = 0;
+ cell->wc = CELL_MULT_COL_SPACER;
cell->attrs.clean = 0;
}