mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

add a flag to indicate a menu list instead of overloading 'prompt'

Browse Source
This commit is contained in:
okan 2015-06-05 15:01:51 +00:00
parent f22a3b1065
commit a4cba7e113
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
calmwm.h
View File

@ -73,6 +73,7 @@
/* menu */ /* menu */
#define CWM_MENU_DUMMY 0x0001 #define CWM_MENU_DUMMY 0x0001
#define CWM_MENU_FILE 0x0002 #define CWM_MENU_FILE 0x0002
#define CWM_MENU_LIST 0x0004
#define ARG_CHAR 0x0001 #define ARG_CHAR 0x0001
#define ARG_INT 0x0002 #define ARG_INT 0x0002

4
menu.c
View File

@ -109,9 +109,11 @@ menu_filter(struct screen_ctx *sc, struct menu_q *menuq, const char *prompt,
mc.hasprompt = 1; mc.hasprompt = 1;
} else { } else {
evmask = MENUMASK; evmask = MENUMASK;
mc.list = 1;
} }
if (mc.flags & CWM_MENU_LIST)
mc.list = 1;
if (initial != NULL) if (initial != NULL)
(void)strlcpy(mc.searchstr, initial, sizeof(mc.searchstr)); (void)strlcpy(mc.searchstr, initial, sizeof(mc.searchstr));
else else

6
mousefunc.c
View File

@ -191,7 +191,7 @@ mousefunc_menu_group(struct client_ctx *cc, union arg *arg)
if (TAILQ_EMPTY(&menuq)) if (TAILQ_EMPTY(&menuq))
return; return;
if ((mi = menu_filter(sc, &menuq, NULL, NULL, 0, if ((mi = menu_filter(sc, &menuq, NULL, NULL, CWM_MENU_LIST,
NULL, NULL)) != NULL) { NULL, NULL)) != NULL) {
gc = (struct group_ctx *)mi->ctx; gc = (struct group_ctx *)mi->ctx;
(group_holds_only_hidden(gc)) ? (group_holds_only_hidden(gc)) ?
@ -225,7 +225,7 @@ mousefunc_menu_unhide(struct client_ctx *cc, union arg *arg)
if (TAILQ_EMPTY(&menuq)) if (TAILQ_EMPTY(&menuq))
return; return;
if ((mi = menu_filter(sc, &menuq, NULL, NULL, 0, if ((mi = menu_filter(sc, &menuq, NULL, NULL, CWM_MENU_LIST,
NULL, NULL)) != NULL) { NULL, NULL)) != NULL) {
cc = (struct client_ctx *)mi->ctx; cc = (struct client_ctx *)mi->ctx;
client_unhide(cc); client_unhide(cc);
@ -251,7 +251,7 @@ mousefunc_menu_cmd(struct client_ctx *cc, union arg *arg)
if (TAILQ_EMPTY(&menuq)) if (TAILQ_EMPTY(&menuq))
return; return;
if ((mi = menu_filter(sc, &menuq, NULL, NULL, 0, if ((mi = menu_filter(sc, &menuq, NULL, NULL, CWM_MENU_LIST,
NULL, NULL)) != NULL) NULL, NULL)) != NULL)
u_spawn(((struct cmd *)mi->ctx)->path); u_spawn(((struct cmd *)mi->ctx)->path);