Compare commits

...

8 Commits
2.0 ... 2.2

4 changed files with 9 additions and 11 deletions

View File

@ -18,3 +18,5 @@ dcc5427f99f51a978386a0dd770467cd911ac84b 1.6
3696d77aaf02f5d15728dde3b9e35abcaf291496 1.7.1 3696d77aaf02f5d15728dde3b9e35abcaf291496 1.7.1
d3e6fa22ae45b38b1bdb0d813390365e5930360b 1.8 d3e6fa22ae45b38b1bdb0d813390365e5930360b 1.8
c7f5f4d543170f03d70468e98a3a0ec8d2c4161b 1.9 c7f5f4d543170f03d70468e98a3a0ec8d2c4161b 1.9
1fce5c464fcd870b9f024aa1853d5cf3a3eb371b 2.0
7656557298c954469a6a9564e6649b1fb5db663e 2.1

View File

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

View File

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

8
main.c
View File

@ -350,7 +350,7 @@ main(int argc, char *argv[]) {
char *selbg = SELBGCOLOR; char *selbg = SELBGCOLOR;
char *selfg = SELFGCOLOR; char *selfg = SELFGCOLOR;
fd_set rd; fd_set rd;
int i, j, my; int i, j;
struct timeval timeout; struct timeval timeout;
Item *itm; Item *itm;
XEvent ev; XEvent ev;
@ -431,12 +431,10 @@ main(int argc, char *argv[]) {
wa.override_redirect = 1; wa.override_redirect = 1;
wa.background_pixmap = ParentRelative; wa.background_pixmap = ParentRelative;
wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask; wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
my = 0;
mw = DisplayWidth(dpy, screen); mw = DisplayWidth(dpy, screen);
mh = dc.font.height + 2; 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, 0, 0, mw, mh, 0,
DefaultDepth(dpy, screen), CopyFromParent, DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen), DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);