reverted accidental removal of sx, sy

2 files changed, 6 insertions, 5 deletions

diff --git a/dwm.h b/dwm.h
index 4e7e551..f74c17b 100644
--- a/dwm.h
+++ b/dwm.h
@@ -87,7 +87,7 @@ typedef struct {
 
 extern const char *tags[];			/* all tags */
 extern char stext[256];				/* status text */
-extern int screen, sw, sh;			/* screen geometry */
+extern int screen, sx, sy, sw, sh;		/* screen geometry */
 extern int wax, way, wah, waw;			/* windowarea geometry */
 extern unsigned int bh, blw;			/* bar height, bar layout label width */
 extern unsigned int master, nmaster;		/* master percent, number of master clients */
diff --git a/main.c b/main.c
index 3470287..d39c913 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 */