first step to a more flexible dotile() algorithm

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 3e78661..90080fb 100644 (file)
--- a/view.c
+++ b/view.c
@@ -3,13 +3,11 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-#include <stdio.h>
 
 /* static */
 
 static Client *
-minclient()
-{
+minclient(void) {
        Client *c, *min;
 
        if((clients && clients->isfloat) || arrange == dofloat)
@@ -20,9 +18,14 @@ minclient()
        return min;
 }
 
+static Client *
+nexttiled(Client *c) {
+       for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+       return c;
+}
+
 static void
-reorder()
-{
+reorder(void) {
        Client *c, *newclients, *tail;
 
        newclients = tail = NULL;
@@ -39,20 +42,34 @@ reorder()
        clients = newclients;
 }
 
-static Client *
-nexttiled(Client *c)
+static void
+togglemax(Client *c)
 {
-       for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
-       return 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 - 2 * BORDERPX;
+               c->rh = c->h; c->h = sh - bh - 2 * BORDERPX;
+       }
+       else {
+               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));
 }
 
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
+Bool isvertical = VERTICALSTACK;
+StackPos stackpos = STACKPOS;
 
 void
-detach(Client *c)
-{
+detach(Client *c) {
        if(c->prev)
                c->prev->next = c->next;
        if(c->next)
@@ -63,12 +80,9 @@ detach(Client *c)
 }
 
 void
-dofloat(Arg *arg)
-{
+dofloat(Arg *arg) {
        Client *c;
 
-       maximized = False;
-
        for(c = clients; c; c = c->next) {
                if(isvisible(c)) {
                        resize(c, True, TopLeft);
@@ -83,23 +97,39 @@ dofloat(Arg *arg)
        restack();
 }
 
+/* This algorithm is based on a (M)aster area and a (S)tacking area.
+ * It supports following arrangements:
+ *     MMMS            MMMM            SMMM
+ *     MMMS            MMMM            SMMM
+ *     MMMS            SSSS            SMMM
+ */
 void
-dotile(Arg *arg)
-{
+dotile(Arg *arg) {
        int h, i, n, w;
        Client *c;
 
-       maximized = False;
+       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+               n++;
 
-       w = sw - mw;
-       for(n = 0, c = clients; c; c = c->next)
-               if(isvisible(c) && !c->isfloat)
-                       n++;
+       if(isvertical) {
+               if(stackpos == StackBottom) {
+                       w = sw;
+                       if(n > 1)
+                               h = (sh - bh) / (n - 1);
+                       else
+                               h = sh - bh;
+               }
+               else {
+                       w = sw - master;
+                       if(n > 1)
+                               h = (sh - bh) / (n - 1);
+                       else
+                               h = sh - bh;
+               }
+       }
+       else { /* horizontal stack */
 
-       if(n > 1)
-               h = (sh - bh) / (n - 1);
-       else
-               h = sh - bh;
+       }
 
        for(i = 0, c = clients; c; c = c->next) {
                if(isvisible(c)) {
@@ -107,32 +137,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 = master - 2 * BORDERPX;
+                               c->h = sh - 2 * BORDERPX - bh;
                        }
                        else if(h > bh) {
-                               c->x = sx + mw;
+                               c->x = sx + master;
                                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->x = sx + master;
                                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++;
@@ -148,8 +179,7 @@ dotile(Arg *arg)
 }
 
 void
-focusnext(Arg *arg)
-{
+focusnext(Arg *arg) {
        Client *c;
    
        if(!sel)
@@ -164,8 +194,7 @@ focusnext(Arg *arg)
 }
 
 void
-focusprev(Arg *arg)
-{
+focusprev(Arg *arg) {
        Client *c;
 
        if(!sel)
@@ -182,8 +211,7 @@ focusprev(Arg *arg)
 }
 
 Bool
-isvisible(Client *c)
-{
+isvisible(Client *c) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
@@ -193,36 +221,34 @@ isvisible(Client *c)
 }
 
 void
-resizecol(Arg *arg)
-{
+resizecol(Arg *arg) {
        unsigned int n;
        Client *c;
 
        for(n = 0, c = clients; c; c = c->next)
                if(isvisible(c) && !c->isfloat)
                        n++;
-       if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
+       if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
                return;
 
        if(sel == getnext(clients)) {
-               if(mw + arg->i > sw - 100 || mw + arg->i < 100)
+               if(master + arg->i > sw - 100 || master + arg->i < 100)
                        return;
-               mw += arg->i;
+               master += arg->i;
        }
        else {
-               if(mw - arg->i > sw - 100 || mw - arg->i < 100)
+               if(master - arg->i > sw - 100 || master - arg->i < 100)
                        return;
-               mw -= arg->i;
+               master -= arg->i;
        }
        arrange(NULL);
 }
 
 void
-restack()
-{
+restack(void) {
        Client *c;
        XEvent ev;
-       
+
        if(!sel) {
                drawstatus();
                return;
@@ -242,8 +268,7 @@ restack()
 }
 
 void
-togglemode(Arg *arg)
-{
+togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
        if(sel)
                arrange(NULL);
@@ -252,8 +277,7 @@ togglemode(Arg *arg)
 }
 
 void
-toggleview(Arg *arg)
-{
+toggleview(Arg *arg) {
        unsigned int i;
 
        seltag[arg->i] = !seltag[arg->i];
@@ -265,8 +289,7 @@ toggleview(Arg *arg)
 }
 
 void
-view(Arg *arg)
-{
+view(Arg *arg) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
@@ -277,8 +300,7 @@ view(Arg *arg)
 }
 
 void
-viewall(Arg *arg)
-{
+viewall(Arg *arg) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
@@ -288,15 +310,22 @@ viewall(Arg *arg)
 }
 
 void
-zoom(Arg *arg)
-{
+zoom(Arg *arg) {
        unsigned int n;
        Client *c;
 
+       if(!sel)
+               return;
+
+       if(sel->isfloat || (arrange == dofloat)) {
+               togglemax(sel);
+               return;
+       }
+
        for(n = 0, c = clients; c; c = c->next)
                if(isvisible(c) && !c->isfloat)
                        n++;
-       if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
+       if(n < 2 || (arrange == dofloat))
                return;
 
        if((c = sel) == nexttiled(clients))