56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
diff --git a/dwm.c b/dwm.c
|
|
index f1d86b2..70be57b 100644
|
|
--- 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, hintsvalid;
|
|
int bw, oldbw;
|
|
@@ -1068,6 +1069,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)
|
|
@@ -1336,8 +1341,13 @@ resizemouse(const Arg *arg)
|
|
&& c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh)
|
|
{
|
|
if (!c->isfloating && selmon->lt[selmon->sellt]->arrange
|
|
- && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
|
|
+ && (abs(nw - c->w) > snap || abs(nh - c->h) > snap)) {
|
|
+ c->sfx = c->x;
|
|
+ c->sfy = c->y;
|
|
+ c->sfw = c->w;
|
|
+ c->sfh = c->h;
|
|
togglefloating(NULL);
|
|
+ }
|
|
}
|
|
if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
|
|
resize(c, c->x, c->y, nw, nh, 1);
|
|
@@ -1730,8 +1740,14 @@ 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);
|
|
+ resize(selmon->sel, selmon->sel->sfx, selmon->sel->sfy,
|
|
+ selmon->sel->sfw, selmon->sel->sfh, 0);
|
|
+ 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);
|
|
}
|
|
|