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

Merge branch 'selection-recognizes-hard-linebreaks'

Browse source 
Closes #565
This commit is contained in:
Daniel Eklöf 2021-06-01 17:50:24 +02:00
commit d458d46f81
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -142,6 +142,8 @@
(https://codeberg.org/dnkl/foot/issues/547). (https://codeberg.org/dnkl/foot/issues/547).
* Crash when a line wrapping OSC-8 URI crossed the scrollback wrap * Crash when a line wrapping OSC-8 URI crossed the scrollback wrap
around (https://codeberg.org/dnkl/foot/issues/552). around (https://codeberg.org/dnkl/foot/issues/552).
* Selection incorrectly wrapping rows ending with an explicit newline
(https://codeberg.org/dnkl/foot/issues/565).
### Security ### Security

22
selection.c
View file

@ -258,14 +258,21 @@ selection_find_word_boundary_left(struct terminal *term, struct coord *pos,
int next_col = pos->col - 1; int next_col = pos->col - 1;
int next_row = pos->row; int next_row = pos->row;
const struct row *row = grid_row_in_view(term->grid, next_row);
/* Linewrap */ /* Linewrap */
if (next_col < 0) { if (next_col < 0) {
next_col = term->cols - 1; next_col = term->cols - 1;
if (--next_row < 0) if (--next_row < 0)
break; break;
}
const struct row *row = grid_row_in_view(term->grid, next_row); row = grid_row_in_view(term->grid, next_row);
if (row->linebreak) {
/* Hard linebreak, treat as space. I.e. break selection */
break;
}
}
c = row->cells[next_col].wc; c = row->cells[next_col].wc;
while (c >= CELL_SPACER) { while (c >= CELL_SPACER) {
@ -330,14 +337,21 @@ selection_find_word_boundary_right(struct terminal *term, struct coord *pos,
int next_col = pos->col + 1; int next_col = pos->col + 1;
int next_row = pos->row; int next_row = pos->row;
const struct row *row = grid_row_in_view(term->grid, next_row);
/* Linewrap */ /* Linewrap */
if (next_col >= term->cols) { if (next_col >= term->cols) {
if (row->linebreak) {
/* Hard linebreak, treat as space. I.e. break selection */
break;
}
next_col = 0; next_col = 0;
if (++next_row >= term->rows) if (++next_row >= term->rows)
break; break;
}
const struct row *row = grid_row_in_view(term->grid, next_row); row = grid_row_in_view(term->grid, next_row);
}
c = row->cells[next_col].wc; c = row->cells[next_col].wc;
while (c >= CELL_SPACER) { while (c >= CELL_SPACER) {