summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--kbfunc.c8
-rw-r--r--mousefunc.c6
-rw-r--r--search.c8
3 files changed, 12 insertions, 10 deletions
diff --git a/kbfunc.c b/kbfunc.c
index ef4c49a..31273e8 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -177,8 +177,12 @@ kbfunc_menu_cmd(struct client_ctx *cc, union arg *arg)
 	struct menu_q		 menuq;
 
 	TAILQ_INIT(&menuq);
-	TAILQ_FOREACH(cmd, &Conf.cmdq, entry)
-		menuq_add(&menuq, cmd, "%s", cmd->name);
+	TAILQ_FOREACH(cmd, &Conf.cmdq, entry) {
+		if ((strcmp(cmd->name, "lock") == 0) ||
+		    (strcmp(cmd->name, "term") == 0))
+			continue;
+		menuq_add(&menuq, cmd, NULL);
+	}
 
 	if ((mi = menu_filter(sc, &menuq, "application", NULL, 0,
 	    search_match_text, search_print_cmd)) != NULL)
diff --git a/mousefunc.c b/mousefunc.c
index aef5b04..f699243 100644
--- a/mousefunc.c
+++ b/mousefunc.c
@@ -233,8 +233,12 @@ mousefunc_menu_cmd(struct client_ctx *cc, union arg *arg)
 	struct menu_q		 menuq;
 
 	TAILQ_INIT(&menuq);
-	TAILQ_FOREACH(cmd, &Conf.cmdq, entry)
+	TAILQ_FOREACH(cmd, &Conf.cmdq, entry) {
+		if ((strcmp(cmd->name, "lock") == 0) ||
+		    (strcmp(cmd->name, "term") == 0))
+			continue;
 		menuq_add(&menuq, cmd, NULL);
+	}
 
 	if ((mi = menu_filter(sc, &menuq, NULL, NULL, CWM_MENU_LIST,
 	    NULL, search_print_cmd)) != NULL)
diff --git a/search.c b/search.c
index a960076..3192bff 100644
--- a/search.c
+++ b/search.c
@@ -127,14 +127,8 @@ void
 search_print_cmd(struct menu *mi, int i)
 {
 	struct cmd	*cmd = (struct cmd *)mi->ctx;
-	int		 special = 0;
 
-	if ((strcmp(cmd->name, "lock") == 0) ||
-	    (strcmp(cmd->name, "term") == 0))
-		special = 1;
-
-	(void)snprintf(mi->print, sizeof(mi->print),
-	    (special) ? "[%s]" : "%s", cmd->name);
+	(void)snprintf(mi->print, sizeof(mi->print), "%s", cmd->name);
 }
 
 void