removed VRATIO, NMASTER, inc*(), renamed HRATIO into MASTER, see mailinglist for...

[dwm.git] / layout.c

diff --git a/layout.c b/layout.c
index 5a7d4b4..0002397 100644 (file)
--- a/layout.c
+++ b/layout.c
@@ -1,7 +1,7 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and license details. */

 #include "dwm.h"
 #include "dwm.h"

+#include <stdio.h>
+#include <stdlib.h>

 
 unsigned int blw = 0;
 Layout *lt = NULL;
 
 unsigned int blw = 0;
 Layout *lt = NULL;


@@ -9,90 +9,46 @@ Layout *lt = NULL;
 /* static */
 
 static unsigned int nlayouts = 0;
 /* static */
 
 static unsigned int nlayouts = 0;

-static unsigned int masterw = MASTERWIDTH;
-static unsigned int nmaster = NMASTER;

 
 

-static void
-tile(void) {
-       unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th;
+LAYOUTS
+
+/* extern */
+
+void
+floating(const char *arg) {

        Client *c;
 
        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 * masterw) / 1000 : waw;
-       th = (n > nmaster) ? wah / (n - nmaster) : 0;
-       tw = waw - mw;
+       if(lt->arrange != floating)
+               return;

 
 

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

                if(isvisible(c)) {
                if(isvisible(c)) {

-                       if(c->isbanned)
-                               XMoveWindow(dpy, c->win, c->x, c->y);
-                       c->isbanned = False;
-                       if(c->isversatile)
-                               continue;
-                       c->ismax = False;
-                       nx = wax;
-                       ny = way;
-                       if(i < nmaster) {
-                               ny += i * mh;
-                               nw = mw - 2 * BORDERPX;
-                               nh = mh - 2 * BORDERPX;
-                       }
-                       else {  /* tile window */
-                               nx += mw;
-                               nw = tw - 2 * BORDERPX;
-                               if(th > 2 * BORDERPX) {
-                                       ny += (i - nmaster) * th;
-                                       nh = th - 2 * BORDERPX;
-                               }
-                               else /* fallback if th <= 2 * BORDERPX */
-                                       nh = wah - 2 * BORDERPX;
-                       }
-                       resize(c, nx, ny, nw, nh, False);
-                       i++;
-               }
-               else {
-                       c->isbanned = True;
-                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+                       unban(c);
+                       resize(c, c->x, c->y, c->w, c->h, True);

                }
                }

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

        restack();
 }
 
        restack();
 }
 

-LAYOUTS
-
-/* extern */
-

 void
 void

