Remove DMENU_FLAGS. Switch to a new fontHEADmaster

1 files changed, 7 insertions, 19 deletions

diff --git a/dwm.c b/dwm.c
index d9ea0d7..490d703 100644
--- a/dwm.c
+++ b/dwm.c
@@ -2422,25 +2422,13 @@ zoom(const Arg *arg)
 	pop(c);
 }
 
-/* Make central configuration of dmenu appearance easy by sucking it out
- * of our config.h
- */
 void
-setDmenuFlags() {
-	const char *dmenu_flags[] = { DMENU_FLAGS, NULL };
-	char *dflags = ecalloc(1024, sizeof(char));
-	char *tmp = NULL;
-	for (int i = 0; i<sizeof(dmenu_flags)/sizeof(dmenu_flags[0]); i++) {
-		if (dmenu_flags[i] == NULL)
-			break;
-		tmp = strdup(dflags);
-		sprintf(dflags, "%s %s", tmp, dmenu_flags[i]);
-		free(tmp);
-		tmp = NULL;
-	}
-	setenv("DMENU_FLAGS", dflags, 1);
-	free(dflags);
-	dflags = NULL;
+setDmenuConf() {
+	setenv("DMENU_FONT", dmenufont, 1);
+	setenv("DMENU_NB",   col_gray1, 1);
+	setenv("DMENU_NF",   col_gray3, 1);
+	setenv("DMENU_SB",   col_cyan,  1);
+	setenv("DMENU_SF",   col_gray4, 1);
 }
 
 int
@@ -2458,7 +2446,7 @@ main(int argc, char *argv[])
 	FILE *fh;
 	if ((fh = fopen(".env", "r")))
 		readEnv(fh);
-	setDmenuFlags();
+	setDmenuConf();
 	setup();
 #ifdef __OpenBSD__
 	if (pledge("stdio rpath proc exec", NULL) == -1)