diff --git a/dmenu/dmenu.c b/dmenu/dmenu.c index 80dc1ef..904147f 100644 --- a/dmenu/dmenu.c +++ b/dmenu/dmenu.c @@ -796,7 +796,7 @@ setup(void) static void usage(void) { - die("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" + die("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor] [-np]\n" " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]"); } @@ -820,7 +820,9 @@ main(int argc, char *argv[]) else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */ fstrncmp = strncasecmp; fstrstr = cistrstr; - } else if (i + 1 == argc) + } else if (!strcmp(argv[i], "-np")) /* do not draw prompt */ + noprompt = 1; + else if (i + 1 == argc) usage(); /* these options take one argument */ else if (!strcmp(argv[i], "-g")) { /* number of columns in grid */ @@ -849,8 +851,6 @@ main(int argc, char *argv[]) colors[SchemeOut][ColFg] = argv[++i]; else if (!strcmp(argv[i], "-w")) /* embedding window id */ embed = argv[++i]; - else if (!strcmp(argv[i], "-np")) /* do not draw prompt */ - noprompt = 1; else usage(); diff --git a/dwm/config.def.h b/dwm/config.def.h index 94fb198..a158dcc 100644 --- a/dwm/config.def.h +++ b/dwm/config.def.h @@ -80,7 +80,7 @@ static const Layout layouts[] = { /* commands */ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ -static const char *dmenucmd[] = { "dmenu_run", "-l", "10", "-g", "2", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_main, "-sf", col_gray4, NULL }; +static const char *dmenucmd[] = { "dmenu_run", "-np", "-l", "10", "-g", "2", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_main, "-sf", col_gray4, NULL }; static const char *termcmd[] = { "st", NULL }; static const char *djcmd[] = { "dj.sh", NULL }; diff --git a/dwm/config.h b/dwm/config.h index 94fb198..a158dcc 100644 --- a/dwm/config.h +++ b/dwm/config.h @@ -80,7 +80,7 @@ static const Layout layouts[] = { /* commands */ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ -static const char *dmenucmd[] = { "dmenu_run", "-l", "10", "-g", "2", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_main, "-sf", col_gray4, NULL }; +static const char *dmenucmd[] = { "dmenu_run", "-np", "-l", "10", "-g", "2", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_main, "-sf", col_gray4, NULL }; static const char *termcmd[] = { "st", NULL }; static const char *djcmd[] = { "dj.sh", NULL };