Shrink tier[] by one after removing matchname in r1.55.

This commit is contained in:
okan 2018-01-23 13:51:39 +00:00
parent 8675b5e158
commit 5324f9a4e3

View File

@ -69,7 +69,7 @@ match_substr(char *sub, char *str, int zeroidx)
void void
search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search) search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search)
{ {
struct menu *mi, *tierp[4], *before = NULL; struct menu *mi, *tierp[3], *before = NULL;
struct client_ctx *cc; struct client_ctx *cc;
struct winname *wn; struct winname *wn;
@ -88,14 +88,14 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search)
if (tier < 0) { if (tier < 0) {
TAILQ_FOREACH_REVERSE(wn, &cc->nameq, name_q, entry) TAILQ_FOREACH_REVERSE(wn, &cc->nameq, name_q, entry)
if (match_substr(search, wn->name, 0)) { if (match_substr(search, wn->name, 0)) {
tier = 2; tier = 1;
break; break;
} }
} }
/* Match on window resource class. */ /* Match on window resource class. */
if ((tier < 0) && match_substr(search, cc->ch.res_class, 0)) if ((tier < 0) && match_substr(search, cc->ch.res_class, 0))
tier = 3; tier = 2;
if (tier < 0) if (tier < 0)
continue; continue;
@ -108,9 +108,6 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search)
if ((tier > 0) && (cc->flags & CLIENT_HIDDEN)) if ((tier > 0) && (cc->flags & CLIENT_HIDDEN))
tier--; tier--;
if (tier >= nitems(tierp))
errx(1, "%s: invalid tier", __func__);
/* /*
* If you have a tierp, insert after it, and make it * If you have a tierp, insert after it, and make it
* the new tierp. If you don't have a tierp, find the * the new tierp. If you don't have a tierp, find the