added some comments

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 46693cd..b6caa93 100644 (file)
--- a/client.c
+++ b/client.c
@@ -11,11 +11,19 @@
 /* static functions */
 
 static void
 /* 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);
 
 {
        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,
                XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
                XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,


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

-               if((c->isfloat || arrange == dofloat) && (c != clients)) {
-                       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);
                grabbuttons(c, True);
                drawtitle(c);
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);


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

-       unsigned int i;

        Client *c;
        Window trans;
        XSetWindowAttributes twa;
        Client *c;
        Window trans;
        XSetWindowAttributes twa;


@@ -255,7 +257,8 @@ 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);
        ban(c);
 
        settitle(c);
        ban(c);


@@ -301,7 +304,7 @@ resize(Client *c, Bool sizehints, Corner sticky)
                wc.border_width = 0;
        else
                wc.border_width = 1;
                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);
 }
 
        XSync(dpy, False);
 }
 


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

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

        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 
        detach(c);
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 
        detach(c);

+       detachstack(c);

        if(sel == 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);
        }
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);