From 739e7d76b4b70da91c50a53026a83d382dd73bae Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Thu, 27 Jan 2022 18:36:28 +0100 Subject: search: remember last searched-for string between searches Regardless of how we exit search mode (commit or cancel), the search string is remembered. The next time we enter search mode, the last searched-for string will be used when searching for the next/prev match (ctrl+r, ctrl+s), and the search query is empty. --- search.c | 32 +++++++++++++++++++++++++++----- terminal.c | 1 + terminal.h | 5 +++++ 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/search.c b/search.c index 2ef6a44f..8c5051af 100644 --- a/search.c +++ b/search.c @@ -94,10 +94,16 @@ search_cancel_keep_selection(struct terminal *term) struct wl_window *win = term->window; wayl_win_subsurface_destroy(&win->search); - free(term->search.buf); + if (term->search.len > 0) { + free(term->search.last.buf); + term->search.last.buf = term->search.buf; + term->search.last.len = term->search.len; + } else + free(term->search.buf); + term->search.buf = NULL; - term->search.len = 0; - term->search.sz = 0; + term->search.len = term->search.sz = 0; + term->search.cursor = 0; term->search.match = (struct coord){-1, -1}; term->search.match_len = 0; @@ -630,7 +636,15 @@ execute_binding(struct seat *seat, struct terminal *term, return true; case BIND_ACTION_SEARCH_FIND_PREV: - if (term->search.match_len > 0) { + if (term->search.last.buf != NULL && term->search.len == 0) { + add_wchars(term, term->search.last.buf, term->search.last.len); + + free(term->search.last.buf); + term->search.last.buf = NULL; + term->search.last.len = 0; + } + + else if (term->search.match_len > 0) { int new_col = term->search.match.col - 1; int new_row = term->search.match.row; @@ -648,7 +662,15 @@ execute_binding(struct seat *seat, struct terminal *term, return true; case BIND_ACTION_SEARCH_FIND_NEXT: - if (term->search.match_len > 0) { + if (term->search.last.buf != NULL && term->search.len == 0) { + add_wchars(term, term->search.last.buf, term->search.last.len); + + free(term->search.last.buf); + term->search.last.buf = NULL; + term->search.last.len = 0; + } + + else if (term->search.match_len > 0) { int new_col = term->search.match.col + 1; int new_row = term->search.match.row; diff --git a/terminal.c b/terminal.c index c639d3d1..84a43290 100644 --- a/terminal.c +++ b/terminal.c @@ -1638,6 +1638,7 @@ term_destroy(struct terminal *term) &term->custom_glyphs.legacy, GLYPH_LEGACY_COUNT); free(term->search.buf); + free(term->search.last.buf); if (term->render.workers.threads != NULL) { for (size_t i = 0; i < term->render.workers.count; i++) { diff --git a/terminal.h b/terminal.h index e6c82f41..1ff4b3b6 100644 --- a/terminal.h +++ b/terminal.h @@ -514,6 +514,11 @@ struct terminal { bool view_followed_offset; struct coord match; size_t match_len; + + struct { + wchar_t *buf; + size_t len; + } last; } search; struct wayland *wl; -- cgit v1.3