applied Gottox mwfact patch

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 114aedd..c6cf770 100644 (file)
--- a/client.c
+++ b/client.c
@@ -227,9 +227,7 @@ 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 */
        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);
+       ban(c);

        arrange();
 }
 
        arrange();
 }
 


@@ -272,9 +270,9 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
                        w -= (w - c->basew) % c->incw;
                if(c->inch)
                        h -= (h - c->baseh) % c->inch;
                        w -= (w - c->basew) % c->incw;
                if(c->inch)
                        h -= (h - c->baseh) % c->inch;

-               if(w <= 0 || h <= 0)
-                       return;

        }
        }

+       if(w <= 0 || h <= 0)
+               return;

        /* offscreen appearance fixes */
        if(x > sw)
                x = sw - w - 2 * c->border;
        /* offscreen appearance fixes */
        if(x > sw)
                x = sw - w - 2 * c->border;


@@ -296,16 +294,6 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
        }
 }
 
        }
 }
 

-void
-togglefloating(const char *arg) {
-       if(!sel || isfloating())
-               return;
-       sel->isfloating = !sel->isfloating;
-       if(sel->isfloating)
-               resize(sel, sel->x, sel->y, sel->w, sel->h, True);
-       arrange();
-}
-

 void
 unban(Client *c) {
        if(!c->isbanned)
 void
 unban(Client *c) {
        if(!c->isbanned)


@@ -316,7 +304,7 @@ unban(Client *c) {
 }
 
 void
 }
 
 void

-unmanage(Client *c) {
+unmanage(Client *c, long state) {

        XWindowChanges wc;
 
        wc.border_width = c->oldborder;
        XWindowChanges wc;
 
        wc.border_width = c->oldborder;


@@ -329,13 +317,14 @@ unmanage(Client *c) {
        if(sel == c)
                focus(NULL);
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        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);
        free(c->tags);
        free(c);
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);

-       arrange();
+       if(state != NormalState)
+               arrange();

 }
 
 void
 }
 
 void