X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=bf69d9e245f9c1835524468f1d12fd626de011bb;hb=e256afe31ef6a70eceb632ddfe717bfe6d8d9169;hp=4928f25d00246eceb8cb4b8bfa18de8fb2e706b8;hpb=71857b87ee4e5ce63594d062143e6ea78f842b0d;p=dwm.git

diff --git a/event.c b/event.c
index 4928f25..bf69d9e 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);
 		}
@@ -170,28 +171,39 @@ configurerequest(XEvent *e) {
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XWindowChanges wc;
 
-	wc.x = ev->x;
-	wc.y = ev->y;
-	wc.width = ev->width;
-	wc.height = ev->height;
-	wc.border_width = ev->border_width;
-	wc.sibling = ev->above;
-	wc.stack_mode = ev->detail;
 	if((c = getclient(ev->window))) {
 		c->ismax = False;
 		if(ev->value_mask & CWBorderWidth)
 			c->border = ev->border_width;
-		if((!c->isfloat && (arrange != dofloat))
-			|| ((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight))))
-		{
-			configure(c);
-			XSync(dpy, False);
-			return;
+		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);
 		}
+		else
+			configure(c);
+	}
+	else {
+		wc.x = ev->x;
+		wc.y = ev->y;
+		wc.width = ev->width;
+		wc.height = ev->height;
+		wc.border_width = ev->border_width;
+		wc.sibling = ev->above;
+		wc.stack_mode = ev->detail;
+		XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
 	}
-	XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
-	if(c && !isvisible(c))
-		XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 	XSync(dpy, False);
 }
 
@@ -238,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