fixed crash on zoom if only 1 client exists

[dwm.git] / client.c

diff --git a/client.c b/client.c
index e9075a2..487cb0c 100644 (file)
--- a/client.c
+++ b/client.c
@@ -28,17 +28,21 @@ next(Client *c)
 void
 zoom(Arg *arg)
 {
-       Client **l, *old;
+       Client **l, *c;
 
-       if(!(old = sel))
+       if(!sel)
                return;
 
+       if(sel == next(clients) && sel->next)  {
+               if((c = next(sel->next)))
+                       sel = c;
+       }
+
        for(l = &clients; *l && *l != sel; l = &(*l)->next);
        *l = sel->next;
 
-       old->next = clients; /* pop */
-       clients = old;
-       sel = old;
+       sel->next = clients; /* pop */
+       clients = sel;
        arrange(NULL);
        focus(sel);
 }
@@ -49,12 +53,11 @@ max(Arg *arg)
        if(!sel)
                return;
        sel->x = sx;
-       sel->y = sy;
+       sel->y = sy + bh;
        sel->w = sw - 2 * sel->border;
-       sel->h = sh - 2 * sel->border;
+       sel->h = sh - 2 * sel->border - bh;
        craise(sel);
        resize(sel, False);
-       discard_events(EnterWindowMask);
 }
 
 void
@@ -67,6 +70,7 @@ view(Arg *arg)
 
        for(c = clients; c; c = next(c->next))
                draw_client(c);
+       draw_bar();
 }
 
 void
@@ -116,7 +120,6 @@ floating(Arg *arg)
                        focus(sel);
                }
        }
-       discard_events(EnterWindowMask);
 }
 
 void
@@ -131,7 +134,10 @@ tiling(Arg *arg)
                if(c->tags[tsel] && !c->floating)
                        n++;
 
-       h = (n > 1) ? sh / (n - 1) : sh;
+       if(n > 1)
+               h = (sh - bh) / (n - 1);
+       else
+               h = sh - bh;
 
        for(i = 0, c = clients; c; c = c->next) {
                if(c->tags[tsel]) {
@@ -142,19 +148,19 @@ tiling(Arg *arg)
                        }
                        if(n == 1) {
                                c->x = sx;
-                               c->y = sy;
+                               c->y = sy + bh;
                                c->w = sw - 2 * c->border;
-                               c->h = sh - 2 * c->border;
+                               c->h = sh - 2 * c->border - bh;
                        }
                        else if(i == 0) {
                                c->x = sx;
-                               c->y = sy;
+                               c->y = sy + bh;
                                c->w = mw - 2 * c->border;
-                               c->h = sh - 2 * c->border;
+                               c->h = sh - 2 * c->border - bh;
                        }
                        else {
                                c->x = sx + mw;
-                               c->y = sy + (i - 1) * h;
+                               c->y = sy + (i - 1) * h + bh;
                                c->w = w - 2 * c->border;
                                c->h = h - 2 * c->border;
                        }
@@ -164,13 +170,12 @@ tiling(Arg *arg)
                else
                        ban_client(c);
        }
-       if(sel && !sel->tags[tsel]) {
+       if(!sel || (sel && !sel->tags[tsel])) {
                if((sel = next(clients))) {
                        craise(sel);
                        focus(sel);
                }
        }
-       discard_events(EnterWindowMask);
 }
 
 void
@@ -316,14 +321,16 @@ void
 focus(Client *c)
 {
        Client *old = sel;
+       XEvent ev;
 
+       XFlush(dpy);
        sel = c;
        if(old && old != c)
                draw_client(old);
        draw_client(c);
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        XFlush(dpy);
-       discard_events(EnterWindowMask);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 static void
@@ -373,9 +380,11 @@ manage(Window w, XWindowAttributes *wa)
        c->win = w;
        c->tx = c->x = wa->x;
        c->ty = c->y = wa->y;
+       if(c->y < bh)
+               c->ty = c->y += bh;
        c->tw = c->w = wa->width;
        c->h = wa->height;
-       c->th = th;
+       c->th = bh;
        c->border = 1;
        c->proto = win_proto(c->win);
        update_size(c);
@@ -398,8 +407,6 @@ manage(Window w, XWindowAttributes *wa)
        c->next = *l; /* *l == nil */
        *l = c;
 
-       XMapRaised(dpy, c->win);
-       XMapRaised(dpy, c->title);
        XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
@@ -412,10 +419,17 @@ manage(Window w, XWindowAttributes *wa)
                        || ((c->maxw == c->minw) && (c->maxh == c->minh));
 
        arrange(NULL);
-       if(c->tags[tsel])
+       /* mapping the window now prevents flicker */
+       if(c->tags[tsel]) {
+               XMapRaised(dpy, c->win);
+               XMapRaised(dpy, c->title);
                focus(c);
-       else
+       }
+       else {
                ban_client(c);
+               XMapRaised(dpy, c->win);
+               XMapRaised(dpy, c->title);
+       }
 }
 
 void
@@ -485,6 +499,10 @@ resize(Client *c, Bool inc)
                if(c->inch)
                        c->h -= (c->h - c->baseh) % c->inch;
        }
+       if(c->x > sw) /* might happen on restart */
+               c->x = sw - c->w;
+       if(c->y > sh)
+               c->ty = c->y = sh - c->h;
        if(c->minw && c->w < c->minw)
                c->w = c->minw;
        if(c->minh && c->h < c->minh)
@@ -570,6 +588,7 @@ draw_client(Client *c)
 {
        int i;
        if(c == sel) {
+               draw_bar();
                XUnmapWindow(dpy, c->title);
                XSetWindowBorder(dpy, c->win, dc.fg);
                return;
@@ -579,19 +598,18 @@ draw_client(Client *c)
        XMapWindow(dpy, c->title);
 
        dc.x = dc.y = 0;
-       dc.h = c->th;
 
        dc.w = 0;
        for(i = 0; i < TLast; i++) {
                if(c->tags[i]) {
                        dc.x += dc.w;
                        dc.w = textw(c->tags[i]) + dc.font.height;
-                       draw(True, c->tags[i]);
+                       drawtext(c->tags[i], False, True);
                }
        }
        dc.x += dc.w;
        dc.w = textw(c->name) + dc.font.height;
-       draw(True, c->name);
+       drawtext(c->name, False, True);
        XCopyArea(dpy, dc.drawable, c->title, dc.gc,
                        0, 0, c->tw, c->th, 0, 0);
        XFlush(dpy);