fixed Copyright notice in Makefile

.hgtags

@@ -17,3 +17,6 @@ dcc5427f99f51a978386a0dd770467cd911ac84b 1.6
 58dbef4aef3d45c7a3da6945e53c9667c0f02d5b 1.7
 3696d77aaf02f5d15728dde3b9e35abcaf291496 1.7.1
 d3e6fa22ae45b38b1bdb0d813390365e5930360b 1.8
+c7f5f4d543170f03d70468e98a3a0ec8d2c4161b 1.9
+1fce5c464fcd870b9f024aa1853d5cf3a3eb371b 2.0
+7656557298c954469a6a9564e6649b1fb5db663e 2.1

Makefile

@@ -1,5 +1,5 @@
 # dmenu - dynamic menu
-#   (C)opyright MMVII Anselm R. Garbe
+#   (C)opyright MMVI-MMVII Anselm R. Garbe
 
 include config.mk
 
@@ -13,7 +13,6 @@ options:
 	@echo "CFLAGS   = ${CFLAGS}"
 	@echo "LDFLAGS  = ${LDFLAGS}"
 	@echo "CC       = ${CC}"
-	@echo "LD       = ${LD}"
 
 .c.o:
 	@echo CC $<
@@ -22,8 +21,8 @@ options:
 ${OBJ}: dmenu.h config.mk
 
 dmenu: ${OBJ}
-	@echo LD $@
+	@echo CC -o $@
-	@${LD} -o $@ ${OBJ} ${LDFLAGS}
+	@${CC} -o $@ ${OBJ} ${LDFLAGS}
 	@strip $@
 
 clean:

config.mk

@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 1.9
+VERSION = 2.2
 
 # Customize below to fit your system
 
@@ -27,4 +27,3 @@ LDFLAGS = ${LIBS}
 
 # compiler and linker
 CC = cc
-LD = ${CC}

dmenu.1

@@ -69,12 +69,12 @@ Select the first/last item.
 .B Tab (Control-i)
 Copy the selected item to the input field.
 .TP
-.B Return
+.B Return (Control-j)
 Confirm selection and quit (print the selected item to standard output). Returns
 .B 0
 on termination.
 .TP
-.B Shift-Return (Control-j)
+.B Shift-Return (Control-Shift-j)
 Confirm selection and quit (print the text in the input field to standard output).
 Returns
 .B 0

dmenu.h

@@ -5,10 +5,10 @@
 #include <X11/Xlib.h>
 
 #define FONT			"-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
-#define NORMBGCOLOR		"#333366"
+#define NORMBGCOLOR		"#eeeeee"
-#define NORMFGCOLOR		"#cccccc"
+#define NORMFGCOLOR		"#222222"
-#define SELBGCOLOR		"#666699"
+#define SELBGCOLOR		"#006699"
-#define SELFGCOLOR		"#eeeeee"
+#define SELFGCOLOR		"#ffffff"
 #define SPACE			30 /* px */
 
 /* color */

main.c

@@ -28,7 +28,7 @@ struct Item {
 
 static char text[4096];
 static char *prompt = NULL;
-static int mx, my, mw, mh;
+static int mw, mh;
 static int ret = 0;
 static int nitem = 0;
 static unsigned int cmdw = 0;
@@ -431,12 +431,10 @@ main(int argc, char *argv[]) {
 	wa.override_redirect = 1;
 	wa.background_pixmap = ParentRelative;
 	wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
-	mx = my = 0;
 	mw = DisplayWidth(dpy, screen);
 	mh = dc.font.height + 2;
-	if(bottom)
+	win = XCreateWindow(dpy, root, 0,
-		my += DisplayHeight(dpy, screen) - mh;
+			bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0,
-	win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
 			DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);