X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=aa96f4ff80f8e598614a01a4924115f8e572a683;hb=bcaf6a7a0f492c3fafc4baabd2dc06f5191417ee;hp=b1328d462f6f4e81c759afe1c6ee77b9bcf0c651;hpb=8af1d973323bd799c1ec021bb7c16860e120cf92;p=dwm.git

diff --git a/client.c b/client.c
index b1328d4..aa96f4f 100644
--- a/client.c
+++ b/client.c
@@ -25,7 +25,11 @@ resizetitle(Client *c)
 		c->bw = *c->w + 2;
 	c->bx = *c->x + *c->w - c->bw + 2;
 	c->by = *c->y;
-	XMoveResizeWindow(dpy, c->title, c->bx, c->by, c->bw, c->bh);
+	if(c->tags[tsel])
+		XMoveResizeWindow(dpy, c->title, c->bx, c->by, c->bw, c->bh);
+	else
+		XMoveResizeWindow(dpy, c->title, c->bx + 2 * sw, c->by, c->bw, c->bh);
+
 }
 
 static int
@@ -235,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);
@@ -258,10 +263,8 @@ manage(Window w, XWindowAttributes *wa)
 		focus(c);
 	}
 	else {
-		ban(c);
 		XMapRaised(dpy, c->win);
 		XMapRaised(dpy, c->title);
-		XSync(dpy, False);
 	}
 }
 
@@ -319,9 +322,11 @@ resize(Client *c, Bool inc, Corner sticky)
 		*c->x = right - *c->w;
 	if(sticky == BotLeft || sticky == BotRight)
 		*c->y = bottom - *c->h;
+
 	resizetitle(c);
 	XSetWindowBorderWidth(dpy, c->win, 1);
 	XMoveResizeWindow(dpy, c->win, *c->x, *c->y, *c->w, *c->h);
+
 	e.type = ConfigureNotify;
 	e.event = c->win;
 	e.window = c->win;