updated dwm(1)

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 8a139e8..9710989 100644 (file)
--- a/client.c
+++ b/client.c
@@ -411,7 +411,7 @@ togglemax(Arg *arg)
                sel->h = sh - 2 - bh;
 
                higher(sel);
                sel->h = sh - 2 - bh;
 
                higher(sel);

-               resize(sel, True, TopLeft);
+               resize(sel, arrange == dofloat, TopLeft);

 
                sel->x = ox;
                sel->y = oy;
 
                sel->x = ox;
                sel->y = oy;


@@ -438,13 +438,8 @@ unmanage(Client *c)
                c->next->prev = c->prev;
        if(c == clients)
                clients = c->next;
                c->next->prev = c->prev;
        if(c == clients)
                clients = c->next;

-       if(sel == c) {
-               sel = getnext(c->next);
-               if(!sel)
-                       sel = getprev(c->prev);
-               if(!sel)
-                       sel = clients;
-       }
+       if(sel == c)
+               sel = getnext(clients);

        free(c->tags);
        free(c);
 
        free(c->tags);
        free(c);
 


@@ -461,7 +456,7 @@ zoom(Arg *arg)
 {
        Client *c;
 
 {
        Client *c;
 

-       if(!sel || (arrange != dotile) || sel->isfloat)
+       if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax)

                return;
 
        if(sel == getnext(clients))  {
                return;
 
        if(sel == getnext(clients))  {


@@ -472,13 +467,11 @@ zoom(Arg *arg)
        }
 
        /* pop */
        }
 
        /* pop */

-       if(sel->prev)
-               sel->prev->next = sel->next;
+       sel->prev->next = sel->next;

        if(sel->next)
                sel->next->prev = sel->prev;
        sel->prev = NULL;
        if(sel->next)
                sel->next->prev = sel->prev;
        sel->prev = NULL;

-       if(clients)
-               clients->prev = sel;
+       clients->prev = sel;

        sel->next = clients;
        clients = sel;
        arrange(NULL);
        sel->next = clients;
        clients = sel;
        arrange(NULL);