prepared dmenu-4.1 release

diff --git a/LICENSE b/LICENSE
index 7cd31db..f44738e 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
 MIT/X Consortium License
 
 © 2010 Connor Lane Smith <[email protected]>
 MIT/X Consortium License
 
 © 2010 Connor Lane Smith <[email protected]>

-© 2006-2009 Anselm R. Garbe <[email protected]>
+© 2006-2010 Anselm R Garbe <[email protected]>

 © 2009 Gottox <[email protected]>
 © 2009 Markus Schnalke <[email protected]>
 © 2009 Evan Gates <[email protected]>
 © 2009 Gottox <[email protected]>
 © 2009 Markus Schnalke <[email protected]>
 © 2009 Evan Gates <[email protected]>

diff --git a/Makefile b/Makefile
index e7df2d7..5ea6729 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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}
        @echo CC -o $@
        @${CC} -o $@ ${OBJ} ${LDFLAGS}
 dmenu: ${OBJ}
        @echo CC -o $@
        @${CC} -o $@ ${OBJ} ${LDFLAGS}


@@ -31,7 +35,7 @@ clean:
 dist: clean
        @echo creating dist tarball
        @mkdir -p dmenu-${VERSION}
 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}
        @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
new file mode 100644 (file)
index 0000000..3e6c616
--- /dev/null
+++ 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
deleted file mode 100644 (file)
index 3e6c616..0000000
--- a/config.h
+++ /dev/null
@@ -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
index bebc206..3fd9275 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -42,8 +42,8 @@ typedef struct {
 typedef struct Item Item;
 struct Item {
        char *text;
 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 */
 };
 
 /* forward declarations */


@@ -85,8 +85,8 @@ static unsigned int numlockmask = 0;
 static Bool running = True;
 static Display *dpy;
 static DC dc;
 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;
 static Item *sel = NULL;
 static Item *next = NULL;
 static Item *prev = NULL;