-focusnext(Arg arg) {
+focusclient(const char *arg) {

        Client *c;
    
        Client *c;
    

-       if(!sel)
+       if(!sel || !arg)

                return;
                return;

-       for(c = sel->next; c && !isvisible(c); c = c->next);
-       if(!c)
-               for(c = clients; c && !isvisible(c); c = c->next);
-       if(c) {
-               focus(c);
-               restack();
+       if(atoi(arg) < 0) {
+               for(c = sel->prev; c && !isvisible(c); c = c->prev);
+               if(!c) {
+                       for(c = clients; c && c->next; c = c->next);
+                       for(; c && !isvisible(c); c = c->prev);
+               }

        }
        }

-}
-
-void
-focusprev(Arg arg) {
-       Client *c;
-
-       if(!sel)
-               return;
-       for(c = sel->prev; c && !isvisible(c); c = c->prev);
-       if(!c) {
-               for(c = clients; c && c->next; c = c->next);
-               for(; c && !isvisible(c); c = c->prev);
+       else {
+               for(c = sel->next; c && !isvisible(c); c = c->next);
+               if(!c)
+                       for(c = clients; c && !isvisible(c); c = c->next);

        }
        if(c) {
                focus(c);
        }
        if(c) {
                focus(c);


@@ -100,33 +56,6 @@ focusprev(Arg arg) {
        }
 }
 
        }
 }
 

-void
-incmasterw(Arg arg) {
-       if(lt->arrange != tile)
-               return;
-       if(arg.i == 0)
-               masterw = MASTERWIDTH;
-       else {
-               if(waw * (masterw + arg.i) / 1000 >= waw - 2 * BORDERPX
-               || waw * (masterw + arg.i) / 1000 <= 2 * BORDERPX)
-                       return;
-               masterw += arg.i;
-       }
-       lt->arrange();
-}
-
-void
-incnmaster(Arg arg) {
-       if((lt->arrange != tile) || (nmaster + arg.i < 1)
-       || (wah / (nmaster + arg.i) <= 2 * BORDERPX))
-               return;
-       nmaster += arg.i;
-       if(sel)
-               lt->arrange();
-       else
-               drawstatus();
-}
-

 void
 initlayouts(void) {
        unsigned int i, w;
 void
 initlayouts(void) {
        unsigned int i, w;


@@ -142,7 +71,7 @@ initlayouts(void) {
 
 Client *
 nexttiled(Client *c) {
 
 Client *
 nexttiled(Client *c) {

-       for(; c && (c->isversatile || !isvisible(c)); c = c->next);
+       for(; c && (c->isfloating || !isvisible(c)); c = c->next);

        return c;
 }
 
        return c;
 }
 


@@ -150,19 +79,25 @@ void
 restack(void) {
        Client *c;
        XEvent ev;
 restack(void) {
        Client *c;
        XEvent ev;

+       XWindowChanges wc;

 
        drawstatus();
        if(!sel)
                return;
 
        drawstatus();
        if(!sel)
                return;

-       if(sel->isversatile || lt->arrange == versatile)
+       if(sel->isfloating || lt->arrange == floating)

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

-       if(lt->arrange != versatile) {
-               if(!sel->isversatile)
-                       XLowerWindow(dpy, sel->win);
+       if(lt->arrange != floating) {
+               wc.stack_mode = Below;
+               wc.sibling = barwin;
+               if(!sel->isfloating) {
+                       XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
+                       wc.sibling = sel->win;
+               }

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

-                       XLowerWindow(dpy, c->win);
+                       XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
+                       wc.sibling = c->win;

                }
        }
        XSync(dpy, False);
                }
        }
        XSync(dpy, False);


@@ -170,39 +105,107 @@ restack(void) {
 }
 
 void
 }
 
 void

-setlayout(Arg arg) {
-       unsigned int i;
+setlayout(const char *arg) {
+       int i;

 
 

-       if(arg.i == -1) {
-               for(i = 0; i < nlayouts && lt != &layout[i]; i++);
-               if(i == nlayouts - 1)
-                       lt = &layout[0];
-               else
-                       lt = &layout[++i];
+       if(!arg) {
+               lt++;
+               if(lt == layout + nlayouts)
+                       lt = layout;

        }
        else {
        }
        else {

-               if(arg.i < 0 || arg.i >= nlayouts)
+               i = atoi(arg);
+               if(i < 0 || i >= nlayouts)

                        return;
                        return;

-               lt = &layout[arg.i];
+               lt = &layout[i];

        }
        if(sel)
        }
        if(sel)

-               lt->arrange();
+               lt->arrange(NULL);

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

-togglemax(Arg arg) {
+tile(const char *arg) {
+       static double master = MASTER;
+       double delta;
+       unsigned int i, n, nx, ny, nw, nh, mw, th;
+       Client *c;
+
+       if(lt->arrange != tile)
+               return;
+
+       /* arg handling, manipulate master */
+       if(arg && (1 == sscanf(arg, "%lf", &delta))) {
+               if(delta + master > 0.1 && delta + master < 0.9)
+                       master += delta;
+       }
+
+       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+               n++;
+
+       /* window geoms */
+       mw = (n == 1) ? waw : master * waw;
+       th = (n > 1) ? wah / (n - 1) : 0;
+       if(n > 1 && th < bh)
+               th = wah;
+
+       nx = wax;
+       ny = way;
+       for(i = 0, c = clients; c; c = c->next)
+               if(isvisible(c)) {
+                       unban(c);
+                       if(c->isfloating)
+                               continue;
+                       c->ismax = False;
+                       if(i == 0) { /* master */
+                               nw = mw - 2 * c->border;
+                               nh = wah - 2 * c->border;
+                       }
+                       else {  /* tile window */
+                               if(i == 1) {
+                                       ny = way;
+                                       nx += mw;
+                               }
+                               nw = waw - mw - 2 * c->border;
+                               if(i + 1 == n) /* remainder */
+                                       nh = (way + wah) - ny - 2 * c->border;
+                               else
+                                       nh = th - 2 * c->border;
+                       }
+                       resize(c, nx, ny, nw, nh, False);
+                       if(n > 1 && th != wah)
+                               ny += nh;
+                       i++;
+               }
+               else
+                       ban(c);
+       focus(NULL);
+       restack();
+}
+
+void
+togglebar(const char *arg) {
+       if(bpos == BarOff)
+               bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
+       else
+               bpos = BarOff;
+       updatebarpos();
+       lt->arrange(NULL);
+}
+
+void
+togglemax(const char *arg) {

        XEvent ev;
 
        XEvent ev;
 

-       if(!sel || (lt->arrange != versatile && !sel->isversatile) || sel->isfixed)
+       if(!sel || (lt->arrange != floating && !sel->isfloating) || sel->isfixed)

                return;
        if((sel->ismax = !sel->ismax)) {
                sel->rx = sel->x;
                sel->ry = sel->y;
                sel->rw = sel->w;
                sel->rh = sel->h;
                return;
        if((sel->ismax = !sel->ismax)) {
                sel->rx = sel->x;
                sel->ry = sel->y;
                sel->rw = sel->w;
                sel->rh = sel->h;

-               resize(sel, wax, way, waw - 2 * BORDERPX, wah - 2 * BORDERPX, True);
+               resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);

        }
        else
                resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
        }
        else
                resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);


@@ -211,42 +214,16 @@ togglemax(Arg arg) {
 }
 
 void
 }
 
 void

-versatile(void) {
-       Client *c;
-
-       for(c = clients; c; c = c->next) {
-               if(isvisible(c)) {
-                       if(c->isbanned)
-                               XMoveWindow(dpy, c->win, c->x, c->y);
-                       c->isbanned = False;
-                       resize(c, c->x, c->y, c->w, c->h, True);
-               }
-               else {
-                       c->isbanned = True;
-                       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);
-       }
-       restack();
-}
-
-void
-zoom(Arg arg) {
-       unsigned int n;
+zoom(const char *arg) {

        Client *c;
 
        Client *c;
 

-       if(!sel || lt->arrange != tile || sel->isversatile)
+       if(!sel || lt->arrange == floating || sel->isfloating)

                return;
                return;

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

        if((c = sel) == nexttiled(clients))
                if(!(c = nexttiled(c->next)))
                        return;
        detach(c);
        attach(c);
        focus(c);
        if((c = sel) == nexttiled(clients))
                if(!(c = nexttiled(c->next)))
                        return;
        detach(c);
        attach(c);
        focus(c);

-       lt->arrange();
+       lt->arrange(NULL);

 }
 }