renamed column into area

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 5667134..d3378ff 100644 (file)
--- a/view.c
+++ b/view.c
@@ -7,7 +7,7 @@
 /* static */
 
 static Client *
-minclient() {
+minclient(void) {
        Client *c, *min;
 
        if((clients && clients->isfloat) || arrange == dofloat)
@@ -25,7 +25,7 @@ nexttiled(Client *c) {
 }
 
 static void
-reorder() {
+reorder(void) {
        Client *c, *newclients, *tail;
 
        newclients = tail = NULL;
@@ -45,17 +45,18 @@ reorder() {
 static void
 togglemax(Client *c)
 {
+       XEvent ev;
        if((c->ismax = !c->ismax)) {
                c->rx = c->x; c->x = sx;
                c->ry = c->y; c->y = bh;
-               c->rw = c->w; c->w = sw;
-               c->rh = c->h; c->h = sh;
+               c->rw = c->w; c->w = sw - 2 * BORDERPX;
+               c->rh = c->h; c->h = sh - bh - 2 * BORDERPX;
        }
        else {
                c->x = c->rx;
                c->y = c->ry;
-               c->w = c->w;
-               c->h = c->h;
+               c->w = c->rw;
+               c->h = c->rh;
        }
        resize(c, True, TopLeft);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
@@ -94,21 +95,32 @@ dofloat(Arg *arg) {
        restack();
 }
 
+/* This algorithm is based on a (M)aster area and a (S)tacking area.
+ * It supports following arrangements:
+ *
+ *     MMMS            MMMM
+ *     MMMS            MMMM
+ *     MMMS            SSSS
+ *
+ * The stacking area can be set to arrange clients vertically or horizontally.
+ * Through inverting the algorithm it can be used to achieve following setup in
+ * a dual head environment (due to running two dwm instances concurrently on
+ * the specific screen):
+ *
+ *     SMM MMS         MMM MMM
+ *     SMM MMS         MMM MMM
+ *     SMM MMS         SSS SSS
+ *
+ * This uses the center of the two screens for master areas.
+ */
 void
 dotile(Arg *arg) {
        int h, i, n, w;
        Client *c;
 
        w = sw - mw;
-       for(n = 0, c = clients; c; c = c->next)
-               if(isvisible(c)) {
-                       if(c->isfloat) {
-                               if(c->ismax)
-                                       togglemax(c);
-                       }
-                       else
-                               n++;
-               }
+       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+               n++;
 
        if(n > 1)
                h = (sh - bh) / (n - 1);
@@ -121,32 +133,33 @@ dotile(Arg *arg) {
                                resize(c, True, TopLeft);
                                continue;
                        }
+                       c->ismax = False;
                        if(n == 1) {
                                c->x = sx;
                                c->y = sy + bh;
-                               c->w = sw - 2;
-                               c->h = sh - 2 - bh;
+                               c->w = sw - 2 * BORDERPX;
+                               c->h = sh - 2 * BORDERPX - bh;
                        }
                        else if(i == 0) {
                                c->x = sx;
                                c->y = sy + bh;
-                               c->w = mw - 2;
-                               c->h = sh - 2 - bh;
+                               c->w = mw - 2 * BORDERPX;
+                               c->h = sh - 2 * BORDERPX - bh;
                        }
                        else if(h > bh) {
                                c->x = sx + mw;
                                c->y = sy + (i - 1) * h + bh;
-                               c->w = w - 2;
+                               c->w = w - 2 * BORDERPX;
                                if(i + 1 == n)
-                                       c->h = sh - c->y - 2;
+                                       c->h = sh - c->y - 2 * BORDERPX;
                                else
-                                       c->h = h - 2;
+                                       c->h = h - 2 * BORDERPX;
                        }
                        else { /* fallback if h < bh */
                                c->x = sx + mw;
                                c->y = sy + bh;
-                               c->w = w - 2;
-                               c->h = sh - 2 - bh;
+                               c->w = w - 2 * BORDERPX;
+                               c->h = sh - 2 * BORDERPX - bh;
                        }
                        resize(c, False, TopLeft);
                        i++;
@@ -211,7 +224,7 @@ resizecol(Arg *arg) {
        for(n = 0, c = clients; c; c = c->next)
                if(isvisible(c) && !c->isfloat)
                        n++;
-       if(!sel || sel->isfloat || n < 2 || (arrange != dotile))
+       if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
                return;
 
        if(sel == getnext(clients)) {
@@ -228,10 +241,10 @@ resizecol(Arg *arg) {
 }
 
 void
-restack() {
+restack(void) {
        Client *c;
        XEvent ev;
-       
+
        if(!sel) {
                drawstatus();
                return;
@@ -296,7 +309,6 @@ void
 zoom(Arg *arg) {
        unsigned int n;
        Client *c;
-       XEvent ev;
 
        if(!sel)
                return;
@@ -309,7 +321,7 @@ zoom(Arg *arg) {
        for(n = 0, c = clients; c; c = c->next)
                if(isvisible(c) && !c->isfloat)
                        n++;
-       if(n < 2 || (arrange != dotile))
+       if(n < 2 || (arrange == dofloat))
                return;
 
        if((c = sel) == nexttiled(clients))