added a general comment to dwm.h how dwm is basically organized

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 3578beb..a794f44 100644 (file)
--- a/client.c
+++ b/client.c
@@ -19,11 +19,11 @@ detachstack(Client *c)
 }
 
 static void
 }
 
 static void

-grabbuttons(Client *c, Bool focus)
+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,


@@ -223,7 +223,7 @@ manage(Window w, XWindowAttributes *wa)
        c->th = bh;
 
        c->border = 0;
        c->th = bh;
 
        c->border = 0;

-       setsize(c);
+       updatesize(c);

 
        if(c->x + c->w + 2 > sw)
                c->x = sw - c->w - 2;
 
        if(c->x + c->w + 2 > sw)
                c->x = sw - c->w - 2;


@@ -260,7 +260,7 @@ manage(Window w, XWindowAttributes *wa)
        c->snext = stack;
        stack = clients = c;
 
        c->snext = stack;
        stack = clients = c;
 

-       settitle(c);
+       updatetitle(c);

        ban(c);
        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->twin);
        ban(c);
        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->twin);


@@ -304,12 +304,12 @@ 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);
 }
 
 void
        XSync(dpy, False);
 }
 
 void

-setsize(Client *c)
+updatesize(Client *c)

 {
        long msize;
        XSizeHints size;
 {
        long msize;
        XSizeHints size;


@@ -348,7 +348,7 @@ setsize(Client *c)
 }
 
 void
 }
 
 void

-settitle(Client *c)
+updatetitle(Client *c)

 {
        char **list = NULL;
        int n;
 {
        char **list = NULL;
        int n;


@@ -414,25 +414,21 @@ 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);
        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);