diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-07-22 15:53:29 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-07-22 15:57:43 +0000 |
| commit | 251545203baa65364e491ddbe71ab3f8080bfe25 (patch) | |
| tree | 04ae28511ffa429fdade04672815c253e2a2c4c6 | |
| parent | doc: ctlseq: improve description of OSC 52 response (diff) | |
search: reset match state when selection is cancelled
While we’re in scrollback search mode, the selection may be
cancelled (for example, if the application is scrolling out the
selected text). Trying to e.g. extend the search selection after this
has happened triggered a crash.
This fixes it by simply resetting the search match state when the
selection is cancelled.
Closes #644
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | search.c | 7 | ||||
| -rw-r--r-- | search.h | 2 | ||||
| -rw-r--r-- | selection.c | 3 |
4 files changed, 15 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index acb30d6f..c9dfdecb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,9 @@ * Rendering into the right margin area with `tweak.overflowing-glyphs` enabled. * PGO builds with clang (https://codeberg.org/dnkl/foot/issues/642). +* Crash in scrollback search mode when selection has been canceled due + to terminal content updates + (https://codeberg.org/dnkl/foot/issues/644). ### Security @@ -155,6 +155,13 @@ search_cancel(struct terminal *term) selection_cancel(term); } +void +search_selection_cancelled(struct terminal *term) +{ + term->search.match = (struct coord){-1, -1}; + term->search.match_len = 0; +} + static void search_update_selection(struct terminal *term, int start_row, int start_col, @@ -11,3 +11,5 @@ void search_input( const xkb_keysym_t *raw_syms, size_t raw_count, uint32_t serial); void search_add_chars(struct terminal *term, const char *text, size_t len); + +void search_selection_cancelled(struct terminal *term); diff --git a/selection.c b/selection.c index 537614f6..95879445 100644 --- a/selection.c +++ b/selection.c @@ -21,6 +21,7 @@ #include "grid.h" #include "misc.h" #include "render.h" +#include "search.h" #include "uri.h" #include "util.h" #include "vt.h" @@ -1058,6 +1059,8 @@ selection_cancel(struct terminal *term) term->selection.pivot.end = (struct coord){-1, -1}; term->selection.direction = SELECTION_UNDIR; term->selection.ongoing = false; + + search_selection_cancelled(term); } bool |
