added some new convenience functions

diff --git a/client.c b/client.c
index 79cd698..9a30526 100644 (file)
--- a/client.c
+++ b/client.c
@@ -9,13 +9,6 @@
 
 /* static */
 
 
 /* static */
 

-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 focused) {
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 static void
 grabbuttons(Client *c, Bool focused) {
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);


@@ -67,6 +60,20 @@ xerrordummy(Display *dsply, XErrorEvent *ee) {
 
 /* extern */
 
 
 /* extern */
 

+void
+attach(Client *c) {
+       if(clients)
+               clients->prev = c;
+       c->next = clients;
+       clients = c;
+}
+
+void
+attachstack(Client *c) {
+       c->snext = stack;
+       stack = c;
+}
+

 void
 configure(Client *c) {
        XConfigureEvent ce;
 void
 configure(Client *c) {
        XConfigureEvent ce;


@@ -85,6 +92,24 @@ configure(Client *c) {
        XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
 }
 
        XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
 }
 

+void
+detach(Client *c) {
+       if(c->prev)
+               c->prev->next = c->next;
+       if(c->next)
+               c->next->prev = c->prev;
+       if(c == clients)
+               clients = c->next;
+       c->next = c->prev = NULL;
+}
+
+void
+detachstack(Client *c) {
+       Client **tc;
+       for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+       *tc = c->snext;
+}
+

 void
 focus(Client *c) {
        if(c && !isvisible(c))
 void
 focus(Client *c) {
        if(c && !isvisible(c))


@@ -95,8 +120,7 @@ focus(Client *c) {
        }
        if(c) {
                detachstack(c);
        }
        if(c) {
                detachstack(c);

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

                grabbuttons(c, True);
        }
        sel = c;
                grabbuttons(c, True);
        }
        sel = c;


@@ -189,11 +213,8 @@ manage(Window w, XWindowAttributes *wa) {
        settags(c, t);
        if(!c->isfloat)
                c->isfloat = (t != 0) || c->isfixed;
        settags(c, t);
        if(!c->isfloat)
                c->isfloat = (t != 0) || c->isfixed;

-       if(clients)
-               clients->prev = c;
-       c->next = clients;
-       c->snext = stack;
-       stack = clients = c;
+       attach(c);
+       attachstack(c);

        c->isbanned = True;
        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        XMapWindow(dpy, c->win);
        c->isbanned = True;
        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        XMapWindow(dpy, c->win);

diff --git a/dwm.h b/dwm.h
index c07229a..35950a6 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -99,7 +99,11 @@ extern Display *dpy;
 extern Window root, barwin;
 
 /* client.c */
 extern Window root, barwin;
 
 /* client.c */

+extern void attach(Client *c);                 /* attaches c to global client list */
+extern void attachstack(Client *c);            /* attaches client to stack */

 extern void configure(Client *c);              /* send synthetic configure event */
 extern void configure(Client *c);              /* send synthetic configure event */

+extern void detach(Client *c);                 /* detaches c from global client list */
+extern void detachstack(Client *c);            /* detaches client from stack */

 extern void focus(Client *c);                  /* focus c, c may be NULL */
 extern Client *getclient(Window w);            /* return client of w */
 extern Bool isprotodel(Client *c);             /* returns True if c->win supports wmatom[WMDelete] */
 extern void focus(Client *c);                  /* focus c, c may be NULL */
 extern Client *getclient(Window w);            /* return client of w */
 extern Bool isprotodel(Client *c);             /* returns True if c->win supports wmatom[WMDelete] */


@@ -144,7 +148,6 @@ extern void eprint(const char *errstr, ...);        /* prints errstr and exits with 1 *
 extern void spawn(Arg *arg);                   /* forks a new subprocess with to arg's cmd */
 
 /* view.c */
 extern void spawn(Arg *arg);                   /* forks a new subprocess with to arg's cmd */
 
 /* view.c */

-extern void detach(Client *c);                 /* detaches c from global client list */

 extern void dofloat(void);                     /* arranges all windows floating */
 extern void focusnext(Arg *arg);               /* focuses next visible client, arg is ignored  */
 extern void focusprev(Arg *arg);               /* focuses previous visible client, arg is ignored */
 extern void dofloat(void);                     /* arranges all windows floating */
 extern void focusnext(Arg *arg);               /* focuses next visible client, arg is ignored  */
 extern void focusprev(Arg *arg);               /* focuses previous visible client, arg is ignored */

diff --git a/tile.c b/tile.c
index fe25943..8075e55 100644 (file)
--- a/tile.c
+++ b/tile.c
@@ -125,10 +125,7 @@ zoom(Arg *arg) {
                if(!(c = nextmanaged(c->next)))
                        return;
        detach(c);
                if(!(c = nextmanaged(c->next)))
                        return;
        detach(c);

-       if(clients)
-               clients->prev = c;
-       c->next = clients;
-       clients = c;
+       attach(c);

        focus(c);
        arrange();
 }
        focus(c);
        arrange();
 }

diff --git a/view.c b/view.c
index 72aa04e..cd07b94 100644 (file)
--- a/view.c
+++ b/view.c
@@ -7,17 +7,6 @@
 
 void (*arrange)(void) = DEFMODE;
 
 
 void (*arrange)(void) = DEFMODE;
 

-void
-detach(Client *c) {
-       if(c->prev)
-               c->prev->next = c->next;
-       if(c->next)
-               c->next->prev = c->prev;
-       if(c == clients)
-               clients = c->next;
-       c->next = c->prev = NULL;
-}
-

 void
 dofloat(void) {
        Client *c;
 void
 dofloat(void) {
        Client *c;