aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-07-14 18:24:52 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-07-14 18:24:52 +0000
commitf962fb236ecfb76e01589865022817d9bf9133b7 (patch)
treec8a246d0c1f56eb5d4a7ba74d119beb4a13b0397
parentselection: no need to try to detect multi-column chars at the end of the line (diff)
term: copy current VT attributes to multi-column spacer cells
And refactor: break out spacer-writing code to a function, since we do exactly the same thing in two places.
-rw-r--r--terminal.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/terminal.c b/terminal.c
index e9bb0812..78c72ada 100644
--- a/terminal.c
+++ b/terminal.c
@@ -2387,6 +2387,17 @@ print_insert(struct terminal *term, int width)
row->cells[i].attrs.clean = 0;
}
+static void
+print_spacer(struct terminal *term, int col)
+{
+ struct row *row = term->grid->cur_row;
+ struct cell *cell = &row->cells[col];
+
+ cell->wc = CELL_MULT_COL_SPACER;
+ cell->attrs = term->vt.attrs;
+ cell->attrs.clean = 0;
+}
+
void
term_print(struct terminal *term, wchar_t wc, int width)
{
@@ -2401,11 +2412,8 @@ term_print(struct terminal *term, wchar_t wc, int width)
{
/* Multi-column character that doesn't fit on current line -
* 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;
- }
+ for (size_t i = term->grid->cursor.point.col; i < term->cols; i++)
+ print_spacer(term, i);
/* And force a line-wrap */
term->grid->cursor.lcf = 1;
@@ -2427,10 +2435,7 @@ term_print(struct terminal *term, wchar_t wc, int width)
/* Advance cursor the 'additional' columns while dirty:ing the cells */
for (int i = 1; i < width && term->grid->cursor.point.col < term->cols - 1; i++) {
term->grid->cursor.point.col++;
-
- struct cell *cell = &row->cells[term->grid->cursor.point.col];
- cell->wc = CELL_MULT_COL_SPACER;
- cell->attrs.clean = 0;
+ print_spacer(term, term->grid->cursor.point.col);
}
/* Advance cursor */