From 48482ef2e53b5eaae9a47e8ade9e3940bc01f48d Mon Sep 17 00:00:00 2001 From: Přemysl Eric Janouch Date: Tue, 21 Dec 2021 05:37:42 +0100 Subject: Make incremental search more useful Make it unanchored, as well as case-insensitive. --- NEWS | 2 +- nncmpp.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 6972d25..df3ef9e 100644 --- a/NEWS +++ b/NEWS @@ -4,7 +4,7 @@ x.x.x (xxxx-xx-xx) * Now fetching Internet stream information asynchronously - * Added rudimentary incremental search, normally bound to C-s, in all tabs + * Added basic incremental search, normally bound to C-s, in all tabs * Fixed jumping to the beginning of the queue after deleting items diff --git a/nncmpp.c b/nncmpp.c index fb49b3a..e148c2d 100644 --- a/nncmpp.c +++ b/nncmpp.c @@ -2350,12 +2350,17 @@ static size_t incremental_search_match (const ucs4_t *needle, size_t len, const struct row_buffer *row) { - // TODO: case-insensitive search, wilcards, regexps, something easy to use - size_t i = 0; - for (; i < len && i < row->chars_len; i++) - if (needle[i] != row->chars[i].c) - break; - return i; + // XXX: this is slow and simplistic, but unistring is awkward to use + size_t best = 0; + for (size_t start = 0; start < row->chars_len; start++) + { + size_t i = 0; + for (; i < len && start + i < row->chars_len; i++) + if (uc_tolower(needle[i]) != uc_tolower(row->chars[start + i].c)) + break; + best = MAX (best, i); + } + return best; } static void -- cgit v1.2.3-70-g09d2