X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=client.c;h=aa96f4ff80f8e598614a01a4924115f8e572a683;hb=bcaf6a7a0f492c3fafc4baabd2dc06f5191417ee;hp=3b6a0e128baea6a97e0d5b8c19e34cd79b3b34cf;hpb=4491bdda69f20d976bd61ba92b766dac56c07212;p=dwm.git

diff --git a/client.c b/client.c
index 3b6a0e1..aa96f4f 100644
--- a/client.c
+++ b/client.c
@@ -239,16 +239,17 @@ manage(Window w, XWindowAttributes *wa)
 
 	XGrabButton(dpy, Button1, ControlMask, c->win, False, ButtonPressMask,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
+	XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonPressMask,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
+	XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonPressMask,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
+	XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonPressMask,
 			GrabModeAsync, GrabModeSync, None, None);
 
 	if(!c->isfloat)
-		c->isfloat = trans
-			|| ((c->maxw == c->minw) && (c->maxh == c->minh));
+		c->isfloat = trans || (c->maxw && c->minw &&
+				(c->maxw == c->minw) && (c->maxh == c->minh));
+
 
 	setgeom(c);
 	settitle(c);