aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE2
-rw-r--r--Makefile6
-rw-r--r--config.def.h (renamed from config.h)0
-rw-r--r--dmenu.c8
4 files changed, 10 insertions, 6 deletions
diff --git a/LICENSE b/LICENSE
index 7cd31db..f44738e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
1MIT/X Consortium License 1MIT/X Consortium License
2 2
3© 2010 Connor Lane Smith <cls@lubutu.com> 3© 2010 Connor Lane Smith <cls@lubutu.com>
4© 2006-2009 Anselm R. Garbe <anselm@garbe.us> 4© 2006-2010 Anselm R Garbe <anselm@garbe.us>
5© 2009 Gottox <gottox@s01.de> 5© 2009 Gottox <gottox@s01.de>
6© 2009 Markus Schnalke <meillo@marmaro.de> 6© 2009 Markus Schnalke <meillo@marmaro.de>
7© 2009 Evan Gates <evan.gates@gmail.com> 7© 2009 Evan Gates <evan.gates@gmail.com>
diff --git a/Makefile b/Makefile
index e7df2d7..5ea6729 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,10 @@ options:
20 20
21${OBJ}: config.h config.mk 21${OBJ}: config.h config.mk
22 22
23config.h:
24 @echo creating $@ from config.def.h
25 @cp config.def.h $@
26
23dmenu: ${OBJ} 27dmenu: ${OBJ}
24 @echo CC -o $@ 28 @echo CC -o $@
25 @${CC} -o $@ ${OBJ} ${LDFLAGS} 29 @${CC} -o $@ ${OBJ} ${LDFLAGS}
@@ -31,7 +35,7 @@ clean:
31dist: clean 35dist: clean
32 @echo creating dist tarball 36 @echo creating dist tarball
33 @mkdir -p dmenu-${VERSION} 37 @mkdir -p dmenu-${VERSION}
34 @cp -R LICENSE Makefile README config.mk dmenu.1 config.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION} 38 @cp -R LICENSE Makefile README config.mk dmenu.1 config.def.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}
35 @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION} 39 @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
36 @gzip dmenu-${VERSION}.tar 40 @gzip dmenu-${VERSION}.tar
37 @rm -rf dmenu-${VERSION} 41 @rm -rf dmenu-${VERSION}
diff --git a/config.h b/config.def.h
index 3e6c616..3e6c616 100644
--- a/config.h
+++ b/config.def.h
diff --git a/dmenu.c b/dmenu.c
index bebc206..3fd9275 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -42,8 +42,8 @@ typedef struct {
42typedef struct Item Item; 42typedef struct Item Item;
43struct Item { 43struct Item {
44 char *text; 44 char *text;
45 Item *next; /* traverses all items */ 45 Item *next; /* traverses all items */
46 Item *left, *right; /* traverses items matching current search pattern */ 46 Item *left, *right; /* traverses items matching current search pattern */
47}; 47};
48 48
49/* forward declarations */ 49/* forward declarations */
@@ -85,8 +85,8 @@ static unsigned int numlockmask = 0;
85static Bool running = True; 85static Bool running = True;
86static Display *dpy; 86static Display *dpy;
87static DC dc; 87static DC dc;
88static Item *allitems = NULL; /* first of all items */ 88static Item *allitems = NULL; /* first of all items */
89static Item *item = NULL; /* first of pattern matching items */ 89static Item *item = NULL; /* first of pattern matching items */
90static Item *sel = NULL; 90static Item *sel = NULL;
91static Item *next = NULL; 91static Item *next = NULL;
92static Item *prev = NULL; 92static Item *prev = NULL;