X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=client.c;h=3578beb31abf3d9d8f6d4749a866afac030c5a79;hb=15abade2720158fd35dcf59aa2cd5cbb325a849c;hp=45cb3a362fff8a0c2a49bc572280e68972c5afab;hpb=fd00b3a18620c70721c4c4d9f0169e06b9ce4437;p=dwm.git

diff --git a/client.c b/client.c
index 45cb3a3..3578beb 100644
--- a/client.c
+++ b/client.c
@@ -10,6 +10,14 @@
 
 /* static functions */
 
+static void
+detachstack(Client *c)
+{
+	Client **tc;
+	for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+	*tc = c->snext;
+}
+
 static void
 grabbuttons(Client *c, Bool focus)
 {
@@ -99,13 +107,9 @@ focus(Client *c)
 		}
 	}
 	if(c) {
-		if(c->isfloat || arrange == dofloat) {
-			detach(c);
-			if(clients)
-				clients->prev = c;
-			c->next = clients;
-			clients = c;
-		}
+		detachstack(c);
+		c->snext = stack;
+		stack = c;
 		grabbuttons(c, True);
 		drawtitle(c);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
@@ -205,7 +209,6 @@ killclient(Arg *arg)
 void
 manage(Window w, XWindowAttributes *wa)
 {
-	unsigned int i;
 	Client *c;
 	Window trans;
 	XSetWindowAttributes twa;
@@ -254,7 +257,8 @@ manage(Window w, XWindowAttributes *wa)
 	if(clients)
 		clients->prev = c;
 	c->next = clients;
-	clients = c;
+	c->snext = stack;
+	stack = clients = c;
 
 	settitle(c);
 	ban(c);
@@ -428,6 +432,7 @@ unmanage(Client *c)
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	XDestroyWindow(dpy, c->twin);
 
+	detachstack(c);
 	free(c->tags);
 	free(c);