simplified unmanage

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 81f4280..71ef677 100644 (file)
--- a/client.c
+++ b/client.c
@@ -10,6 +10,14 @@
 
 /* static functions */
 
 
 /* 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)
 {
 static void
 grabbuttons(Client *c, Bool focus)
 {


@@ -99,6 +107,9 @@ focus(Client *c)
                }
        }
        if(c) {
                }
        }
        if(c) {

+               detachstack(c);
+               c->snext = stack;
+               stack = c;

                grabbuttons(c, True);
                drawtitle(c);
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
                grabbuttons(c, True);
                drawtitle(c);
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);


@@ -198,8 +209,7 @@ killclient(Arg *arg)
 void
 manage(Window w, XWindowAttributes *wa)
 {
 void
 manage(Window w, XWindowAttributes *wa)
 {

-       unsigned int i;
-       Client *c, *tc;
+       Client *c;

        Window trans;
        XSetWindowAttributes twa;
 
        Window trans;
        XSetWindowAttributes twa;
 


@@ -238,11 +248,7 @@ manage(Window w, XWindowAttributes *wa)
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
        grabbuttons(c, False);
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
        grabbuttons(c, False);

-       if((tc = getclient(trans))) /* inherit tags */
-               for(i = 0; i < ntags; i++)
-                       c->tags[i] = tc->tags[i];
-       else
-               settags(c);
+       settags(c, getclient(trans));

        if(!c->isfloat)
                c->isfloat = trans
                        || (c->maxw && c->minw &&
        if(!c->isfloat)
                c->isfloat = trans
                        || (c->maxw && c->minw &&


@@ -251,16 +257,16 @@ manage(Window w, XWindowAttributes *wa)
        if(clients)
                clients->prev = c;
        c->next = clients;
        if(clients)
                clients->prev = c;
        c->next = clients;

-       clients = c;
+       c->snext = stack;
+       stack = clients = c;

 
        settitle(c);
 
        settitle(c);

-       if(isvisible(c))
-               sel = c;
-       arrange(NULL);
+       ban(c);

        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->twin);
        if(isvisible(c))
                focus(c);
        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->twin);
        if(isvisible(c))
                focus(c);

+       arrange(NULL);

 }
 
 void
 }
 
 void


@@ -408,24 +414,19 @@ togglemax(Arg *arg)
 void
 unmanage(Client *c)
 {
 void
 unmanage(Client *c)
 {

-       Client *tc, *fc;
-       Window trans;

        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 
        detach(c);
        if(sel == c) {
        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);
 
        }
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XDestroyWindow(dpy, c->twin);
 

+       detachstack(c);

        free(c->tags);
        free(c);
 
        free(c->tags);
        free(c);