several changes, made togglemax extern and separated it from zoom() - moved zoom...

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 3470287..d06a1b3 100644 (file)
--- 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(Arg 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);