diff options
| author | okan <okan> | 2016-12-06 21:54:10 +0000 |
|---|---|---|
| committer | okan <okan> | 2016-12-06 21:54:10 +0000 |
| commit | a7f2ab7497f32c6ed740b610fc8120f934a4893a (patch) | |
| tree | 7f71217651d8630e374e65740df3ff58803a57fa /menu.c | |
| parent | 89e4e7fb140a65726a9ce55179535b782e4b2d57 (diff) | |
| download | cwm-a7f2ab7497f32c6ed740b610fc8120f934a4893a.tar.gz cwm-a7f2ab7497f32c6ed740b610fc8120f934a4893a.tar.xz cwm-a7f2ab7497f32c6ed740b610fc8120f934a4893a.zip | |
Add search_print_text(), a default callback for mi->print in menu_filter(). While
here, normalize the remaining search_print_* argument paramters.
Diffstat (limited to 'menu.c')
| -rw-r--r-- | menu.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/menu.c b/menu.c index fe63741..cb33530 100644 --- a/menu.c +++ b/menu.c @@ -196,7 +196,7 @@ menu_complete_path(struct menu_ctx *mc) TAILQ_INIT(&menuq); if ((mi = menu_filter(sc, &menuq, mc->searchstr, NULL, - (CWM_MENU_DUMMY), search_match_path, NULL)) != NULL) { + (CWM_MENU_DUMMY), search_match_path, search_print_text)) != NULL) { mr->abort = mi->abort; mr->dummy = mi->dummy; if (mi->text[0] != '\0') @@ -366,11 +366,7 @@ menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq) } TAILQ_FOREACH(mi, resultq, resultentry) { - if (mc->print != NULL) - (*mc->print)(mi, mc->listing); - else - (void)snprintf(mi->print, sizeof(mi->print), - "%s", mi->text); + (*mc->print)(mi, mc->listing); XftTextExtentsUtf8(X_Dpy, sc->xftfont, (const FcChar8*)mi->print, |