From cf859c3404f849ec7907cfbc1e0f89e496b4a823 Mon Sep 17 00:00:00 2001
From: okan
Date: Mon, 2 Dec 2013 19:30:27 +0000
Subject: Prepend the group shortcut in the client search menu; from Thomas
 Adam. Likewise, prepend shortcut in unhide menu.

---
 mousefunc.c | 5 +++--
 search.c    | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mousefunc.c b/mousefunc.c
index 6de0e14..c634333 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.59 2013/11/27 18:34:34 okan Exp $
+ * $OpenBSD: mousefunc.c,v 1.60 2013/12/02 19:30:27 okan Exp $
  */
 
 #include <sys/param.h>
@@ -231,7 +231,8 @@ mousefunc_menu_unhide(struct client_ctx *cc, void *arg)
 				continue;
 
 			mi = xcalloc(1, sizeof(*mi));
-			(void)strlcpy(mi->text, wname, sizeof(mi->text));
+			(void)snprintf(mi->text, sizeof(mi->text),
+			    "(%d) %s", cc->group->shortcut, wname);
 			mi->ctx = cc;
 			TAILQ_INSERT_TAIL(&menuq, mi, entry);
 		}
diff --git a/search.c b/search.c
index a7f448c..5c4483f 100644
--- a/search.c
+++ b/search.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: search.c,v 1.31 2013/04/30 21:11:07 okan Exp $
+ * $OpenBSD: search.c,v 1.32 2013/12/02 19:30:27 okan Exp $
  */
 
 #include <sys/param.h>
@@ -142,8 +142,8 @@ search_print_client(struct menu *mi, int list)
 	if (list)
 		cc->matchname = cc->name;
 
-	(void)snprintf(mi->print, sizeof(mi->print), "%c%s", flag,
-	    cc->matchname);
+	(void)snprintf(mi->print, sizeof(mi->print), "(%d) %c%s",
+	    cc->group->shortcut, flag, cc->matchname);
 
 	if (!list && cc->matchname != cc->name &&
 	    strlen(mi->print) < sizeof(mi->print) - 1) {
-- 
cgit v1.2.3-2-gb3c3