Added tag 0.1 for changeset d31b5ad96b0ba7b5b0a30928fcf000428339a577

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 2a981fc..487cb0c 100644 (file)
--- a/client.c
+++ b/client.c
@@ -28,13 +28,15 @@ next(Client *c)
 void
 zoom(Arg *arg)
 {
-       Client **l;
+       Client **l, *c;
 
        if(!sel)
                return;
 
-       if(sel == next(clients)) 
-               sel = next(sel->next);
+       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;
@@ -497,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)
@@ -598,12 +604,12 @@ draw_client(Client *c)
                if(c->tags[i]) {
                        dc.x += dc.w;
                        dc.w = textw(c->tags[i]) + dc.font.height;
-                       drawtext(c->tags[i], True);
+                       drawtext(c->tags[i], False, True);
                }
        }
        dc.x += dc.w;
        dc.w = textw(c->name) + dc.font.height;
-       drawtext(c->name, True);
+       drawtext(c->name, False, True);
        XCopyArea(dpy, dc.drawable, c->title, dc.gc,
                        0, 0, c->tw, c->th, 0, 0);
        XFlush(dpy);