diff options
| author | CismonX <admin@cismon.net> | 2026-10-10 23:29:39 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2026-10-25 10:47:06 +0000 |
| commit | 0e7e943062cc002b07d107f408eea7208f2d836c (patch) | |
| tree | 1f12b535bac163fc0eed292b0c217c5f01bda5b6 | |
| parent | changelog: fix links (diff) | |
selection: fix row comparison in selection update
Absolute row numbers may wrap around, thus not suitable for comparison.
This may incorrectly update the selection direction and break word-wise
selection.
Compare scrollback-relative row numbers instead.
Fixes #2483.
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | selection.c | 11 |
2 files changed, 11 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c1691b1..bcfa0262 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -91,10 +91,13 @@ * Crash when a buggy compositor sends an `ime_enter()` event with a `NULL` surface ([#2467][2467]). * Possible memory leak when processing keymap data ([#2482][2482]). +* Word-wise selection sometimes not working properly due to incorrect + selection direction ([#2483][2483]). [2432]: https://codeberg.org/dnkl/foot/pulls/2432 [2467]: https://codeberg.org/dnkl/foot/issues/2467 [2482]: https://codeberg.org/dnkl/foot/pulls/2482 +[2483]: https://codeberg.org/dnkl/foot/issues/2483 ### Security diff --git a/selection.c b/selection.c index 85cc6a61..261c4fb3 100644 --- a/selection.c +++ b/selection.c @@ -1140,18 +1140,23 @@ selection_update(struct terminal *term, int col, int row) struct coord new_start = term->selection.coords.start; struct coord new_end = {col, term->grid->view + row}; + int rel_new_start_row = grid_row_abs_to_sb(term->grid, term->rows, new_start.row); + int rel_new_end_row = grid_row_abs_to_sb(term->grid, term->rows, new_end.row); + LOG_DBG("selection updated: start = %d,%d, end = %d,%d -> %d, %d", term->selection.coords.start.row, term->selection.coords.start.col, term->selection.coords.end.row, term->selection.coords.end.col, new_end.row, new_end.col); /* Adjust start point if the selection has changed 'direction' */ - if (!(new_end.row == new_start.row && new_end.col == new_start.col)) { + if (!(rel_new_end_row == rel_new_start_row && new_end.col == new_start.col)) { enum selection_direction new_direction = term->selection.direction; struct coord *pivot_start = &term->selection.pivot.start; struct coord *pivot_end = &term->selection.pivot.end; + int rel_pivot_start_row = grid_row_abs_to_sb(term->grid, term->rows, pivot_start->row); + if (term->selection.kind == SELECTION_BLOCK) { if (new_end.col >= pivot_start->col) new_direction = SELECTION_RIGHT; @@ -1167,8 +1172,8 @@ selection_update(struct terminal *term, int col, int row) new_start = *pivot_start; term->selection.direction = new_direction; } else { - if (new_end.row < pivot_start->row || - (new_end.row == pivot_start->row && + if (rel_new_end_row < rel_pivot_start_row || + (rel_new_end_row == rel_pivot_start_row && new_end.col < pivot_start->col)) { /* New end point is before the start point */ |
