mirror of
https://github.com/leahneukirchen/cwm.git
synced 2023-08-10 21:13:12 +03:00
Remove 'noresult' (and simplify) as it does nothing and makes the logic around
it needless. History doesn't show what this might have been used for in future iterations.
This commit is contained in:
14
menu.c
14
menu.c
@ -52,7 +52,6 @@ struct menu_ctx {
|
||||
int list;
|
||||
int listing;
|
||||
int changed;
|
||||
int noresult;
|
||||
int prev;
|
||||
int entry;
|
||||
int num;
|
||||
@ -313,15 +312,10 @@ menu_handle_key(XEvent *e, struct menu_ctx *mc, struct menu_q *menuq,
|
||||
(void)strlcat(mc->searchstr, chr, sizeof(mc->searchstr));
|
||||
}
|
||||
|
||||
mc->noresult = 0;
|
||||
if (mc->changed && mc->searchstr[0] != '\0') {
|
||||
(*mc->match)(menuq, resultq, mc->searchstr);
|
||||
/* If menuq is empty, never show we've failed */
|
||||
mc->noresult = TAILQ_EMPTY(resultq) && !TAILQ_EMPTY(menuq);
|
||||
} else if (mc->changed)
|
||||
TAILQ_INIT(resultq);
|
||||
|
||||
if (!mc->list && mc->listing && !mc->changed) {
|
||||
if (mc->changed) {
|
||||
if (mc->searchstr[0] != '\0')
|
||||
(*mc->match)(menuq, resultq, mc->searchstr);
|
||||
} else if (!mc->list && mc->listing) {
|
||||
TAILQ_INIT(resultq);
|
||||
mc->listing = 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user