X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=23fd7bd4ea0f2898ed3b16936187bbead2a388ae;hb=caa7ab536224b0bf4dcd2790a51ead6b7a6cf119;hp=555b0763a3ca1b1ac76b383e0deb220312bb1ae5;hpb=2aef8b9b4ce0900d241c60cb3a07e111c825d13a;p=dwm.git diff --git a/main.c b/main.c index 555b076..23fd7bd 100644 --- a/main.c +++ b/main.c @@ -190,10 +190,11 @@ setup(void) { wa.override_redirect = 1; wa.background_pixmap = ParentRelative; wa.event_mask = ButtonPressMask | ExposureMask; - barwin = XCreateWindow(dpy, root, sx, sy - bh, sw, bh, 0, + barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0, DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); XDefineCursor(dpy, barwin, cursor[CurNormal]); + bpos = BARPOS; updatebarpos(); XMapRaised(dpy, barwin); strcpy(stext, "dwm-"VERSION); @@ -226,12 +227,14 @@ quit(const char *arg) { void updatebarpos(void) { + XEvent ev; + wax = sx; way = sy; wah = sh; waw = sw; switch(bpos) { - case BarTop: + default: wah -= bh; way += bh; XMoveWindow(dpy, barwin, sx, sy); @@ -242,8 +245,10 @@ updatebarpos(void) { break; case BarOff: XMoveWindow(dpy, barwin, sx, sy - bh); + break; } - lt->arrange(); + XSync(dpy, False); + while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); } /* There's no way to check accesses to destroyed windows, thus those cases are @@ -273,7 +278,7 @@ main(int argc, char *argv[]) { fd_set rd; XEvent ev; - if(argc == 2 && !strncmp("-v", argv[1], 3)) + if(argc == 2 && !strcmp("-v", argv[1])) eprint("dwm-"VERSION", © 2004-2007 Anselm R. Garbe, Sander van Dijk\n"); else if(argc != 1) eprint("usage: dwm [-v]\n");