diff options
| -rw-r--r-- | src/history.c | 4 | ||||
| -rw-r--r-- | src/tui.c | 8 | ||||
| -rw-r--r-- | src/util.c | 16 | ||||
| -rw-r--r-- | src/util.h | 2 |
4 files changed, 24 insertions, 6 deletions
diff --git a/src/history.c b/src/history.c index f393d98..031e0da 100644 --- a/src/history.c +++ b/src/history.c @@ -55,7 +55,7 @@ history_list_prev(struct inputln *cur, const wchar_t *search) for (iter = cur->link.prev; iter && iter->prev; iter = iter->prev) { ln = UPCAST(iter, struct inputln); - if (!search || !*search || wcsstr(ln->buf, search)) + if (!search || !*search || wcscasestr(ln->buf, search)) return ln; } @@ -71,7 +71,7 @@ history_list_next(struct inputln *cur, const wchar_t *search) iter = cur->link.next; while (LIST_INNER(iter)) { ln = UPCAST(iter, struct inputln); - if (!search || !*search || wcsstr(ln->buf, search)) + if (!search || !*search || wcscasestr(ln->buf, search)) return ln; iter = iter->next; } @@ -159,7 +159,7 @@ track_name_gen(const wchar_t *text, int fwd, int reset) while (LIST_INNER(iter)) { track = UPCAST(iter, struct ref)->data; - if (wcsstr(track->name, text)) { + if (wcscasestr(track->name, text)) { cur = iter; return wcsdup(track->name); } @@ -185,7 +185,7 @@ tag_name_gen(const wchar_t *text, int fwd, int reset) while (LIST_INNER(iter)) { tag = UPCAST(iter, struct tag); - if (wcsstr(tag->name, text)) { + if (wcscasestr(tag->name, text)) { cur = iter; return wcsdup(tag->name); } @@ -412,7 +412,7 @@ play_track(const wchar_t *query) for (LIST_ITER(&tracks, iter)) { track = UPCAST(iter, struct ref)->data; - if (wcsstr(track->name, query)) { + if (!wcscmp(track->name, query)) { player_play_track(track); return 1; } @@ -432,7 +432,7 @@ select_tag(const wchar_t *query) for (LIST_ITER(&tags, iter)) { index += 1; tag = UPCAST(iter, struct tag); - if (wcsstr(tag->name, query)) { + if (wcscasestr(tag->name, query)) { listnav_update_sel(&tag_nav, index); return 1; } @@ -1,4 +1,5 @@ #define _XOPEN_SOURCE 600 +#define _GNU_SOURCE #include "util.h" #include "tui.h" @@ -40,6 +41,21 @@ done: return width; } +const wchar_t * +wcscasestr(const wchar_t *haystack, const wchar_t *needle) +{ + int hslen, nlen, i; + + nlen = wcslen(needle); + hslen = wcslen(haystack) - nlen; + for (i = 0; i < hslen; i++) { + if (!wcsncasecmp(haystack + i, needle, nlen)) + return haystack + i; + } + + return NULL; +} + void panic(const char *file, int line, const char *msg, ...) { @@ -17,6 +17,8 @@ int strnwidth(const char *s, int n); +const wchar_t *wcscasestr(const wchar_t *haystack, const wchar_t *needle); + void panic(const char *file, int line, const char *msg, ...); void assert(int cond, const char *file, int line, const char *condstr); void error(const char *fmtstr, ...); |