draw.c is useless (belongs to main.c now)

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 79cd698..0251445 100644 (file)
--- a/client.c
+++ b/client.c
@@ -10,6 +10,12 @@
 /* static */
 
 static void
+attachstack(Client *c) {
+       c->snext = stack;
+       stack = c;
+}
+
+static void
 detachstack(Client *c) {
        Client **tc;
        for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
@@ -53,6 +59,21 @@ grabbuttons(Client *c, Bool focused) {
                                GrabModeAsync, GrabModeSync, None, None);
 }
 
+static Bool
+isprotodel(Client *c) {
+       int i, n;
+       Atom *protocols;
+       Bool ret = False;
+
+       if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
+               for(i = 0; !ret && i < n; i++)
+                       if(protocols[i] == wmatom[WMDelete])
+                               ret = True;
+               XFree(protocols);
+       }
+       return ret;
+}
+
 static void
 setclientstate(Client *c, long state) {
        long data[] = {state, None};
@@ -60,6 +81,24 @@ setclientstate(Client *c, long state) {
                        PropModeReplace, (unsigned char *)data, 2);
 }
 
+static void
+togglemax(Client *c) {
+       XEvent ev;
+
+       if(c->isfixed)
+               return;
+       if((c->ismax = !c->ismax)) {
+               c->rx = c->x;
+               c->ry = c->y;
+               c->rw = c->w;
+               c->rh = c->h;
+               resize(c, wax, way, waw - 2 * BORDERPX, wah - 2 * BORDERPX, True);
+       }
+       else
+               resize(c, c->rx, c->ry, c->rw, c->rh, True);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
 static int
 xerrordummy(Display *dsply, XErrorEvent *ee) {
        return 0;
@@ -68,6 +107,14 @@ xerrordummy(Display *dsply, XErrorEvent *ee) {
 /* extern */
 
 void
+attach(Client *c) {
+       if(clients)
+               clients->prev = c;
+       c->next = clients;
+       clients = c;
+}
+
+void
 configure(Client *c) {
        XConfigureEvent ce;
 
@@ -86,6 +133,17 @@ configure(Client *c) {
 }
 
 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
 focus(Client *c) {
        if(c && !isvisible(c))
                return;
@@ -95,8 +153,7 @@ focus(Client *c) {
        }
        if(c) {
                detachstack(c);
-               c->snext = stack;
-               stack = c;
+               attachstack(c);
                grabbuttons(c, True);
        }
        sel = c;
@@ -111,29 +168,36 @@ focus(Client *c) {
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 }
 
-Client *
-getclient(Window w) {
+void
+focusnext(Arg *arg) {
        Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(c->win == w)
-                       return c;
-       return NULL;
+   
+       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();
+       }
 }
 
-Bool
-isprotodel(Client *c) {
-       int i, n;
-       Atom *protocols;
-       Bool ret = False;
+void
+focusprev(Arg *arg) {
+       Client *c;
 
-       if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
-               for(i = 0; !ret && i < n; i++)
-                       if(protocols[i] == wmatom[WMDelete])
-                               ret = True;
-               XFree(protocols);
+       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();
        }
-       return ret;
 }
 
 void
@@ -185,15 +249,12 @@ manage(Window w, XWindowAttributes *wa) {
        XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
        configure(c); /* propagates border_width, if size doesn't change */
        updatetitle(c);
-       t = getclient(trans);
+       for(t = clients; t && t->win != c->win; t = t->next);
        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);
@@ -203,6 +264,12 @@ manage(Window w, XWindowAttributes *wa) {
        arrange();
 }
 
+Client *
+nexttiled(Client *c) {
+       for(; c && (c->isfloat || !isvisible(c)); c = c->next);
+       return c;
+}
+
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
        float actual, dx, dy, max, min;
@@ -363,3 +430,26 @@ unmanage(Client *c) {
        XUngrabServer(dpy);
        arrange();
 }
+
+void
+zoom(Arg *arg) {
+       unsigned int n;
+       Client *c;
+
+       if(!sel)
+               return;
+       if(sel->isfloat || (arrange == dofloat)) {
+               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();
+}