X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=8c8b997ff026343cbcb4d6385ee75e0694475bee;hb=3ce8c9f33844a995e79329978db9d2cd3981e032;hp=8a3d99a0663a62e8a02ff44eeb7b3b8293ed04b8;hpb=22d8c6fd1898713be81c81de4f35dfdc2403c288;p=dwm.git

diff --git a/event.c b/event.c
index 8a3d99a..8c8b997 100644
--- a/event.c
+++ b/event.c
@@ -156,8 +156,9 @@ buttonpress(XEvent *e) {
 		}
 		else if(ev->button == Button2)
 			zoom(NULL);
-		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat) &&
-				!c->isfixed) {
+		else if(ev->button == Button3
+		&& (arrange == dofloat || c->isfloat) && !c->isfixed)
+		{
 			restack();
 			resizemouse(c);
 		}
@@ -172,19 +173,26 @@ configurerequest(XEvent *e) {
 
 	if((c = getclient(ev->window))) {
 		c->ismax = False;
-		c->border = (ev->value_mask & CWBorderWidth) ? ev->border_width : c->border;
-		if((!c->isfloat && (arrange != dofloat))
-			|| ((ev->value_mask & (CWX | CWY)) && !(ev->value_mask & (CWWidth | CWHeight))))
-			configure(c);
-		else {
-			c->x = (ev->value_mask & CWX) ? ev->x : c->x;
-			c->y = (ev->value_mask & CWY) ? ev->y : c->y;
-			c->w = (ev->value_mask & CWWidth) ? ev->width : c->w;
-			c->h = (ev->value_mask & CWHeight) ? ev->height : c->h;
+		if(ev->value_mask & CWBorderWidth)
+			c->border = ev->border_width;
+		if(c->isfixed || c->isfloat || (arrange == dofloat)) {
+			if(ev->value_mask & CWX)
+				c->x = ev->x;
+			if(ev->value_mask & CWY)
+				c->y = ev->y;
+			if(ev->value_mask & CWWidth)
+				c->w = ev->width;
+			if(ev->value_mask & CWHeight)
+				c->h = ev->height;
+			if((ev->value_mask & (CWX | CWY))
+			&& !(ev->value_mask & (CWWidth | CWHeight)))
+				configure(c);
 			resize(c, False);
 			if(!isvisible(c))
-				XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+				ban(c);
 		}
+		else
+			configure(c);
 	}
 	else {
 		wc.x = ev->x;
@@ -242,14 +250,13 @@ keypress(XEvent *e) {
 	XKeyEvent *ev = &e->xkey;
 
 	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
-	for(i = 0; i < len; i++) {
+	for(i = 0; i < len; i++)
 		if(keysym == key[i].keysym
-			&& CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+		&& CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
 		{
 			if(key[i].func)
 				key[i].func(&key[i].arg);
 		}
-	}
 }
 
 static void