applied Gottox patches

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 1e58176..f114bae 100644 (file)
--- a/main.c
+++ b/main.c
@@ -18,7 +18,7 @@
 
 char stext[1024];
 Bool *seltag;
-int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh;
+int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah;
 unsigned int master, ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
@@ -130,7 +130,8 @@ setup(void) {
        sh = DisplayHeight(dpy, screen);
        master = MASTER;
        /* bar */
-       bx = by = 0;
+       bx = sx;
+       by = sy;
        bw = sw;
        dc.h = bh = dc.font.height + 2;
        wa.override_redirect = 1;
@@ -142,6 +143,11 @@ setup(void) {
        XDefineCursor(dpy, barwin, cursor[CurNormal]);
        XMapRaised(dpy, barwin);
        strcpy(stext, "dwm-"VERSION);
+       /* windowarea */
+       wax = sx;
+       way = sy + bh;
+       wah = sh - bh;
+       waw = sw;
        /* pixmap for everything */
        dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
        dc.gc = XCreateGC(dpy, root, 0, 0);