applied Jukka Salmi's setmwfact patch

[dwm.git] / client.c

diff --git a/client.c b/client.c
index d4dfe6e..c6cf770 100644 (file)
--- a/client.c
+++ b/client.c
@@ -227,25 +227,21 @@ manage(Window w, XWindowAttributes *wa) {
        attach(c);
        attachstack(c);
        XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
-       setclientstate(c, IconicState);
-       c->isbanned = True;
-       focus(c);
-       lt->arrange();
+       ban(c);
+       arrange();
 }
 
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
-       float dx, dy, max, min, ratio;
-       XWindowChanges wc;
+       double dx, dy, max, min, ratio;
+       XWindowChanges wc; 
 
-       if(w <= 0 || h <= 0)
-               return;
        if(sizehints) {
-               if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0) {
-                       dx = (float)(w - c->basew);
-                       dy = (float)(h - c->baseh);
-                       min = (float)(c->minax) / (float)(c->minay);
-                       max = (float)(c->maxax) / (float)(c->maxay);
+               if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) {
+                       dx = (double)(w - c->basew);
+                       dy = (double)(h - c->baseh);
+                       min = (double)(c->minax) / (double)(c->minay);
+                       max = (double)(c->maxax) / (double)(c->maxay);
                        ratio = dx / dy;
                        if(max > 0 && min > 0 && ratio > 0) {
                                if(ratio < min) {
@@ -299,16 +295,6 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 }
 
 void
-togglefloating(const char *arg) {
-       if(!sel || lt->arrange == floating)
-               return;
-       sel->isfloating = !sel->isfloating;
-       if(sel->isfloating)
-               resize(sel, sel->x, sel->y, sel->w, sel->h, True);
-       lt->arrange();
-}
-
-void
 unban(Client *c) {
        if(!c->isbanned)
                return;
@@ -318,7 +304,7 @@ unban(Client *c) {
 }
 
 void
-unmanage(Client *c) {
+unmanage(Client *c, long state) {
        XWindowChanges wc;
 
        wc.border_width = c->oldborder;
@@ -331,13 +317,14 @@ unmanage(Client *c) {
        if(sel == c)
                focus(NULL);
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-       setclientstate(c, WithdrawnState);
+       setclientstate(c, state);
        free(c->tags);
        free(c);
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
-       lt->arrange();
+       if(state != NormalState)
+               arrange();
 }
 
 void