applying aluminium style for arg's config.h

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 90080fb..bd43da9 100644 (file)
--- a/view.c
+++ b/view.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI 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"


@@ -43,14 +42,17 @@ reorder(void) {
 }
 
 static void
 }
 
 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;


@@ -64,9 +66,7 @@ togglemax(Client *c)
 
 /* extern */
 
 
 /* extern */
 

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

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


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

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

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


@@ -97,80 +97,50 @@ dofloat(Arg *arg) {
        restack();
 }
 
        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
 void

-dotile(Arg *arg) {
-       int h, i, n, w;
+dotile(void) {
+       unsigned int i, n, mpx, stackw, 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++;

+       mpx = (waw * master) / 1000;
+       stackw = waw - mpx;

 
 

-       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 */
-
-       }
-
-       for(i = 0, c = clients; c; c = c->next) {
+       for(i = 0, c = clients; c; c = c->next)

                if(isvisible(c)) {
                        if(c->isfloat) {
                                resize(c, True, TopLeft);
                                continue;
                        }
                        c->ismax = False;
                if(isvisible(c)) {
                        if(c->isfloat) {
                                resize(c, True, TopLeft);
                                continue;
                        }
                        c->ismax = False;

-                       if(n == 1) {
-                               c->x = sx;
-                               c->y = sy + 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 = master - 2 * BORDERPX;
-                               c->h = sh - 2 * BORDERPX - bh;
+                       c->x = wax;
+                       c->y = way;
+                       if(n == 1) { /* only 1 window */
+                               c->w = waw - 2 * BORDERPX;
+                               c->h = wah - 2 * BORDERPX;

                        }
                        }

-                       else if(h > bh) {
-                               c->x = sx + master;
-                               c->y = sy + (i - 1) * h + bh;
-                               c->w = w - 2 * BORDERPX;
-                               if(i + 1 == n)
-                                       c->h = sh - c->y - 2 * BORDERPX;
-                               else
-                                       c->h = h - 2 * BORDERPX;
+                       else if(i == 0) { /* master window */
+                               c->w = waw - stackw - 2 * BORDERPX;
+                               c->h = wah - 2 * BORDERPX;
+                               th = wah / (n - 1);

                        }
                        }

-                       else { /* fallback if h < bh */
-                               c->x = sx + master;
-                               c->y = sy + bh;
-                               c->w = w - 2 * BORDERPX;
-                               c->h = sh - 2 * BORDERPX - bh;
+                       else {  /* tile window */
+                               c->x += mpx;
+                               c->w = stackw - 2 * BORDERPX;
+                               if(th > bh) {
+                                       c->y = way + (i - 1) * th;
+                                       c->h = th - 2 * BORDERPX;
+                               }
+                               else /* fallback if th < bh */
+                                       c->h = wah - 2 * BORDERPX;

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

-       }
+

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


@@ -184,7 +154,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) {


@@ -199,7 +168,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);


@@ -221,27 +189,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 - 100 || master + arg->i < 100)
-                       return;
-               master += arg->i;
-       }
+resizemaster(Arg *arg) {
+       if(arg->i == 0)
+               master = MASTER;

        else {
        else {

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

                        return;
                        return;

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

        }
        }

-       arrange(NULL);
+       arrange();

 }
 
 void
 }
 
 void


@@ -257,11 +213,18 @@ restack(void) {
                XRaiseWindow(dpy, sel->win);
                XRaiseWindow(dpy, sel->twin);
        }
                XRaiseWindow(dpy, sel->win);
                XRaiseWindow(dpy, sel->twin);
        }

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

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

+                       if(c == sel)
+                               continue;

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

+       }

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


@@ -271,7 +234,7 @@ void
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
        if(sel)
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
        if(sel)

-               arrange(NULL);
+               arrange();

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


@@ -285,7 +248,7 @@ toggleview(Arg *arg) {
        if(i == ntags)
                seltag[arg->i] = True; /* cannot toggle last view */
        reorder();
        if(i == ntags)
                seltag[arg->i] = True; /* cannot toggle last view */
        reorder();

-       arrange(NULL);
+       arrange();

 }
 
 void
 }
 
 void


@@ -296,7 +259,7 @@ view(Arg *arg) {
                seltag[i] = False;
        seltag[arg->i] = True;
        reorder();
                seltag[i] = False;
        seltag[arg->i] = True;
        reorder();

-       arrange(NULL);
+       arrange();

 }
 
 void
 }
 
 void


@@ -306,7 +269,7 @@ viewall(Arg *arg) {
        for(i = 0; i < ntags; i++)
                seltag[i] = True;
        reorder();
        for(i = 0; i < ntags; i++)
                seltag[i] = True;
        reorder();

-       arrange(NULL);
+       arrange();

 }
 
 void
 }
 
 void


@@ -316,18 +279,15 @@ 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 = clients; c; c = c->next)
                if(isvisible(c) && !c->isfloat)
                        n++;
        if(n < 2 || (arrange == dofloat))
                return;

-

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


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

-       arrange(NULL);
+       arrange();

 }
 }