X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dwm.c;h=5f3b9c945af724013bd660ef56bc459174111ea4;hb=4a2902efe49571432544f356a946170ff9e6f415;hp=f8a6ed5b975f48c5d1da80e17190566846aeec90;hpb=c86ed46a1bbba0635a76d05ebeb839c7fec7f7fc;p=dwm.git

diff --git a/dwm.c b/dwm.c
index f8a6ed5..5f3b9c9 100644
--- a/dwm.c
+++ b/dwm.c
@@ -904,7 +904,7 @@ manage(Window w, XWindowAttributes *wa) {
 	if(c->w == sw && c->h == sh) {
 		c->x = sx;
 		c->y = sy;
-		c->bw = wa->border_width;
+		c->bw = 0;
 	}
 	else {
 		if(c->x + c->w + 2 * c->bw > sx + sw)
@@ -1558,28 +1558,24 @@ updatebar(void) {
 void
 updategeom(void) {
 #ifdef XINERAMA
-	int n;
-	unsigned int xidx = 0;
+	int n, i = 0;
 	XineramaScreenInfo *info = NULL;
 
 	/* window area geometry */
-	if(XineramaIsActive(dpy)) {
-		info = XineramaQueryScreens(dpy, &n);
+	if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) { 
 		if(n > 1) {
-			int di, i, x, y;
+			int di, x, y;
 			unsigned int dui;
 			Window dummy;
 			if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
 				for(i = 0; i < n; i++)
-					if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)) {
-						xidx = i;
+					if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
 						break;
-					}
 		}
-		wx = info[xidx].x_org;
-		wy = showbar && topbar ?  info[xidx].y_org + bh : info[xidx].y_org;
-		ww = info[xidx].width;
-		wh = showbar ? info[xidx].height - bh : info[xidx].height;
+		wx = info[i].x_org;
+		wy = showbar && topbar ?  info[i].y_org + bh : info[i].y_org;
+		ww = info[i].width;
+		wh = showbar ? info[i].height - bh : info[i].height;
 		XFree(info);
 	}
 	else