this variant is known to work, but focus() is ugly - we need in general a better...

[dwm.git] / view.c

diff --git a/view.c b/view.c
index b2ee32f..81dd4b3 100644 (file)
--- a/view.c
+++ b/view.c
@@ -1,23 +1,11 @@
-/*
- * (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"

+#include <stdio.h>

 
 /* static */
 
 
 /* static */
 

-static Client *
-minclient(void) {
-       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;
-}
-

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


@@ -25,32 +13,17 @@ nexttiled(Client *c) {
 }
 
 static void
 }
 
 static void

-reorder(void) {
-       Client *c, *newclients, *tail;
-
-       newclients = tail = NULL;
-       while((c = minclient())) {
-               detach(c);
-               if(tail) {
-                       c->prev = tail;
-                       tail->next = c;
-                       tail = c;
-               }
-               else
-                       tail = newclients = c;
-       }
-       clients = newclients;
-}
-
-static void
-togglemax(Client *c)
-{
+togglemax(Client *c) {

        XEvent ev;
        XEvent ev;

+               
+       if(c->isfixed)
+               return;
+

        if((c->ismax = !c->ismax)) {
        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;
+               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 {
                c->x = c->rx;
        }
        else {
                c->x = c->rx;


@@ -58,15 +31,13 @@ togglemax(Client *c)
                c->w = c->rw;
                c->h = c->rh;
        }
                c->w = c->rw;
                c->h = c->rh;
        }

-       resize(c, True, TopLeft);
+       resize(c, True);

        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 /* extern */
 
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 /* extern */
 

-void (*arrange)(Arg *) = DEFMODE;
-Bool isvertical = VERTICALSTACK;
-StackPos stackpos = STACKPOS;
+void (*arrange)(void) = DEFMODE;

 
 void
 detach(Client *c) {
 
 void
 detach(Client *c) {


@@ -80,15 +51,15 @@ detach(Client *c) {
 }
 
 void
 }
 
 void

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

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

-                       resize(c, True, TopLeft);
+                       resize(c, True);

                }
                else
                }
                else

-                       ban(c);
+                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);

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


@@ -97,110 +68,48 @@ dofloat(Arg *arg) {
        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 i, n, stackw, stackh, tw, th;
+dotile(void) {
+       unsigned int i, n, mw, mh, tw, th;

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

+       /* window geoms */
+       mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
+       mw = (n > nmaster) ? (waw * master) / 1000 : waw;
+       th = (n > nmaster) ? wah / (n - nmaster) : 0;
+       tw = waw - mw;

 
 

-       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)

                if(isvisible(c)) {
                        if(c->isfloat) {
                if(isvisible(c)) {
                        if(c->isfloat) {

-                               resize(c, True, TopLeft);
+                               resize(c, True);

                                continue;
                        }
                        c->ismax = False;
                                continue;
                        }
                        c->ismax = False;

-                       if(n == 1) { /* only 1 window */
-                               c->x = sx;
-                               c->y = sy + bh;
-                               c->w = sw - 2 * BORDERPX;
-                               c->h = sh - 2 * BORDERPX - bh;
+                       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) { /* master window */
-                               c->x = sx;
-                               if(stackpos == StackLeft)
-                                       c->x += master;
-                               c->y = sy + 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((isvertical && th > bh) || (!isvertical && tw > MINW)) {
-                               /* tile window */
-                               c->x = sx;
-                               if(isvertical)
-                                       c->y = sy + (i - 1) * th + bh;
-                               else
-                                       c->y = sy + bh;
-                               if(stackpos == StackRight)
-                                       c->x += master;
-                               else if(stackpos == StackBottom)
-                                       c->y += master;
+                       else {  /* tile window */
+                               c->x += mw;

                                c->w = tw - 2 * BORDERPX;
                                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;
-                                       }
+                               if(th > bh) {
+                                       c->y += (i - nmaster) * th;
+                                       c->h = th - 2 * BORDERPX;

                                }
                                }

+                               else /* fallback if th < bh */
+                                       c->h = wah - 2 * BORDERPX;

                        }
                        }

-                       else { /* fallback if th < bh resp. tw < MINW */
-                               c->x = sx;
-                               c->y = sy + 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);
+                       resize(c, False);

                        i++;
                }
                else
                        i++;
                }
                else

