next release will be 2.2

[dwm.git] / view.c

diff --git a/view.c b/view.c
index ac1728b..0c9ea6f 100644 (file)
--- a/view.c
+++ b/view.c
@@ -44,6 +44,9 @@ reorder(void) {
 static void
 togglemax(Client *c) {
        XEvent ev;
 static void
 togglemax(Client *c) {
        XEvent ev;

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

 
        if((c->ismax = !c->ismax)) {
                c->rx = c->x; c->x = sx;
 
        if((c->ismax = !c->ismax)) {
                c->rx = c->x; c->x = sx;


@@ -108,7 +111,7 @@ dotile(void) {
        if(n > 1)
                th /= (n - 1);
 
        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);
                if(isvisible(c)) {
                        if(c->isfloat) {
                                resize(c, True, TopLeft);


@@ -139,6 +142,7 @@ dotile(void) {
                                        c->h = stackh - 2 * BORDERPX;
                        }
                        resize(c, False, TopLeft);
                                        c->h = stackh - 2 * BORDERPX;
                        }
                        resize(c, False, TopLeft);

+                       i++;

                }
                else
                        ban(c);
                }
                else
                        ban(c);


@@ -191,25 +195,14 @@ 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)) {
+resizemaster(Arg *arg) {
+       if(arg->i == 0)
+               master = MASTER;
+       else {

                if(master + arg->i > 950 || master + arg->i < 50)
                        return;
                master += arg->i;
        }
                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();
 }
 
        arrange();
 }