X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=3086284bd576d189b3466e0884fe2dae30bb7b02;hb=29c26b88e7333fb8ea022c4bb4277bc0394ab9e3;hp=d200a8d0ab2818ae2d539c9ed1c0cdc6a928e653;hpb=cdbc84b9a87c427b3d0a202475b0f5aae315fb90;p=dwm.git

diff --git a/event.c b/event.c
index d200a8d..3086284 100644
--- a/event.c
+++ b/event.c
@@ -140,7 +140,8 @@ buttonpress(XEvent *e) {
 		if(ev->x < x + blw)
 			switch(ev->button) {
 			case Button1:
-				togglelayout(NULL);
+				a.i = -1;
+				setlayout(&a);
 				break;
 			case Button4:
 				a.i = 1;
@@ -156,14 +157,14 @@ buttonpress(XEvent *e) {
 		focus(c);
 		if(CLEANMASK(ev->state) != MODKEY)
 			return;
-		if(ev->button == Button1 && (lt->arrange == dofloat || c->isfloat)) {
+		if(ev->button == Button1 && (lt->arrange == versatile || c->isversatile)) {
 			restack();
 			movemouse(c);
 		}
 		else if(ev->button == Button2)
 			zoom(NULL);
 		else if(ev->button == Button3
-		&& (lt->arrange == dofloat || c->isfloat) && !c->isfixed)
+		&& (lt->arrange == versatile || c->isversatile) && !c->isfixed)
 		{
 			restack();
 			resizemouse(c);
@@ -181,7 +182,7 @@ configurerequest(XEvent *e) {
 		c->ismax = False;
 		if(ev->value_mask & CWBorderWidth)
 			c->border = ev->border_width;
-		if(c->isfixed || c->isfloat || (lt->arrange == dofloat)) {
+		if(c->isfixed || c->isversatile || (lt->arrange == versatile)) {
 			if(ev->value_mask & CWX)
 				c->x = ev->x;
 			if(ev->value_mask & CWY)
@@ -309,7 +310,7 @@ propertynotify(XEvent *e) {
 			default: break;
 			case XA_WM_TRANSIENT_FOR:
 				XGetTransientForHint(dpy, c->win, &trans);
-				if(!c->isfloat && (c->isfloat = (trans != 0)))
+				if(!c->isversatile && (c->isversatile = (getclient(trans) != NULL)))
 					lt->arrange();
 				break;
 			case XA_WM_NORMAL_HINTS: