Added tag 3.6.1 for changeset 20ec6976cee1

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 0251445..c962c39 100644 (file)
--- a/client.c
+++ b/client.c
@@ -18,6 +18,7 @@ attachstack(Client *c) {
 static void
 detachstack(Client *c) {
        Client **tc;
+
        for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
        *tc = c->snext;
 }
@@ -77,6 +78,7 @@ isprotodel(Client *c) {
 static void
 setclientstate(Client *c, long state) {
        long data[] = {state, None};
+
        XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
                        PropModeReplace, (unsigned char *)data, 2);
 }
@@ -169,38 +171,6 @@ focus(Client *c) {
 }
 
 void
-focusnext(Arg *arg) {
-       Client *c;
-   
-       if(!sel)
-               return;
-       for(c = sel->next; c && !isvisible(c); c = c->next);
-       if(!c)
-               for(c = clients; c && !isvisible(c); c = c->next);
-       if(c) {
-               focus(c);
-               restack();
-       }
-}
-
-void
-focusprev(Arg *arg) {
-       Client *c;
-
-       if(!sel)
-               return;
-       for(c = sel->prev; c && !isvisible(c); c = c->prev);
-       if(!c) {
-               for(c = clients; c && c->next; c = c->next);
-               for(; c && !isvisible(c); c = c->prev);
-       }
-       if(c) {
-               focus(c);
-               restack();
-       }
-}
-
-void
 killclient(Arg *arg) {
        if(!sel)
                return;
@@ -240,34 +210,28 @@ manage(Window w, XWindowAttributes *wa) {
                        c->y = way;
        }
        updatesizehints(c);
-       XSelectInput(dpy, c->win,
+       XSelectInput(dpy, w,
                StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
-       XGetTransientForHint(dpy, c->win, &trans);
+       XGetTransientForHint(dpy, w, &trans);
        grabbuttons(c, False);
        wc.border_width = c->border;
-       XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
-       XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+       XConfigureWindow(dpy, w, CWBorderWidth, &wc);
+       XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
        configure(c); /* propagates border_width, if size doesn't change */
        updatetitle(c);
-       for(t = clients; t && t->win != c->win; t = t->next);
+       for(t = clients; t && t->win != trans; t = t->next);
        settags(c, t);
-       if(!c->isfloat)
-               c->isfloat = (t != 0) || c->isfixed;
+       if(!c->isversatile)
+               c->isversatile = (t != NULL) || c->isfixed;
        attach(c);
        attachstack(c);
        c->isbanned = True;
-       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-       XMapWindow(dpy, c->win);
+       XMoveWindow(dpy, w, c->x + 2 * sw, c->y);
+       XMapWindow(dpy, w);
        setclientstate(c, NormalState);
        if(isvisible(c))
                focus(c);
-       arrange();
-}
-
-Client *
-nexttiled(Client *c) {
-       for(; c && (c->isfloat || !isvisible(c)); c = c->next);
-       return c;
+       lt->arrange();
 }
 
 void
@@ -339,6 +303,14 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 }
 
 void
+toggleversatile(Arg *arg) {
+       if(!sel || lt->arrange == versatile)
+               return;
+       sel->isversatile = !sel->isversatile;
+       lt->arrange();
+}
+
+void
 updatesizehints(Client *c) {
        long msize;
        XSizeHints size;
@@ -428,7 +400,7 @@ unmanage(Client *c) {
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
-       arrange();
+       lt->arrange();
 }
 
 void
@@ -438,18 +410,17 @@ zoom(Arg *arg) {
 
        if(!sel)
                return;
-       if(sel->isfloat || (arrange == dofloat)) {
+       if(sel->isversatile || (lt->arrange == versatile)) {
                togglemax(sel);
                return;
        }
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
-
        if((c = sel) == nexttiled(clients))
                if(!(c = nexttiled(c->next)))
                        return;
        detach(c);
        attach(c);
        focus(c);
-       arrange();
+       lt->arrange();
 }