prelim of dotile()

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 37b4fd7..b2ee32f 100644 (file)
--- a/view.c
+++ b/view.c
@@ -3,25 +3,29 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
  * See LICENSE file for license details.
  */
 #include "dwm.h"

-#include <stdio.h>

 
 /* static */
 
 static Client *
 
 /* static */
 
 static Client *

-minclient()
-{
+minclient(void) {

        Client *c, *min;
 
        Client *c, *min;
 

+       if((clients && clients->isfloat) || arrange == dofloat)
+               return clients; /* don't touch floating order */

        for(min = c = clients; c; c = c->next)
                if(c->weight < min->weight)
                        min = c;
        return min;
 }
 
        for(min = c = clients; c; c = c->next)
                if(c->weight < min->weight)
                        min = c;
        return min;
 }
 

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

 
 static void
 
 static void

-reorder()
-{
+reorder(void) {

        Client *c, *newclients, *tail;
 
        newclients = tail = NULL;
        Client *c, *newclients, *tail;
 
        newclients = tail = NULL;


@@ -38,13 +42,34 @@ reorder()
        clients = newclients;
 }
 
        clients = newclients;
 }
 

+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 - 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;
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;

+Bool isvertical = VERTICALSTACK;
+StackPos stackpos = STACKPOS;

 
 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)


@@ -55,76 +80,120 @@ detach(Client *c)
 }
 
 void
 }
 
 void

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

        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();
 }
 
        restack();
 }
 

+/* This algorithm is based on a (M)aster area and a (S)tacking area.
+ * It supports following arrangements:
+ *     SSMMM   MMMMM   MMMSS
+ *     SSMMM   SSSSS   MMMSS
+ */

 void
 void

-dotile(Arg *arg)
-{
-       int h, i, n, w;
+dotile(Arg *arg) {
+       int i, n, stackw, stackh, tw, th;

        Client *c;
 
        Client *c;
 

-       w = sw - mw;
-       for(n = 0, c = clients; c; c = c->next)
-               if(isvisible(c) && !c->isfloat)
-                       n++;
+       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+               n++;

 
 

-       if(n > 1)
-               h = (sh - bh) / (n - 1);
-       else
-               h = sh - bh;
+       if(stackpos == StackBottom) {
+               stackw = sw;
+               stackh = sh - bh - master;
+       }
+       else {
+               stackw = sw - master;
+               stackh = sh - bh;
+       }
+
+       if(isvertical) {
+               tw = stackw;
+               if(n > 1)
+                       th = stackh / (n - 1);
+               else
+                       th = stackh;
+       }
+       else {
+               th = stackh;
+               if(n > 1)
+                       tw = stackw / (n - 1);
+               else
+                       tw = stackw;
+       }

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

-               c->ismax = False;

                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->ismax = False;
+                       if(n == 1) { /* only 1 window */

                                c->x = sx;
                                c->y = sy + bh;
                                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) {
+                       else if(i == 0) { /* master window */

                                c->x = sx;
                                c->x = sx;

+                               if(stackpos == StackLeft)
+                                       c->x += master;

                                c->y = sy + bh;
                                c->y = sy + bh;

-                               c->w = mw - 2;
-                               c->h = sh - 2 - bh;
+                               if(isvertical) {
+                                       c->w = master - 2 * BORDERPX;
+                                       c->h = sh - 2 * BORDERPX - bh;
+                               }
+                               else {
+                                       c->w = sw;
+                                       c->h = master - 2 * BORDERPX;
+                               }

                        }
                        }

-                       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 if((isvertical && th > bh) || (!isvertical && tw > MINW)) {
+                               /* tile window */
+                               c->x = sx;
+                               if(isvertical)
+                                       c->y = sy + (i - 1) * th + bh;

                                else
                                else

-                                       c->h = h - 2;
+                                       c->y = sy + bh;
+                               if(stackpos == StackRight)
+                                       c->x += master;
+                               else if(stackpos == StackBottom)
+                                       c->y += master;
+                               c->w = tw - 2 * BORDERPX;
+                               c->h = th - 2 * BORDERPX;
+                               if(i + 1 == n) { /* fixes for last tile to take up rest space */
+                                       if(isvertical)
+                                               c->h = sh - c->y - 2 * BORDERPX;
+                                       else {
+                                               if(stackpos == StackLeft)
+                                                       c->w = master - c->x - 2 * BORDERPX;
+                                               else
+                                                       c->w = sw - c->x - 2 * BORDERPX;
+                                       }
+                               }

                        }
                        }

-                       else { /* fallback if h < bh */
-                               c->x = sx + mw;
+                       else { /* fallback if th < bh resp. tw < MINW */
+                               c->x = sx;

                                c->y = sy + bh;
                                c->y = sy + bh;

-                               c->w = w - 2;
-                               c->h = sh - 2 - bh;
+                               if(stackpos == StackRight)
+                                       c->x += master;
+                               else if(stackpos == StackBottom)
+                                       c->y += master;
+                               c->w = stackw - 2 * BORDERPX;
+                               c->h = stackh - 2 * BORDERPX;

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


@@ -132,18 +201,15 @@ dotile(Arg *arg)
                else
                        ban(c);
        }
                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

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

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


@@ -158,8 +224,7 @@ focusnext(Arg *arg)
 }
 
 void
 }
 
 void

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

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


