mirror of
https://github.com/leahneukirchen/cwm.git
synced 2023-08-10 21:13:12 +03:00
Add search_print_text(), a default callback for mi->print in menu_filter(). While
here, normalize the remaining search_print_* argument paramters.
This commit is contained in:
8
menu.c
8
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,
|
||||
|
Reference in New Issue
Block a user