X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=9c0428a0db4c7e5a3c6857cda281e085054997da;hb=7b6d5ff29863e4bc7ba787357133ffb9bc5157e6;hp=af0190fbe7d9cbcd11e561ef0f4020bfe497bb0f;hpb=aa13727067af829b94461eb36aa029297ed8e6b9;p=dwm.git

diff --git a/client.c b/client.c
index af0190f..9c0428a 100644
--- a/client.c
+++ b/client.c
@@ -11,46 +11,57 @@
 /* static functions */
 
 static void
-grabbutton(Client *c, unsigned int button, unsigned int modifier)
+grabbuttons(Client *c, Bool focus)
 {
-	XGrabButton(dpy, button, modifier, c->win, False, BUTTONMASK,
-			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, button, modifier | LockMask, c->win, False, BUTTONMASK,
-			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, button, modifier | numlockmask, c->win, False, BUTTONMASK,
-			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, button, modifier | numlockmask | LockMask, c->win, False, BUTTONMASK,
-			GrabModeAsync, GrabModeSync, None, None);
+	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+
+	if(focus) {
+		XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+		XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+		XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+		XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+
+		XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+		XGrabButton(dpy, Button2, MODKEY | LockMask, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+		XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+		XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+
+		XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+		XGrabButton(dpy, Button3, MODKEY | LockMask, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+		XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+		XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+	}
+	else
+		XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+
 }
 
 static void
 resizetitle(Client *c)
 {
-	int i;
-
-	c->tw = 0;
-	for(i = 0; i < ntags; i++)
-		if(c->tags[i])
-			c->tw += textw(tags[i]);
-	c->tw += textw(c->name);
+	c->tw = textw(c->name);
 	if(c->tw > c->w)
 		c->tw = c->w + 2;
 	c->tx = c->x + c->w - c->tw + 2;
 	c->ty = c->y;
 	if(isvisible(c))
-		XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
+		XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);
 	else
-		XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th);
-
-}
+		XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);
 
-static void
-ungrabbutton(Client *c, unsigned int button, unsigned int modifier)
-{
-	XUngrabButton(dpy, button, modifier, c->win);
-	XUngrabButton(dpy, button, modifier | LockMask, c->win);
-	XUngrabButton(dpy, button, modifier | numlockmask, c->win);
-	XUngrabButton(dpy, button, modifier | numlockmask | LockMask, c->win);
 }
 
 static int
@@ -65,7 +76,7 @@ void
 ban(Client *c)
 {
 	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-	XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
+	XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
 }
 
 void
@@ -81,10 +92,10 @@ focus(Client *c)
 		if(sel->ismax)
 			togglemax(NULL);
 		sel = c;
-		grabbutton(old, AnyButton, 0);
+		grabbuttons(old, False);
 		drawtitle(old);
 	}
-	ungrabbutton(c, AnyButton, 0);
+	grabbuttons(c, True);
 	drawtitle(c);
 	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 }
@@ -106,7 +117,7 @@ getctitle(Window w)
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if(c->title == w)
+		if(c->twin == w)
 			return c;
 	return NULL;
 }
@@ -214,7 +225,7 @@ manage(Window w, XWindowAttributes *wa)
 	twa.background_pixmap = ParentRelative;
 	twa.event_mask = ExposureMask | EnterWindowMask;
 
-	c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
+	c->twin = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
 			0, DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
@@ -224,9 +235,7 @@ manage(Window w, XWindowAttributes *wa)
 	c->next = clients;
 	clients = c;
 
-	grabbutton(c, Button1, MODKEY);
-	grabbutton(c, Button2, MODKEY);
-	grabbutton(c, Button3, MODKEY);
+	grabbuttons(c, False);
 
 	if((tc = getclient(trans))) /* inherit tags */
 		for(i = 0; i < ntags; i++)
@@ -242,7 +251,7 @@ manage(Window w, XWindowAttributes *wa)
 		sel = c;
 	arrange(NULL);
 	XMapWindow(dpy, c->win);
-	XMapWindow(dpy, c->title);
+	XMapWindow(dpy, c->twin);
 	if(isvisible(c))
 		focus(c);
 }
@@ -388,11 +397,15 @@ togglemax(Arg *arg)
 void
 unmanage(Client *c)
 {
+	Client *tc;
+	Window trans;
 	XGrabServer(dpy);
 	XSetErrorHandler(xerrordummy);
 
+	XGetTransientForHint(dpy, c->win, &trans);
+
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-	XDestroyWindow(dpy, c->title);
+	XDestroyWindow(dpy, c->twin);
 
 	if(c->prev)
 		c->prev->next = c->next;
@@ -400,8 +413,12 @@ unmanage(Client *c)
 		c->next->prev = c->prev;
 	if(c == clients)
 		clients = c->next;
-	if(sel == c)
-		sel = getnext(clients);
+	if(sel == c) {
+		if(trans && (tc = getclient(trans)) && isvisible(tc))
+			sel = tc;
+		else
+			sel = getnext(clients);
+	}
 	free(c->tags);
 	free(c);