removed the if(clients) check from popping code

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 9b91ab6..57ea617 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;
 
@@ -58,8 +60,6 @@ focus(Client *c)
        drawtitle(c);
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        XSync(dpy, False);
-       XChangeProperty(dpy, root, netatom[NetActiveWindow], XA_WINDOW, 32,
-                       PropModeReplace, (unsigned char *)&c->win, 1);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
@@ -199,13 +199,6 @@ killclient(Arg *arg)
 }
 
 void
-lower(Client *c)
-{
-       XLowerWindow(dpy, c->title);
-       XLowerWindow(dpy, c->win);
-}
-
-void
 manage(Window w, XWindowAttributes *wa)
 {
        Client *c;
@@ -418,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;
@@ -461,9 +454,6 @@ unmanage(Client *c)
        arrange(NULL);
        if(sel)
                focus(sel);
-       else
-               XChangeProperty(dpy, root, netatom[NetActiveWindow], XA_WINDOW, 32,
-                               PropModeReplace, (unsigned char *)NULL, 1);
 }
 
 void
@@ -471,7 +461,7 @@ zoom(Arg *arg)
 {
        Client *c;
 
-       if(!sel || (arrange != dotile) || sel->isfloat)
+       if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax)
                return;
 
        if(sel == getnext(clients))  {
@@ -487,8 +477,7 @@ zoom(Arg *arg)
        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);