X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=e6ba20c981cbaeab1fdeb1edce2a55ba02559613;hb=2c477cf66147d369ae8ff17acdce743c6811ee6a;hp=3470287c94336f92c59742907093fb74bff81f1f;hpb=52f0b9e2e3e7eba1e7d2b940863d9a72fa8112d6;p=dwm.git

diff --git a/main.c b/main.c
index 3470287..e6ba20c 100644
--- a/main.c
+++ b/main.c
@@ -18,7 +18,7 @@
 /* extern */
 
 char stext[256];
-int screen, sw, sh, wax, way, waw, wah;
+int screen, sx, sy, sw, sh, wax, way, waw, wah;
 unsigned int bh, ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool *seltag;
@@ -181,6 +181,7 @@ setup(void) {
 	dc.sel[ColFG] = initcolor(SELFGCOLOR);
 	initfont(FONT);
 	/* geometry */
+	sx = sy = 0;
 	sw = DisplayWidth(dpy, screen);
 	sh = DisplayHeight(dpy, screen);
 	initlayouts();
@@ -189,15 +190,15 @@ setup(void) {
 	wa.override_redirect = 1;
 	wa.background_pixmap = ParentRelative;
 	wa.event_mask = ButtonPressMask | ExposureMask;
-	barwin = XCreateWindow(dpy, root, 0, (TOPBAR ? 0 : sh - bh), sw, bh, 0,
+	barwin = XCreateWindow(dpy, root, sx, sy + (TOPBAR ? 0 : sh - bh), sw, bh, 0,
 			DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 	XDefineCursor(dpy, barwin, cursor[CurNormal]);
 	XMapRaised(dpy, barwin);
 	strcpy(stext, "dwm-"VERSION);
 	/* windowarea */
-	wax = 0;
-	way = (TOPBAR ? bh : 0);
+	wax = sx;
+	way = sy + (TOPBAR ? bh : 0);
 	wah = sh - bh;
 	waw = sw;
 	/* pixmap for everything */
@@ -235,7 +236,7 @@ sendevent(Window w, Atom a, long value) {
 }
 
 void
-quit(Arg *arg) {
+quit(const char *arg) {
 	readin = running = False;
 }
 
@@ -324,12 +325,11 @@ main(int argc, char *argv[]) {
 			}
 			drawstatus();
 		}
-		if(FD_ISSET(xfd, &rd))
-			while(XPending(dpy)) {
-				XNextEvent(dpy, &ev);
-				if(handler[ev.type])
-					(handler[ev.type])(&ev); /* call handler */
-			}
+		while(XPending(dpy)) {
+			XNextEvent(dpy, &ev);
+			if(handler[ev.type])
+				(handler[ev.type])(&ev); /* call handler */
+		}
 	}
 	cleanup();
 	XCloseDisplay(dpy);