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

selection: improve handling of multi-column characters

Browse source 
* Don't assume multi-column characters are exactly *two* columns
* Check for CELL_MULT_COL_SPACER values instead of using wcwidth()
This commit is contained in:
Daniel Eklöf 2020-08-13 18:33:22 +02:00
parent 3816a3b460
commit 1decd8e9de
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
selection.c
View file

@ -375,23 +375,24 @@ selection_update(struct terminal *term, int col, int row)
}
}
/* Handle double-width characters */
/* If an end point is in the middle of a multi-column character,
* expand the selection to cover the entire character */
if (new_start.row < new_end.row ||
(new_start.row == new_end.row && new_start.col <= new_end.col))
{
if (new_start.col - 1 >= 0)
if (wcwidth(row_start->cells[new_start.col - 1].wc) > 1)
new_start.col--;
if (new_end.col + 1 < term->cols)
if (wcwidth(row_end->cells[new_end.col].wc) > 1)
new_end.col++;
while (new_start.col >= 1 &&
row_start->cells[new_start.col].wc == CELL_MULT_COL_SPACER)
new_start.col--;
while (new_end.col < term->cols - 1 &&
row_end->cells[new_end.col + 1].wc == CELL_MULT_COL_SPACER)
new_end.col++;
} else {
if (new_end.col - 1 >= 0)
if (wcwidth(row_end->cells[new_end.col - 1].wc) > 1)
new_end.col--;
if (new_start.col + 1 < term->cols)
if (wcwidth(row_start->cells[new_start.col].wc) > 1)
new_start.col++;
while (new_end.col >= 1 &&
row_end->cells[new_end.col].wc == CELL_MULT_COL_SPACER)
new_end.col--;
while (new_start.col < term->cols - 1 &&
row_start->cells[new_start.col + 1].wc == CELL_MULT_COL_SPACER)
new_start.col++;
}
selection_modify(term, new_start, new_end);