adopted Alex Sedov's config.h revival patch to tip

diff --git a/Makefile b/Makefile
index f011ad745d7209df693f2e00699c28b3c600091d..0f7dfbdacd276b6d00a03d26bc824c6270713efc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,11 @@ options:
        @echo CC -c $<
        @${CC} -c $< ${CFLAGS}
 
-${OBJ}: config.mk draw.h
+config.h:
+       @echo creating $@ from config.def.h
+       @cp config.def.h $@
+
+${OBJ}: config.h config.mk draw.h
 
 dmenu: dmenu.o draw.o
        @echo CC -o $@

diff --git a/dmenu.c b/dmenu.c
index c25dc82373f623757393c593eff6bf6292a76151..a06ae1572672deba09e4a36537369a8e457e4601 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -44,20 +44,10 @@ static char text[BUFSIZ] = "";
 static int bh, mw, mh;
 static int inputw, promptw;
 static size_t cursor = 0;
-static const char *font = NULL;
-static const char *prompt = NULL;
-static const char *normbgcolor = "#222222";
-static const char *normfgcolor = "#bbbbbb";
-static const char *selbgcolor  = "#005577";
-static const char *selfgcolor  = "#eeeeee";
-static const char *outbgcolor  = "#00ffff";
-static const char *outfgcolor  = "#000000";
-static unsigned int lines = 0;
 static unsigned long normcol[ColLast];
 static unsigned long selcol[ColLast];
 static unsigned long outcol[ColLast];
 static Atom clip, utf8;
-static Bool topbar = True;
 static DC *dc;
 static Item *items = NULL;
 static Item *matches, *matchend;
@@ -65,6 +55,8 @@ static Item *prev, *curr, *next, *sel;
 static Window win;
 static XIC xic;
 
+#include "config.h"
+
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;