preserving c1->snext and c2->snext in swap() as well.

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 9ba8e0b..b72e4d5 100644 (file)
--- a/view.c
+++ b/view.c
@@ -1,43 +1,92 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>

  * See LICENSE file for license details.
  */
 #include "dwm.h"
 
  * See LICENSE file for license details.
  */
 #include "dwm.h"
 

-/* extern */
+/* static */

 
 

-void (*arrange)(Arg *) = DEFMODE;
+static Client *
+nexttiled(Client *c) {
+       for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+       return c;
+}

 
 

-void
-attach(Client *c)
-{
-       Client *first = getnext(clients);
-
-       if(!first) {
-               if(clients) {
-                       for(first = clients; first->next; first = first->next);
-                       first->next = c;
-                       c->prev = first;
-               }
-               else
-                       clients = c;
-       }
-       else if(first == clients) {
-               c->next = clients;
+static Bool
+ismaster(Client *c) {
+       Client *cl;
+       unsigned int i;
+
+       for(cl = nexttiled(clients), i = 0; cl && cl != c; cl = nexttiled(cl->next), i++);
+       return i < nmaster;
+}
+
+static void
+pop(Client *c) {
+       detach(c);
+       if(clients)

                clients->prev = c;
                clients->prev = c;

-               clients = c;
+       c->next = clients;
+       clients = c;
+}
+
+static void
+swap(Client *c1, Client *c2) {
+       Client tmp = *c1;
+       Client *c1p = c1->prev;
+       Client *c1n = c1->next;
+       Client *c1s = c1->snext;
+       Client *c2p = c2->prev;
+       Client *c2n = c2->next;
+       Client *c2s = c2->snext;
+
+       *c1 = *c2;
+       *c2 = tmp;
+       c1->prev = c1p;
+       c1->next = c1n;
+       c1->snext = c1s;
+       c2->prev = c2p;
+       c2->next = c2n;
+       c2->snext = c2s;
+}
+
+static void
+togglemax(Client *c) {
+       XEvent ev;
+               
+       if(c->isfixed)
+               return;
+
+       if((c->ismax = !c->ismax)) {
+               c->rx = c->x; c->x = wax;
+               c->ry = c->y; c->y = way;
+               c->rw = c->w; c->w = waw - 2 * BORDERPX;
+               c->rh = c->h; c->h = wah - 2 * BORDERPX;

        }
        else {
        }
        else {

-               first->prev->next = c;
-               c->prev = first->prev;
-               first->prev = c;
-               c->next = first;
+               c->x = c->rx;
+               c->y = c->ry;
+               c->w = c->rw;
+               c->h = c->rh;

        }
        }

+       resize(c, True, TopLeft);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
+static Client *
+topofstack() {
+       Client *c;
+       unsigned int i;
+
+       for(c = nexttiled(clients), i = 0; c && i < nmaster; c = nexttiled(c->next), i++);
+       return (i < nmaster) ? NULL : c;

 }
 
 }
 

+/* extern */
+
+void (*arrange)(void) = DEFMODE;
+

 void
 void

-detach(Client *c)
-{
+detach(Client *c) {

        if(c->prev)
                c->prev->next = c->next;
        if(c->next)
        if(c->prev)
                c->prev->next = c->next;
        if(c->next)


@@ -48,100 +97,79 @@ detach(Client *c)
 }
 
 void
 }
 
 void

-dofloat(Arg *arg)
-{
+dofloat(void) {

        Client *c;
 
        for(c = clients; c; c = c->next) {
        Client *c;
 
        for(c = clients; c; c = c->next) {

-               c->ismax = False;

                if(isvisible(c)) {
                        resize(c, True, TopLeft);
                }
                else
                        ban(c);
        }
                if(isvisible(c)) {
                        resize(c, True, TopLeft);
                }
                else
                        ban(c);
        }

-       if(!sel || !isvisible(sel))
-               sel = getnext(clients);
-       if(sel)
-               focus(sel);
-       else
-               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+       if(!sel || !isvisible(sel)) {
+               for(c = stack; c && !isvisible(c); c = c->snext);
+               focus(c);
+       }

        restack();
 }
 
 void
        restack();
 }
 
 void

-dotile(Arg *arg)
-{
-       int h, i, n, w;
+dotile(void) {
+       unsigned int i, n, mw, mh, tw, th;

        Client *c;
 
        Client *c;
 

-       w = sw - mw;
-       for(n = 0, c = clients; c; c = c->next)
-               if(isvisible(c) && !c->isfloat)
-                       n++;
-
-       if(n > 1)
-               h = (sh - bh) / (n - 1);
-       else
-               h = sh - bh;
+       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+               n++;
+       /* window geoms */
+       mw = (n > nmaster) ? (waw * master) / 1000 : waw;
+       mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
+       tw = waw - mw;
+       th = (n > nmaster) ? wah / (n - nmaster) : 0;

 
 

-       for(i = 0, c = clients; c; c = c->next) {
-               c->ismax = False;
+       for(i = 0, c = clients; c; c = c->next)

                if(isvisible(c)) {
                        if(c->isfloat) {
                                resize(c, True, TopLeft);
                                continue;
                        }
                if(isvisible(c)) {
                        if(c->isfloat) {
                                resize(c, True, TopLeft);
                                continue;
                        }

-                       if(n == 1) {
-                               c->x = sx;
-                               c->y = sy + bh;
-                               c->w = sw - 2;
-                               c->h = sh - 2 - bh;
+                       c->ismax = False;
+                       c->x = wax;
+                       c->y = way;
+                       if(i < nmaster) {
+                               c->y += i * mh;
+                               c->w = mw - 2 * BORDERPX;
+                               c->h = mh - 2 * BORDERPX;

                        }
                        }

-                       else if(i == 0) {
-                               c->x = sx;
-                               c->y = sy + bh;
-                               c->w = mw - 2;
-                               c->h = sh - 2 - bh;
-                       }
-                       else if(h > bh) {
-                               c->x = sx + mw;
-                               c->y = sy + (i - 1) * h + bh;
-                               c->w = w - 2;
-                               if(i + 1 == n)
-                                       c->h = sh - c->y - 2;
-                               else
-                                       c->h = h - 2;
-                       }
-                       else { /* fallback if h < bh */
-                               c->x = sx + mw;
-                               c->y = sy + bh;
-                               c->w = w - 2;
-                               c->h = sh - 2 - bh;
+                       else {  /* tile window */
+                               c->x += mw;
+                               c->w = tw - 2 * BORDERPX;
+                               if(th > bh) {
+                                       c->y += (i - nmaster) * th;
+                                       c->h = th - 2 * BORDERPX;
+                               }
+                               else /* fallback if th < bh */
+                                       c->h = wah - 2 * BORDERPX;

                        }
                        resize(c, False, TopLeft);
                        i++;
                }
                else
                        ban(c);
                        }
                        resize(c, False, TopLeft);
                        i++;
                }
                else
                        ban(c);

+
+       if(!sel || !isvisible(sel)) {
+               for(c = stack; c && !isvisible(c); c = c->snext);
+               focus(c);

        }
        }

-       if(!sel || !isvisible(sel))
-               sel = getnext(clients);
-       if(sel)
-               focus(sel);
-       else
-               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);

        restack();
 }
 
 void
        restack();
 }
 
 void