@@ -176,8 +241,7 @@ focusprev(Arg *arg)
 }
 
 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++)


@@ -187,60 +251,54 @@ isvisible(Client *c)
 }
 
 void
 }
 
 void

-restack()
-{
-       static unsigned int nwins = 0;
-       static Window *wins = NULL;
-       unsigned int f, fi, m, mi, n;
+resizecol(Arg *arg) {
+       unsigned int n;

        Client *c;
        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))) {
-               drawstatus();
+       for(n = 0, c = clients; c; c = c->next)
+               if(isvisible(c) && !c->isfloat)
+                       n++;
+       if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))

                return;
                return;

+
+       if(sel == getnext(clients)) {
+               if(master + arg->i > sw - MINW || master + arg->i < MINW)
+                       return;
+               master += arg->i;

        }
        }

-       if(nwins < n) {
-               nwins = n;
-               wins = erealloc(wins, nwins * sizeof(Window));
+       else {
+               if(master - arg->i > sw - MINW || master - arg->i < MINW)
+                       return;
+               master -= arg->i;

        }
        }

+       arrange(NULL);
+}

 
 

-       fi = 0;
-       mi = 2 * f;
-       if(sel->isfloat || arrange == dofloat) {
-               wins[fi++] = sel->twin;
-               wins[fi++] = sel->win;
+void
+restack(void) {
+       Client *c;
+       XEvent ev;
+
+       if(!sel) {
+               drawstatus();
+               return;

        }
        }

-       else {
-               wins[mi++] = sel->twin;
-               wins[mi++] = sel->win;
+       if(sel->isfloat || arrange == dofloat) {
+               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)
+               for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+                       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)
-{
+togglemode(Arg *arg) {

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


@@ -249,8 +307,7 @@ togglemode(Arg *arg)
 }
 
 void
 }
 
 void

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

        unsigned int i;
 
        seltag[arg->i] = !seltag[arg->i];
        unsigned int i;
 
        seltag[arg->i] = !seltag[arg->i];


@@ -262,8 +319,7 @@ toggleview(Arg *arg)
 }
 
 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++)


@@ -274,8 +330,7 @@ view(Arg *arg)
 }
 
 void
 }
 
 void

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

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


@@ -285,19 +340,31 @@ viewall(Arg *arg)
 }
 
 void
 }
 
 void

-zoom(Arg *arg)
-{
-       Client *c = sel;
+zoom(Arg *arg) {
+       unsigned int n;
+       Client *c;
+
+       if(!sel)
+               return;
+
+       if(sel->isfloat || (arrange == dofloat)) {
+               togglemax(sel);
+               return;
+       }

 
 

-       if(!c || (arrange != dotile) || c->isfloat || c->ismax)
+       for(n = 0, c = clients; c; c = c->next)
+               if(isvisible(c) && !c->isfloat)
+                       n++;
+       if(n < 2 || (arrange == dofloat))

                return;
 
                return;
 

-       if(c == getnext(clients))
-               if(!(c = getnext(c->next)))
+       if((c = sel) == nexttiled(clients))
+               if(!(c = nexttiled(c->next)))

                        return;
        detach(c);
                        return;
        detach(c);

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

        c->next = clients;
        c->next = clients;

-       clients->prev = c;

        clients = c;
        focus(c);
        arrange(NULL);
        clients = c;
        focus(c);
        arrange(NULL);