small change to comments, renamed two set* functions in client.c into update*

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 586a87f..a794f44 100644 (file)
--- a/client.c
+++ b/client.c
@@ -11,11 +11,19 @@
 /* static functions */
 
 static void
-grabbuttons(Client *c, Bool focus)
+detachstack(Client *c)
+{
+       Client **tc;
+       for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+       *tc = c->snext;
+}
+
+static void
+grabbuttons(Client *c, Bool focused)
 {
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 
-       if(focus) {
+       if(focused) {
                XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
                XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
@@ -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;
@@ -213,7 +223,7 @@ manage(Window w, XWindowAttributes *wa)
        c->th = bh;
 
        c->border = 0;
-       setsize(c);
+       updatesize(c);
 
        if(c->x + c->w + 2 > sw)
                c->x = sw - c->w - 2;
@@ -247,9 +257,10 @@ manage(Window w, XWindowAttributes *wa)
        if(clients)
                clients->prev = c;
        c->next = clients;
-       clients = c;
+       c->snext = stack;
+       stack = clients = c;
 
-       settitle(c);
+       updatetitle(c);
        ban(c);
        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->twin);
@@ -293,12 +304,12 @@ resize(Client *c, Bool sizehints, Corner sticky)
                wc.border_width = 0;
        else
                wc.border_width = 1;
-       XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+       XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
        XSync(dpy, False);
 }
 
 void
-setsize(Client *c)
+updatesize(Client *c)
 {
        long msize;
        XSizeHints size;
@@ -337,7 +348,7 @@ setsize(Client *c)
 }
 
 void
-settitle(Client *c)
+updatetitle(Client *c)
 {
        char **list = NULL;
        int n;
@@ -403,19 +414,16 @@ togglemax(Arg *arg)
 void
 unmanage(Client *c)
 {
-       Client *tc, *fc;
-       Window trans;
+       Client *nc;
+
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 
        detach(c);
+       detachstack(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(nc = stack; nc && !isvisible(nc); nc = nc->snext);
+               focus(nc);
        }
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);