applied Sanders zoom_update patch

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 6531410..8ec8ffb 100644 (file)
--- a/client.c
+++ b/client.c
@@ -49,6 +49,8 @@ ban(Client *c)
 void
 focus(Client *c)
 {
+       if (!issel)
+               return;
        Client *old = sel;
        XEvent ev;
 
@@ -196,13 +198,6 @@ killclient(Arg *arg)
                XKillClient(dpy, sel->win);
 }
 
-void
-lower(Client *c)
-{
-       XLowerWindow(dpy, c->title);
-       XLowerWindow(dpy, c->win);
-}
-
 void
 manage(Window w, XWindowAttributes *wa)
 {
@@ -416,7 +411,7 @@ togglemax(Arg *arg)
                sel->h = sh - 2 - bh;
 
                higher(sel);
-               resize(sel, False, TopLeft);
+               resize(sel, arrange == dofloat, TopLeft);
 
                sel->x = ox;
                sel->y = oy;
@@ -466,12 +461,14 @@ zoom(Arg *arg)
 {
        Client *c;
 
-       if(!sel || (arrange != dotile) || sel->isfloat)
+       if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax)
                return;
 
-       if(sel == getnext(clients) && sel->next)  {
+       if(sel == getnext(clients))  {
                if((c = getnext(sel->next)))
                        sel = c;
+               else
+                       return;
        }
 
        /* pop */