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

term: print: write special value CELL_MULT_COL_SPACER to extra cells

Browse source 
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.
This commit is contained in:
Daniel Eklöf 2020-07-14 16:49:11 +02:00
parent 5c99e8013b
commit df2927e088
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

21
terminal.c
View file

@ -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;
}