-focusnext(Arg *arg)
-{
+focusnext(Arg *arg) {

        Client *c;
    
        if(!sel)
                return;
        Client *c;
    
        if(!sel)
                return;

-

        if(!(c = getnext(sel->next)))
                c = getnext(clients);
        if(c) {
        if(!(c = getnext(sel->next)))
                c = getnext(clients);
        if(c) {


@@ -151,13 +179,11 @@ focusnext(Arg *arg)
 }
 
 void
 }
 
 void

-focusprev(Arg *arg)
-{
+focusprev(Arg *arg) {

        Client *c;
 
        if(!sel)
                return;
        Client *c;
 
        if(!sel)
                return;

-

        if(!(c = getprev(sel->prev))) {
                for(c = clients; c && c->next; c = c->next);
                c = getprev(c);
        if(!(c = getprev(sel->prev))) {
                for(c = clients; c && c->next; c = c->next);
                c = getprev(c);


@@ -168,9 +194,16 @@ focusprev(Arg *arg)
        }
 }
 
        }
 }
 

+void
+incnmaster(Arg *arg) {
+       if((nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
+               return;
+       nmaster += arg->i;
+       arrange();
+}
+

 Bool
 Bool

-isvisible(Client *c)
-{
+isvisible(Client *c) {

        unsigned int i;
 
        for(i = 0; i < ntags; i++)
        unsigned int i;
 
        for(i = 0; i < ntags; i++)


@@ -180,103 +213,114 @@ isvisible(Client *c)
 }
 
 void
 }
 
 void

-restack()
-{
-       static unsigned int nwins = 0;
-       static Window *wins = NULL;
-       unsigned int f, fi, m, mi, n;
+resizemaster(Arg *arg) {
+       if(arg->i == 0)
+               master = MASTER;
+       else {
+               if(master + arg->i > 950 || master + arg->i < 50)
+                       return;
+               master += arg->i;
+       }
+       arrange();
+}
+
+void
+restack(void) {

        Client *c;
        XEvent ev;
 
        Client *c;
        XEvent ev;
 

-       for(f = 0, m = 0, c = clients; c; c = c->next)
-               if(isvisible(c)) {
-                       if(c->isfloat || arrange == dofloat)
-                               f++;
-                       else
-                               m++;
-               }
-       if(!(n = 2 * (f + m))) {
+       if(!sel) {

                drawstatus();
                return;
        }
                drawstatus();
                return;
        }

-       if(nwins < n) {
-               nwins = n;
-               wins = erealloc(wins, nwins * sizeof(Window));
-       }
-
-       fi = 0;
-       mi = 2 * f;

        if(sel->isfloat || arrange == dofloat) {
        if(sel->isfloat || arrange == dofloat) {

-               wins[fi++] = sel->twin;
-               wins[fi++] = sel->win;
-       }
-       else {
-               wins[mi++] = sel->twin;
-               wins[mi++] = sel->win;
+               XRaiseWindow(dpy, sel->win);
+               XRaiseWindow(dpy, sel->twin);

        }
        }

-       for(c = clients; c; c = c->next)
-               if(isvisible(c) && c != sel) {
-                       if(c->isfloat || arrange == dofloat) {
-                               wins[fi++] = c->twin;
-                               wins[fi++] = c->win;
-                       }
-                       else {
-                               wins[mi++] = c->twin;
-                               wins[mi++] = c->win;
-                       }
+       if(arrange != dofloat) {
+               if(!sel->isfloat) {
+                       XLowerWindow(dpy, sel->twin);
+                       XLowerWindow(dpy, sel->win);
+               }
+               for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+                       if(c == sel)
+                               continue;
+                       XLowerWindow(dpy, c->twin);
+                       XLowerWindow(dpy, c->win);

                }
                }

-       XRestackWindows(dpy, wins, n);
+       }

        drawall();
        XSync(dpy, False);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
        drawall();
        XSync(dpy, False);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void

-togglemode(Arg *arg)
-{
+togglefloat(Arg *arg) {
+       if (!sel || arrange == dofloat)
+               return;
+       sel->isfloat = !sel->isfloat;
+       arrange();
+}
+
+void
+togglemode(Arg *arg) {

        arrange = (arrange == dofloat) ? dotile : dofloat;
        if(sel)
        arrange = (arrange == dofloat) ? dotile : dofloat;
        if(sel)

-               arrange(NULL);
+               arrange();

        else
                drawstatus();
 }
 
 void
        else
                drawstatus();
 }
 
 void

-toggleview(Arg *arg)
-{
+toggleview(Arg *arg) {

        unsigned int i;
 
        seltag[arg->i] = !seltag[arg->i];
        for(i = 0; i < ntags && !seltag[i]; i++);
        if(i == ntags)
                seltag[arg->i] = True; /* cannot toggle last view */
        unsigned int i;
 
        seltag[arg->i] = !seltag[arg->i];
        for(i = 0; i < ntags && !seltag[i]; i++);
        if(i == ntags)
                seltag[arg->i] = True; /* cannot toggle last view */

-       arrange(NULL);
+       arrange();

 }
 
 void
 }
 
 void

-view(Arg *arg)
-{
+view(Arg *arg) {

        unsigned int i;
 
        for(i = 0; i < ntags; i++)
        unsigned int i;
 
        for(i = 0; i < ntags; i++)

-               seltag[i] = False;
-       seltag[arg->i] = True;
-       arrange(NULL);
+               seltag[i] = (arg->i == -1) ? True : False;
+       if(arg->i >= 0 && arg->i < ntags)
+               seltag[arg->i] = True;
+       arrange();

 }
 
 void
 }
 
 void

-zoom(Arg *arg)
-{
-       Client *c = sel;
+zoom(Arg *arg) {
+       unsigned int n;
+       Client *c;

 
 

-       if(!c || (arrange != dotile) || c->isfloat || c->ismax)
+       if(!sel)
+               return;
+       if(sel->isfloat || (arrange == dofloat)) {
+               togglemax(sel);

                return;
                return;

+       }
+       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+               n++;

 
 

-       if(c == getnext(clients))
-               if(!(c = getnext(c->next)))
+       c = sel;
+       if(arrange == dofloat)
+               return;
+       else if(n <= nmaster)
+               pop(c);
+       else if(ismaster(sel)) {
+               if(!(c = topofstack()))

                        return;
                        return;

-       detach(c);
-       attach(c);
+               swap(c, sel);
+               c = sel;
+       }
+       else
+               pop(c);
+

        focus(c);
        focus(c);

-       arrange(NULL);
+       arrange();

 }
 }