diff options
| author | 0WD0 <wd.1105848296@gmail.com> | 2026-06-18 13:50:59 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2026-07-21 09:11:28 +0000 |
| commit | 027ef55842c36b1b6182ebe334a92e402e39e54e (patch) | |
| tree | 8d0211a1b34da19791742397f5b248602c8fd6dd | |
| parent | xmalloc/xsnprintf: simplify some code with new FATAL_ERROR_ON() macro (diff) | |
ime: refresh search matches after IME commit
The IME commit handler appended text to the search buffer and refreshed
the search box, but never called search_find_next(). CJK input into
scrollback search therefore showed no match until another key press
re-triggered the regular search input path. Call search_find_next() in
the commit branch, and apply the same fix to unicode-mode.c. To allow
this, search_find_next() is no longer static.
| -rw-r--r-- | ime.c | 1 | ||||
| -rw-r--r-- | search.c | 2 | ||||
| -rw-r--r-- | search.h | 1 | ||||
| -rw-r--r-- | unicode-mode.c | 5 |
4 files changed, 6 insertions, 3 deletions
@@ -200,6 +200,7 @@ done(void *data, struct zwp_text_input_v3 *zwp_text_input_v3, if (term != NULL) { if (term->is_searching) { search_add_chars(term, text, len); + search_find_next(term, SEARCH_BACKWARD_SAME_POSITION); render_refresh_search(term); } else term_to_slave(term, text, len); @@ -424,7 +424,7 @@ find_next(struct terminal *term, enum search_direction direction, return false; } -static void +void search_find_next(struct terminal *term, enum search_direction direction) { struct grid *grid = term->grid; @@ -14,6 +14,7 @@ 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_find_next(struct terminal *term, enum search_direction direction); void search_selection_cancelled(struct terminal *term); diff --git a/unicode-mode.c b/unicode-mode.c index 99a7293d..81f92451 100644 --- a/unicode-mode.c +++ b/unicode-mode.c @@ -57,9 +57,10 @@ unicode_mode_input(struct seat *seat, struct terminal *term, term->unicode_mode.character, (int)chars, utf8); if (chars != (size_t)-1) { - if (term->is_searching) + if (term->is_searching) { search_add_chars(term, utf8, chars); - else + search_find_next(term, SEARCH_BACKWARD_SAME_POSITION); + } else term_to_slave(term, utf8, chars); } |
