X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=event.c;h=8a3d99a0663a62e8a02ff44eeb7b3b8293ed04b8;hb=5052c538d9c14b46f298240cefa8a0062323d249;hp=cfe2d2aec5fda89529f12fd827884f150ea01a46;hpb=7055315725c66eea7861137d9146d10d62d4cee1;p=dwm.git

diff --git a/event.c b/event.c
index cfe2d2a..8a3d99a 100644
--- a/event.c
+++ b/event.c
@@ -85,6 +85,7 @@ resizemouse(Client *c) {
 			XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
 					c->w + c->border - 1, c->h + c->border - 1);
 			XUngrabPointer(dpy, CurrentTime);
+			while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 			return;
 		case ConfigureRequest:
 		case Expose:
@@ -165,40 +166,25 @@ buttonpress(XEvent *e) {
 
 static void
 configurerequest(XEvent *e) {
-	unsigned long newmask;
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XWindowChanges wc;
 
 	if((c = getclient(ev->window))) {
 		c->ismax = False;
-		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 & CWBorderWidth)
-			c->border = ev->border_width;
-		wc.x = c->x;
-		wc.y = c->y;
-		wc.width = c->w;
-		wc.height = c->h;
-		newmask = ev->value_mask & (~(CWSibling | CWStackMode | CWBorderWidth));
-		if(newmask)
-			XConfigureWindow(dpy, c->win, newmask, &wc);
-		else
+		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);
-		XSync(dpy, False);
-		if(c->isfloat) {
+		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;
 			resize(c, False);
 			if(!isvisible(c))
 				XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 		}
-		else
-			arrange();
 	}
 	else {
 		wc.x = ev->x;
@@ -209,8 +195,8 @@ configurerequest(XEvent *e) {
 		wc.sibling = ev->above;
 		wc.stack_mode = ev->detail;
 		XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
-		XSync(dpy, False);
 	}
+	XSync(dpy, False);
 }
 
 static void
@@ -292,11 +278,8 @@ maprequest(XEvent *e) {
 
 	if(!XGetWindowAttributes(dpy, ev->window, &wa))
 		return;
-	if(wa.override_redirect) {
-		XSelectInput(dpy, ev->window,
-				(StructureNotifyMask | PropertyChangeMask));
+	if(wa.override_redirect)
 		return;
-	}
 	if(!getclient(ev->window))
 		manage(ev->window, &wa);
 }