Remove DMENU_FLAGS and pull configuration from environment variables instead.HEADmaster

2 files changed, 13 insertions, 1 deletions

diff --git a/dmenu.c b/dmenu.c
index 0909dfb..295123b 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -819,6 +819,18 @@ main(int argc, char *argv[])
 	XWindowAttributes wa;
 	int i, fast = 0;
 
+	if (getenv("DMENU_FONT"))
+		fonts[0] = getenv("DMENU_FONT");
+	if (getenv("DMENU_NB"))
+		colors[SchemeNorm][ColBg] = getenv("DMENU_NB");
+	if (getenv("DMENU_NF"))
+		colors[SchemeNorm][ColFg] = getenv("DMENU_NF");
+	if (getenv("DMENU_SB"))
+		colors[SchemeSel][ColBg] = getenv("DMENU_SB");
+	if (getenv("DMENU_SF"))
+		colors[SchemeSel][ColFg] = getenv("DMENU_SF");
+
+
 	for (i = 1; i < argc; i++)
 		/* these options take no arguments */
 		if (!strcmp(argv[i], "-v")) {      /* prints version information */
diff --git a/dmenu_askpass b/dmenu_askpass
index c571695..9f61844 100755
--- a/dmenu_askpass
+++ b/dmenu_askpass
@@ -1,3 +1,3 @@
 #!/bin/sh
 exec <&-
-exec dmenu $DMENU_FLAGS -E -p "${1:-OpenSSH Passphrase: }"
+exec dmenu -E -p "${1:-OpenSSH Passphrase: }"