updated dwm(1)

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 9b91ab6..9710989 100644 (file)
--- a/client.c
+++ b/client.c
@@ -49,6 +49,8 @@ ban(Client *c)
 void
 focus(Client *c)
 {
 void
 focus(Client *c)
 {

+       if (!issel)
+               return;

        Client *old = sel;
        XEvent ev;
 
        Client *old = sel;
        XEvent ev;
 


@@ -58,8 +60,6 @@ focus(Client *c)
        drawtitle(c);
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        XSync(dpy, False);
        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));
 }
 
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 


@@ -198,13 +198,6 @@ killclient(Arg *arg)
                XKillClient(dpy, sel->win);
 }
 
                XKillClient(dpy, sel->win);
 }
 

-void
-lower(Client *c)
-{
-       XLowerWindow(dpy, c->title);
-       XLowerWindow(dpy, c->win);
-}
-

 void
 manage(Window w, XWindowAttributes *wa)
 {
 void
 manage(Window w, XWindowAttributes *wa)
 {


@@ -418,7 +411,7 @@ togglemax(Arg *arg)
                sel->h = sh - 2 - bh;
 
                higher(sel);
                sel->h = sh - 2 - bh;
 
                higher(sel);

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

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


@@ -445,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,9 +449,6 @@ unmanage(Client *c)
        arrange(NULL);
        if(sel)
                focus(sel);
        arrange(NULL);
        if(sel)
                focus(sel);

-       else
-               XChangeProperty(dpy, root, netatom[NetActiveWindow], XA_WINDOW, 32,
-                               PropModeReplace, (unsigned char *)NULL, 1);

 }
 
 void
 }
 
 void


@@ -471,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))  {


@@ -482,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);