commit 8623bf5d196cb0bed4bdca025f23664b2bdcdd8b
parent 5bc288b2b1270957baab2142e1e8b20b796fed11
Author: Anselm R Garbe <anselm@garbe.us>
Date: Fri, 28 May 2010 11:42:49 +0100
prepared dmenu-4.1 release
Diffstat:
5 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,7 @@
MIT/X Consortium License
© 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 Markus Schnalke <meillo@marmaro.de>
© 2009 Evan Gates <evan.gates@gmail.com>
diff --git a/Makefile b/Makefile
@@ -20,6 +20,10 @@ options:
${OBJ}: config.h config.mk
+config.h:
+ @echo creating $@ from config.def.h
+ @cp config.def.h $@
+
dmenu: ${OBJ}
@echo CC -o $@
@${CC} -o $@ ${OBJ} ${LDFLAGS}
@@ -31,7 +35,7 @@ clean:
dist: clean
@echo creating dist tarball
@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}
@gzip dmenu-${VERSION}.tar
@rm -rf dmenu-${VERSION}
diff --git a/config.def.h b/config.def.h
@@ -0,0 +1,9 @@
+/* See LICENSE file for copyright and license details. */
+
+/* appearance */
+static const char *font = "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*";
+static const char *normbgcolor = "#cccccc";
+static const char *normfgcolor = "#000000";
+static const char *selbgcolor = "#0066ff";
+static const char *selfgcolor = "#ffffff";
+static unsigned int spaceitem = 30; /* px between menu items */
diff --git a/config.h b/config.h
@@ -1,9 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-/* appearance */
-static const char *font = "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*";
-static const char *normbgcolor = "#cccccc";
-static const char *normfgcolor = "#000000";
-static const char *selbgcolor = "#0066ff";
-static const char *selfgcolor = "#ffffff";
-static unsigned int spaceitem = 30; /* px between menu items */
diff --git a/dmenu.c b/dmenu.c
@@ -42,8 +42,8 @@ typedef struct {
typedef struct Item Item;
struct Item {
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 */
@@ -85,8 +85,8 @@ static unsigned int numlockmask = 0;
static Bool running = True;
static Display *dpy;
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 *next = NULL;
static Item *prev = NULL;