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

selection: don't allow only half of double-width characters to be selected

Browse source
This commit is contained in:
Daniel Eklöf 2020-06-02 18:21:39 +02:00
parent bd565fe99b
commit 056fd4ffe0
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 30 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

29
selection.c
View file

@ -355,6 +355,7 @@ selection_start(struct terminal *term, int col, int row,
kind == SELECTION_NORMAL ? "normal" :
kind == SELECTION_BLOCK ? "block" : "<unknown>",
row, col);
term->selection.kind = kind;
term->selection.start = (struct coord){col, term->grid->view + row};
term->selection.end = (struct coord){-1, -1};
@ -434,8 +435,34 @@ selection_update(struct terminal *term, int col, int row)
assert(term->grid->view + row != -1);
struct coord new_start = term->selection.start;
struct coord new_end = {col, term->grid->view + row};
selection_modify(term, term->selection.start, new_end);
size_t start_row_idx = new_start.row & (term->grid->num_rows - 1);
size_t end_row_idx = new_end.row & (term->grid->num_rows - 1);
const struct row *row_start = term->grid->rows[start_row_idx];
const struct row *row_end = term->grid->rows[end_row_idx];
/* Handle double-width characters */
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++;
} 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_end->cells[new_start.col].wc) > 1)
new_start.col++;
}
selection_modify(term, new_start, new_end);
}
void