adopted Alex Sedov's config.h revival patch to tip 14f72a27
Anselm R Garbe · 2013-04-17 21:04 2 file(s) · +7 −11
Makefile +5 −1
18 18
	@echo CC -c $<
19 19
	@${CC} -c $< ${CFLAGS}
20 20
21 -
${OBJ}: config.mk draw.h
21 +
config.h:
22 +
	@echo creating $@ from config.def.h
23 +
	@cp config.def.h $@
24 +
25 +
${OBJ}: config.h config.mk draw.h
22 26
23 27
dmenu: dmenu.o draw.o
24 28
	@echo CC -o $@
dmenu.c +2 −10
44 44
static int bh, mw, mh;
45 45
static int inputw, promptw;
46 46
static size_t cursor = 0;
47 -
static const char *font = NULL;
48 -
static const char *prompt = NULL;
49 -
static const char *normbgcolor = "#222222";
50 -
static const char *normfgcolor = "#bbbbbb";
51 -
static const char *selbgcolor  = "#005577";
52 -
static const char *selfgcolor  = "#eeeeee";
53 -
static const char *outbgcolor  = "#00ffff";
54 -
static const char *outfgcolor  = "#000000";
55 -
static unsigned int lines = 0;
56 47
static unsigned long normcol[ColLast];
57 48
static unsigned long selcol[ColLast];
58 49
static unsigned long outcol[ColLast];
59 50
static Atom clip, utf8;
60 -
static Bool topbar = True;
61 51
static DC *dc;
62 52
static Item *items = NULL;
63 53
static Item *matches, *matchend;
64 54
static Item *prev, *curr, *next, *sel;
65 55
static Window win;
66 56
static XIC xic;
57 +
58 +
#include "config.h"
67 59
68 60
static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
69 61
static char *(*fstrstr)(const char *, const char *) = strstr;