From 94f0a772b27da78256ce1de32a3657ee6f9e5eb9 Mon Sep 17 00:00:00 2001 From: okan Date: Mon, 8 Jun 2015 15:41:27 +0000 Subject: switch to search_print_client() as the print callback since it will now display labels as well --- mousefunc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/mousefunc.c b/mousefunc.c index 814c6f4..166acfd 100644 --- a/mousefunc.c +++ b/mousefunc.c @@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: mousefunc.c,v 1.90 2015/06/08 15:11:29 okan Exp $ + * $OpenBSD: mousefunc.c,v 1.91 2015/06/08 15:41:27 okan Exp $ */ #include @@ -204,23 +204,18 @@ mousefunc_menu_unhide(struct client_ctx *cc, union arg *arg) struct client_ctx *old_cc; struct menu *mi; struct menu_q menuq; - char *wname; old_cc = client_current(); TAILQ_INIT(&menuq); TAILQ_FOREACH(cc, &sc->clientq, entry) { if (cc->flags & CLIENT_HIDDEN) { - wname = (cc->label) ? cc->label : cc->name; - if (wname == NULL) - continue; - menuq_add(&menuq, cc, "(%d) %s", - cc->group ? cc->group->num : 0, wname); + menuq_add(&menuq, cc, NULL); } } if ((mi = menu_filter(sc, &menuq, NULL, NULL, CWM_MENU_LIST, - NULL, NULL)) != NULL) { + NULL, search_print_client)) != NULL) { cc = (struct client_ctx *)mi->ctx; client_unhide(cc); if (old_cc != NULL) -- cgit v1.2.3-2-gb3c3