fixed Copyright notice in Makefile

nah nah nah, I can't get used to the bottom bar, pushing the conditional dmenu again
letting dmenu appear at the bottom by default
2007-02-08 14:10:17 +01:00 · 2007-02-08 11:17:11 +01:00 · 2007-02-08 11:10:29 +01:00 · 2007-02-05 11:10:41 +01:00 · 2007-01-17 11:10:31 +01:00 · 2007-01-17 11:10:26 +01:00
4 changed files with 9 additions and 11 deletions
--- a/.hgtags
+++ b/.hgtags
@ -18,3 +18,5 @@ dcc5427f99f51a978386a0dd770467cd911ac84b 1.6
 3696d77aaf02f5d15728dde3b9e35abcaf291496 1.7.1
 d3e6fa22ae45b38b1bdb0d813390365e5930360b 1.8
 c7f5f4d543170f03d70468e98a3a0ec8d2c4161b 1.9
+1fce5c464fcd870b9f024aa1853d5cf3a3eb371b 2.0
+7656557298c954469a6a9564e6649b1fb5db663e 2.1
--- a/7
+++ b/7
@ -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 $@
-	@${LD} -o $@ ${OBJ} ${LDFLAGS}
+	@echo CC -o $@
+	@${CC} -o $@ ${OBJ} ${LDFLAGS}
 	@strip $@

 clean:
--- a/config.mk
+++ b/config.mk
@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 2.0
+VERSION = 2.2

 # Customize below to fit your system

@ -27,4 +27,3 @@ LDFLAGS = ${LIBS}

 # compiler and linker
 CC = cc
-LD = ${CC}
--- a/main.c
+++ b/main.c
@ -350,7 +350,7 @@ main(int argc, char *argv[]) {
 	char *selbg = SELBGCOLOR;
 	char *selfg = SELFGCOLOR;
 	fd_set rd;
-	int i, j, my;
+	int i, j;
 	struct timeval timeout;
 	Item *itm;
 	XEvent ev;
@ -431,12 +431,10 @@ main(int argc, char *argv[]) {
 	wa.override_redirect = 1;
 	wa.background_pixmap = ParentRelative;
 	wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
-	my = 0;
 	mw = DisplayWidth(dpy, screen);
 	mh = dc.font.height + 2;
-	if(bottom)
-		my += DisplayHeight(dpy, screen) - mh;
-	win = XCreateWindow(dpy, root, 0, 0, mw, mh, 0,
+	win = XCreateWindow(dpy, root, 0,
+			bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0,
 			DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
Author	SHA1	Message	Date
Anselm R. Garbe	f3c12a7bff	fixed Copyright notice in Makefile	2007-02-08 14:10:17 +01:00
Anselm R. Garbe	3ba8b71aba	nah nah nah, I can't get used to the bottom bar, pushing the conditional dmenu again	2007-02-08 11:17:11 +01:00
Anselm R. Garbe	2bac5599b3	letting dmenu appear at the bottom by default	2007-02-08 11:10:29 +01:00
Anselm R. Garbe	dbccf6fbff	got rid of LD, inspired by JGs patch to wmii	2007-02-05 11:10:41 +01:00
Anselm R. Garbe	aea9bfec5e	Added tag 2.1 for changeset 7656557298c9	2007-01-17 11:10:31 +01:00
Anselm R. Garbe	6175a39e8e	hotfix changes	2007-01-17 11:10:26 +01:00
Anselm R. Garbe	2c7ff85f24	Added tag 2.1 for changeset d91c79020430	2007-01-17 11:10:09 +01:00
Anselm R. Garbe	447046f7ae	Added tag 2.0 for changeset 1fce5c464fcd	2007-01-16 11:42:09 +01:00