simplified unmanage

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 586a87f..71ef677 100644 (file)
--- 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,6 +107,9 @@ focus(Client *c)
                }
        }
        if(c) {
+               detachstack(c);
+               c->snext = stack;
+               stack = c;
                grabbuttons(c, True);
                drawtitle(c);
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
@@ -198,7 +209,6 @@ killclient(Arg *arg)
 void
 manage(Window w, XWindowAttributes *wa)
 {
-       unsigned int i;
        Client *c;
        Window trans;
        XSetWindowAttributes twa;
@@ -247,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);
@@ -403,24 +414,19 @@ togglemax(Arg *arg)
 void
 unmanage(Client *c)
 {
-       Client *tc, *fc;
-       Window trans;
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 
        detach(c);
        if(sel == c) {
-               XGetTransientForHint(dpy, c->win, &trans);
-               if(trans && (tc = getclient(trans)) && isvisible(tc))
-                       fc = tc;
-               else
-                       fc = getnext(clients);
-               focus(fc);
+               for(sel = stack; sel && !isvisible(sel); sel = sel->snext);
+               focus(sel);
        }
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XDestroyWindow(dpy, c->twin);
 
+       detachstack(c);
        free(c->tags);
        free(c);