preparing 0.6 which will be available in the evening after sanders patch approx.

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 89ca5fb..c20c517 100644 (file)
--- a/client.c
+++ b/client.c
@@ -293,30 +293,30 @@ pop(Client *c)
 }
 
 void
-resize(Client *c, Bool inc, Corner sticky)
+resize(Client *c, Bool sizehints, Corner sticky)
 {
        int bottom = c->y + c->h;
        int right = c->x + c->w;
        XConfigureEvent e;
 
-       if(inc) {
+       if(sizehints) {
                if(c->incw)
                        c->w -= (c->w - c->basew) % c->incw;
                if(c->inch)
                        c->h -= (c->h - c->baseh) % c->inch;
+               if(c->minw && c->w < c->minw)
+                       c->w = c->minw;
+               if(c->minh && c->h < c->minh)
+                       c->h = c->minh;
+               if(c->maxw && c->w > c->maxw)
+                       c->w = c->maxw;
+               if(c->maxh && c->h > c->maxh)
+                       c->h = c->maxh;
        }
        if(c->x > sw) /* might happen on restart */
                c->x = sw - c->w;
        if(c->y > sh)
                c->y = sh - c->h;
-       if(c->minw && c->w < c->minw)
-               c->w = c->minw;
-       if(c->minh && c->h < c->minh)
-               c->h = c->minh;
-       if(c->maxw && c->w > c->maxw)
-               c->w = c->maxw;
-       if(c->maxh && c->h > c->maxh)
-               c->h = c->maxh;
        if(sticky == TopRight || sticky == BotRight)
                c->x = right - c->w;
        if(sticky == BotLeft || sticky == BotRight)
@@ -476,7 +476,7 @@ unmanage(Client *c)
 void
 zoom(Arg *arg)
 {
-       Client *c;
+       Client *c, **l;
 
        if(!sel)
                return;
@@ -486,6 +486,19 @@ zoom(Arg *arg)
                        sel = c;
        }
 
-       pop(sel);
+       /* pop */
+       for(l = &clients; *l && *l != sel; l = &(*l)->next);
+       if(sel->prev)
+               sel->prev->next = sel->next;
+       if(sel->next)
+               sel->next->prev = sel->prev;
+       *l = sel->next;
+
+       sel->prev = NULL;
+       if(clients)
+               clients->prev = sel;
+       sel->next = clients;
+       clients = sel;
+       arrange(NULL);
        focus(sel);
 }