@@ -1,7 +1,7 @@ | |||||
MIT/X Consortium License | MIT/X Consortium License | ||||
© 2010 Connor Lane Smith <cls@lubutu.com> | © 2010 Connor Lane Smith <cls@lubutu.com> | ||||
© 2006-2009 Anselm R. Garbe <anselm@garbe.us> | |||||
© 2006-2010 Anselm R Garbe <anselm@garbe.us> | |||||
© 2009 Gottox <gottox@s01.de> | © 2009 Gottox <gottox@s01.de> | ||||
© 2009 Markus Schnalke <meillo@marmaro.de> | © 2009 Markus Schnalke <meillo@marmaro.de> | ||||
© 2009 Evan Gates <evan.gates@gmail.com> | © 2009 Evan Gates <evan.gates@gmail.com> | ||||
@@ -20,6 +20,10 @@ options: | |||||
${OBJ}: config.h config.mk | ${OBJ}: config.h config.mk | ||||
config.h: | |||||
@echo creating $@ from config.def.h | |||||
@cp config.def.h $@ | |||||
dmenu: ${OBJ} | dmenu: ${OBJ} | ||||
@echo CC -o $@ | @echo CC -o $@ | ||||
@${CC} -o $@ ${OBJ} ${LDFLAGS} | @${CC} -o $@ ${OBJ} ${LDFLAGS} | ||||
@@ -31,7 +35,7 @@ clean: | |||||
dist: clean | dist: clean | ||||
@echo creating dist tarball | @echo creating dist tarball | ||||
@mkdir -p dmenu-${VERSION} | @mkdir -p dmenu-${VERSION} | ||||
@cp -R LICENSE Makefile README config.mk dmenu.1 config.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION} | |||||
@cp -R LICENSE Makefile README config.mk dmenu.1 config.def.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION} | |||||
@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION} | @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION} | ||||
@gzip dmenu-${VERSION}.tar | @gzip dmenu-${VERSION}.tar | ||||
@rm -rf dmenu-${VERSION} | @rm -rf dmenu-${VERSION} | ||||
@@ -42,8 +42,8 @@ typedef struct { | |||||
typedef struct Item Item; | typedef struct Item Item; | ||||
struct Item { | struct Item { | ||||
char *text; | char *text; | ||||
Item *next; /* traverses all items */ | |||||
Item *left, *right; /* traverses items matching current search pattern */ | |||||
Item *next; /* traverses all items */ | |||||
Item *left, *right; /* traverses items matching current search pattern */ | |||||
}; | }; | ||||
/* forward declarations */ | /* forward declarations */ | ||||
@@ -85,8 +85,8 @@ static unsigned int numlockmask = 0; | |||||
static Bool running = True; | static Bool running = True; | ||||
static Display *dpy; | static Display *dpy; | ||||
static DC dc; | static DC dc; | ||||
static Item *allitems = NULL; /* first of all items */ | |||||
static Item *item = NULL; /* first of pattern matching items */ | |||||
static Item *allitems = NULL; /* first of all items */ | |||||
static Item *item = NULL; /* first of pattern matching items */ | |||||
static Item *sel = NULL; | static Item *sel = NULL; | ||||
static Item *next = NULL; | static Item *next = NULL; | ||||
static Item *prev = NULL; | static Item *prev = NULL; | ||||