applied Gottox patch to simplify the resizing of col, instead of resizing the current...

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 70b0253..4f42abe 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"
@@ -43,9 +42,12 @@ reorder(void) {
 }
 
 static void
-togglemax(Client *c)
-{
+togglemax(Client *c) {
        XEvent ev;
+               
+       if(c->isfixed)
+               return;
+
        if((c->ismax = !c->ismax)) {
                c->rx = c->x; c->x = sx;
                c->ry = c->y; c->y = bh;
@@ -64,8 +66,7 @@ togglemax(Client *c)
 
 /* extern */
 
-void (*arrange)(Arg *) = DEFMODE;
-StackPos stackpos = STACKPOS;
+void (*arrange)(void) = DEFMODE;
 
 void
 detach(Client *c) {
@@ -79,7 +80,7 @@ detach(Client *c) {
 }
 
 void
-dofloat(Arg *arg) {
+dofloat(void) {
        Client *c;
 
        for(c = clients; c; c = c->next) {
@@ -96,37 +97,21 @@ dofloat(Arg *arg) {
        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
-dotile(Arg *arg) {
-       unsigned int i, n, md, stackw, stackh, tw, th;
+dotile(void) {
+       unsigned int i, n, mpx, stackw, stackh, th;
        Client *c;
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
-
-       if(stackpos == StackBottom) {
-               md = ((sh - bh) * master) / 1000;
-               stackw = sw;
-               stackh = sh - bh - md;
-       }
-       else {
-               md = (sw * master) / 1000;
-               stackw = sw - md;
-               stackh = sh - bh;
-       }
-
-       tw = stackw;
+       mpx = (sw * master) / 1000;
+       stackw = sw - mpx;
+       stackh = sh - bh;
+       th = stackh;
        if(n > 1)
-               th = stackh / (n - 1);
-       else
-               th = stackh;
+               th /= (n - 1);
 
-       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);
@@ -140,53 +125,28 @@ dotile(Arg *arg) {
                                c->h = sh - 2 * BORDERPX - bh;
                        }
                        else if(i == 0) { /* master window */
-                               if(stackpos == StackLeft)
-                                       c->x += stackw;
-                               switch(stackpos) {
-                               case StackLeft:
-                               case StackRight:
-                                       c->w = md - 2 * BORDERPX;
-                                       c->h = sh - bh - 2 * BORDERPX;
-                                       break;
-                               case StackBottom:
-                                       c->w = sw - 2 * BORDERPX;
-                                       c->h = md - 2 * BORDERPX;
-                                       break;
-                               }
+                               c->w = mpx - 2 * BORDERPX;
+                               c->h = sh - bh - 2 * BORDERPX;
                        }
                        else {  /* tile window */
-                               if(stackpos == StackRight)
-                                       c->x += md;
+                               c->x += mpx;
+                               c->w = stackw - 2 * BORDERPX;
                                if(th > bh) {
-                                       switch(stackpos) {
-                                       case StackLeft:
-                                       case StackRight:
-                                               c->y = sy + (i - 1) * th + bh;
-                                               if(i + 1 == n)
-                                                       c->h = sh - c->y - 2 * BORDERPX;
-                                               break;
-                                       case StackBottom:
-                                               c->y = sy + md + (i - 1) * th + bh;
-                                               if(i + 1 == n)
-                                                       c->h = sh - c->y - 2 * BORDERPX;
-                                               break;
-                                       }
-                                       c->w = tw - 2 * BORDERPX;
-                                       c->h = th - 2 * BORDERPX;
+                                       c->y = sy + (i - 1) * th + bh;
+                                       if(i + 1 == n)
+                                               c->h = sh - c->y - 2 * BORDERPX;
+                                       else
+                                               c->h = th - 2 * BORDERPX;
                                }
-                               else { /* fallback if th < bh */
-                                       if(stackpos == StackBottom)
-                                               c->y += md;
-                                       c->w = stackw - 2 * BORDERPX;
+                               else /* fallback if th < bh */
                                        c->h = stackh - 2 * BORDERPX;
-                               }
                        }
                        resize(c, False, TopLeft);
                        i++;
                }
                else
                        ban(c);
-       }
+
        if(!sel || !isvisible(sel)) {
                for(c = stack; c && !isvisible(c); c = c->snext);
                focus(c);
@@ -200,7 +160,6 @@ focusnext(Arg *arg) {
    
        if(!sel)
                return;
-
        if(!(c = getnext(sel->next)))
                c = getnext(clients);
        if(c) {
@@ -215,7 +174,6 @@ focusprev(Arg *arg) {
 
        if(!sel)
                return;
-
        if(!(c = getprev(sel->prev))) {
                for(c = clients; c && c->next; c = c->next);
                c = getprev(c);
@@ -238,26 +196,10 @@ isvisible(Client *c) {
 
 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))
+       if(master + arg->i > 950 || master + arg->i < 50)
                return;
-
-       if(sel == getnext(clients)) {
-               if(master + arg->i > 950 || master + arg->i < 50)
-                       return;
-               master += arg->i;
-       }
-       else {
-               if(master - arg->i > 950 || master - arg->i < 50)
-                       return;
-               master -= arg->i;
-       }
-       arrange(NULL);
+       master += arg->i;
+       arrange();
 }
 
 void
@@ -294,7 +236,7 @@ void
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
        if(sel)
-               arrange(NULL);
+               arrange();
        else
                drawstatus();
 }
@@ -308,18 +250,7 @@ toggleview(Arg *arg) {
        if(i == ntags)
                seltag[arg->i] = True; /* cannot toggle last view */
        reorder();
-       arrange(NULL);
-}
-
-void
-togglestackpos(Arg *arg) {
-       if(arrange == dofloat)
-               return;
-       if(stackpos == StackBottom)
-               stackpos = STACKPOS;
-       else
-               stackpos = StackBottom;
-       arrange(NULL);
+       arrange();
 }
 
 void
@@ -330,7 +261,7 @@ view(Arg *arg) {
                seltag[i] = False;
        seltag[arg->i] = True;
        reorder();
-       arrange(NULL);
+       arrange();
 }
 
 void
@@ -340,11 +271,9 @@ viewall(Arg *arg) {
        for(i = 0; i < ntags; i++)
                seltag[i] = True;
        reorder();
-       arrange(NULL);
+       arrange();
 }
 
-
-
 void
 zoom(Arg *arg) {
        unsigned int n;
@@ -352,18 +281,15 @@ zoom(Arg *arg) {
 
        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(n < 2 || (arrange == dofloat))
                return;
-
        if((c = sel) == nexttiled(clients))
                if(!(c = nexttiled(c->next)))
                        return;
@@ -373,5 +299,5 @@ zoom(Arg *arg) {
        c->next = clients;
        clients = c;
        focus(c);
-       arrange(NULL);
+       arrange();
 }