about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--dwm.c17
-rw-r--r--patches/dwm-savefloats-20181212-b69c870.diff42
2 files changed, 57 insertions, 2 deletions
diff --git a/dwm.c b/dwm.c
index c241786..52d36d3 100644
--- a/dwm.c
+++ b/dwm.c
@@ -90,6 +90,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;
@@ -1066,6 +1067,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)
@@ -1743,8 +1748,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);
 }
 
diff --git a/patches/dwm-savefloats-20181212-b69c870.diff b/patches/dwm-savefloats-20181212-b69c870.diff
new file mode 100644
index 0000000..f5d8ed8
--- /dev/null
+++ b/patches/dwm-savefloats-20181212-b69c870.diff
@@ -0,0 +1,42 @@
+diff --git i/dwm.c w/dwm.c
+index 4465af1..96b0b26 100644
+--- i/dwm.c
++++ w/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);
+ }
+