X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=0f744788614d9e228b1c43fa2250d5b29c1f1302;hb=aa1bda81646e9d6188fd584009be0eee619f6966;hp=3c83aa803b6495b3c1315dc56ea3922c6a0e1c45;hpb=e995c1b5325f88d197675950c15762d001dd80ef;p=dwm.git

diff --git a/event.c b/event.c
index 3c83aa8..0f74478 100644
--- a/event.c
+++ b/event.c
@@ -116,12 +116,14 @@ buttonpress(XEvent *e)
 				return;
 			}
 		}
-		if(ev->x < x + bmw)
-			togglemode(NULL);
+		if(ev->x < x + bmw) {
+			if(ev->button == Button1)
+				togglemode(NULL);
+		}
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
-		if(CLEANMASK(ev->state) == 0)
+		if(CLEANMASK(ev->state) != MODKEY)
 			return;
 		switch(ev->button) {
 		default:
@@ -148,6 +150,7 @@ buttonpress(XEvent *e)
 static void
 configurerequest(XEvent *e)
 {
+	int ox, oy, ow, oh;
 	unsigned long newmask;
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
@@ -155,6 +158,10 @@ configurerequest(XEvent *e)
 	XWindowChanges wc;
 
 	if((c = getclient(ev->window))) {
+		ox = c->x;
+		oy = c->y;
+		ow = c->w;
+		oh = c->h;
 		gravitate(c, True);
 		if(ev->value_mask & CWX)
 			c->x = ev->x;
@@ -189,8 +196,13 @@ configurerequest(XEvent *e)
 			XSendEvent(dpy, c->win, True, NoEventMask, &synev);
 		}
 		XSync(dpy, False);
-		if(c->isfloat)
+		if(c->isfloat || c->ismax) {
 			resize(c, False, TopLeft);
+			c->x = ox;
+			c->y = oy;
+			c->w = ow;
+			c->h = oh;
+		}
 		else
 			arrange(NULL);
 	}