applies dwm-savefloats-20181212-b69c870.diff dwm-savefloats-20181212-b69c870.diff
authorDaniel <thefekete@gmail.com>
Sat, 29 Dec 2018 00:42:25 +0000 (01:42 +0100)
committerDaniel <thefekete@gmail.com>
Sat, 29 Dec 2018 00:42:25 +0000 (01:42 +0100)
dwm.c

diff --git a/dwm.c b/dwm.c
index 4465af1..96b0b26 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -88,6 +88,7 @@ struct Client {
        char name[256];
        float mina, maxa;
        int x, y, w, h;
+       int sfx, sfy, sfw, sfh; /* stored float geometry, used on mode revert */
        int oldx, oldy, oldw, oldh;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int bw, oldbw;
@@ -1056,6 +1057,10 @@ manage(Window w, XWindowAttributes *wa)
        updatewindowtype(c);
        updatesizehints(c);
        updatewmhints(c);
+       c->sfx = c->x;
+       c->sfy = c->y;
+       c->sfw = c->w;
+       c->sfh = c->h;
        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
        grabbuttons(c, 0);
        if (!c->isfloating)
@@ -1714,8 +1719,16 @@ togglefloating(const Arg *arg)
                return;
        selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
        if (selmon->sel->isfloating)
-               resize(selmon->sel, selmon->sel->x, selmon->sel->y,
-                       selmon->sel->w, selmon->sel->h, 0);
+               /* restore last known float dimensions */
+               resize(selmon->sel, selmon->sel->sfx, selmon->sel->sfy,
+                      selmon->sel->sfw, selmon->sel->sfh, False);
+       else {
+               /* save last known float dimensions */
+               selmon->sel->sfx = selmon->sel->x;
+               selmon->sel->sfy = selmon->sel->y;
+               selmon->sel->sfw = selmon->sel->w;
+               selmon->sel->sfh = selmon->sel->h;
+       }
        arrange(selmon);
 }