-                       ban(c);
-       }
+                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);

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


@@ -214,7 +123,6 @@ focusnext(Arg *arg) {
    
        if(!sel)
                return;
    
        if(!sel)
                return;

-

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


@@ -229,7 +137,6 @@ focusprev(Arg *arg) {
 
        if(!sel)
                return;
 
        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);


@@ -240,6 +147,17 @@ focusprev(Arg *arg) {
        }
 }
 
        }
 }
 

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

 Bool
 isvisible(Client *c) {
        unsigned int i;
 Bool
 isvisible(Client *c) {
        unsigned int i;


@@ -251,27 +169,15 @@ isvisible(Client *c) {
 }
 
 void
 }
 
 void

-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 == dofloat))
-               return;
-
-       if(sel == getnext(clients)) {
-               if(master + arg->i > sw - MINW || master + arg->i < MINW)
-                       return;
-               master += arg->i;
-       }
+resizemaster(Arg *arg) {
+       if(arg->i == 0)
+               master = MASTER;

        else {
        else {

-               if(master - arg->i > sw - MINW || master - arg->i < MINW)
+               if(master + arg->i > 950 || master + arg->i < 50)

                        return;
                        return;

-               master -= arg->i;
+               master += arg->i;

        }
        }

-       arrange(NULL);
+       arrange();

 }
 
 void
 }
 
 void


@@ -279,29 +185,37 @@ restack(void) {
        Client *c;
        XEvent ev;
 
        Client *c;
        XEvent ev;
 

-       if(!sel) {
-               drawstatus();
+       drawstatus();
+       if(!sel)

                return;
                return;

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

                XRaiseWindow(dpy, sel->win);
                XRaiseWindow(dpy, sel->win);

-               XRaiseWindow(dpy, sel->twin);
-       }
-       if(arrange != dofloat)
+       if(arrange != dofloat) {
+               if(!sel->isfloat)
+                       XLowerWindow(dpy, sel->win);

                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {

-                       XLowerWindow(dpy, c->twin);
+                       if(c == sel)
+                               continue;

                        XLowerWindow(dpy, c->win);
                }
                        XLowerWindow(dpy, c->win);
                }

-       drawall();
+       }

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

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

 void
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
        if(sel)
 void
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
        if(sel)

-               arrange(NULL);
+               arrange();

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


@@ -314,8 +228,7 @@ toggleview(Arg *arg) {
        for(i = 0; i < ntags && !seltag[i]; i++);
        if(i == ntags)
                seltag[arg->i] = True; /* cannot toggle last view */
        for(i = 0; i < ntags && !seltag[i]; i++);
        if(i == ntags)
                seltag[arg->i] = True; /* cannot toggle last view */

-       reorder();
-       arrange(NULL);
+       arrange();

 }
 
 void
 }
 
 void


@@ -323,20 +236,10 @@ 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;
-       reorder();
-       arrange(NULL);
-}
-
-void
-viewall(Arg *arg) {
-       unsigned int i;
-
-       for(i = 0; i < ntags; i++)
-               seltag[i] = True;
-       reorder();
-       arrange(NULL);
+               seltag[i] = (arg->i == -1) ? True : False;
+       if(arg->i >= 0 && arg->i < ntags)
+               seltag[arg->i] = True;
+       arrange();

 }
 
 void
 }
 
 void


@@ -346,17 +249,12 @@ zoom(Arg *arg) {
 
        if(!sel)
                return;
 
        if(!sel)
                return;

-

        if(sel->isfloat || (arrange == dofloat)) {
                togglemax(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(n < 2 || (arrange == dofloat))
-               return;
+       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+               n++;

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


@@ -367,5 +265,5 @@ zoom(Arg *arg) {
        c->next = clients;
        clients = c;
        focus(c);
        c->next = clients;
        clients = c;
        focus(c);

-       arrange(NULL);
+       arrange();

 }
 }