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

selection: foreach: don't call callback for trailing multi-character cells

Browse source
This commit is contained in:
Daniel Eklöf 2020-07-14 12:59:36 +02:00
parent 7d134e6b1c
commit 3bc404b5a3
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
selection.c
View file

@ -135,6 +135,8 @@ foreach_selected_normal(
c++) c++)
{ {
cb(term, row, &row->cells[c], c, data); cb(term, row, &row->cells[c], c, data);
c += max(1, wcwidth(row->cells[c].wc)) - 1;
assert(c < term->cols);
} }
start_col = 0; start_col = 0;
@ -165,8 +167,11 @@ foreach_selected_block(
struct row *row = term->grid->rows[real_r]; struct row *row = term->grid->rows[real_r];
assert(row != NULL); assert(row != NULL);
for (int c = top_left.col; c <= bottom_right.col; c++) for (int c = top_left.col; c <= bottom_right.col; c++) {
cb(term, row, &row->cells[c], c, data); cb(term, row, &row->cells[c], c, data);
c += max(1, wcwidth(row->cells[c].wc)) - 1;
assert(c < term->cols);
}
} }
} }