diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-01-26 19:26:34 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-01-26 19:47:51 +0000 |
| commit | 5db389da21ce2d4132f4416545da4f8a50217109 (patch) | |
| tree | dabbcb58cea6adccaf60f635c754352d832bc08d | |
| parent | search: fix matching of multi-column characters (diff) | |
search: match composed characters when extending the search string to the next word boundary
| -rw-r--r-- | search.c | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -472,6 +472,14 @@ search_match_to_end_of_word(struct terminal *term, bool spaces_only) if (wc == CELL_MULT_COL_SPACER) continue; + const struct composed *composed = NULL; + if (wc >= CELL_COMB_CHARS_LO && + wc < (CELL_COMB_CHARS_LO + term->composed_count)) + { + composed = &term->composed[wc - CELL_COMB_CHARS_LO]; + wc = composed->base; + } + if (wc == 0 || (!first && !isword(wc, spaces_only, term->conf->word_delimiters))) { done = true; break; @@ -479,6 +487,11 @@ search_match_to_end_of_word(struct terminal *term, bool spaces_only) first = false; tll_push_back(new_chars, wc); + + if (composed != NULL) { + for (size_t i = 0; i < composed->count; i++) + tll_push_back(new_chars, composed->combining[i]); + } } if (done) |
