next release will be 2.2

[dwm.git] / view.c

diff --git a/view.c b/view.c
index b2f2614..0c9ea6f 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,7 +66,7 @@ togglemax(Client *c)
 
 /* extern */
 
-void (*arrange)(Arg *) = DEFMODE;
+void (*arrange)(void) = DEFMODE;
 
 void
 detach(Client *c) {
@@ -78,7 +80,7 @@ detach(Client *c) {
 }
 
 void
-dofloat(Arg *arg) {
+dofloat(void) {
        Client *c;
 
        for(c = clients; c; c = c->next) {
@@ -96,22 +98,20 @@ dofloat(Arg *arg) {
 }
 
 void
-dotile(Arg *arg) {
+dotile(void) {
        unsigned int i, n, mpx, stackw, stackh, th;
        Client *c;
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
-
        mpx = (sw * master) / 1000;
        stackw = sw - mpx;
        stackh = sh - bh;
-
        th = stackh;
        if(n > 1)
                th /= (n - 1);
 
-       for(i = 0, c = clients; c; c = c->next, i++)
+       for(i = 0, c = clients; c; c = c->next)
                if(isvisible(c)) {
                        if(c->isfloat) {
                                resize(c, True, TopLeft);
@@ -142,9 +142,11 @@ dotile(Arg *arg) {
                                        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);
@@ -158,7 +160,6 @@ focusnext(Arg *arg) {
    
        if(!sel)
                return;
-
        if(!(c = getnext(sel->next)))
                c = getnext(clients);
        if(c) {
@@ -173,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);
@@ -195,27 +195,15 @@ 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))
-               return;
-
-       if(sel == getnext(clients)) {
+resizemaster(Arg *arg) {
+       if(arg->i == 0)
+               master = MASTER;
+       else {
                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);
+       arrange();
 }
 
 void
@@ -252,7 +240,7 @@ void
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
        if(sel)
-               arrange(NULL);
+               arrange();
        else
                drawstatus();
 }
@@ -266,7 +254,7 @@ toggleview(Arg *arg) {
        if(i == ntags)
                seltag[arg->i] = True; /* cannot toggle last view */
        reorder();
-       arrange(NULL);
+       arrange();
 }
 
 void
@@ -277,7 +265,7 @@ view(Arg *arg) {
                seltag[i] = False;
        seltag[arg->i] = True;
        reorder();
-       arrange(NULL);
+       arrange();
 }
 
 void
@@ -287,11 +275,9 @@ viewall(Arg *arg) {
        for(i = 0; i < ntags; i++)
                seltag[i] = True;
        reorder();
-       arrange(NULL);
+       arrange();
 }
 
-
-
 void
 zoom(Arg *arg) {
        unsigned int n;
@@ -299,18 +285,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;
@@ -320,5 +303,5 @@ zoom(Arg *arg) {
        c->next = clients;
        clients = c;
        focus(c);
-       arrange(NULL);
+       arrange();
 }