mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-21 05:33:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

term: copy current VT attributes to multi-column spacer cells

Browse source 
And refactor: break out spacer-writing code to a function, since we do
exactly the same thing in two places.
This commit is contained in:
Daniel Eklöf 2020-07-14 20:24:52 +02:00
parent a2af13a126
commit f962fb236e
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
terminal.c
View file

@ -2387,6 +2387,17 @@ print_insert(struct terminal *term, int width)
row->cells[i].attrs.clean = 0; 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 void
term_print(struct terminal *term, wchar_t wc, int width) 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 - /* Multi-column character that doesn't fit on current line -
* pad with spacers */ * pad with spacers */
for (size_t i = term->grid->cursor.point.col; i < term->cols; i++) { for (size_t i = term->grid->cursor.point.col; i < term->cols; i++)
struct cell *cell = &term->grid->cur_row->cells[i]; print_spacer(term, i);
cell->wc = CELL_MULT_COL_SPACER;
cell->attrs.clean = 0;
}
/* And force a line-wrap */ /* And force a line-wrap */
term->grid->cursor.lcf = 1; 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 */ /* 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++) { for (int i = 1; i < width && term->grid->cursor.point.col < term->cols - 1; i++) {
term->grid->cursor.point.col++; term->grid->cursor.point.col++;
print_spacer(term, 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;
} }
/* Advance cursor */ /* Advance cursor */