X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=2602ed29ede3226a3ce72c313ee3e2af772cffdb;hb=01022b95d65612462972bdd009896ba6fdd3063a;hp=9932974ad57c0fe973d931c3f22f8de9c525d1e9;hpb=9449ea3e002990372383835b85ed18ceaf75e400;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 9932974..2602ed2 100644
--- a/dwm.c
+++ b/dwm.c
@@ -41,6 +41,7 @@
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
+#include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
 
@@ -335,16 +336,24 @@ buttonpress(XEvent *e) {
 		focus(c);
 		if(CLEANMASK(ev->state) != MODKEY)
 			return;
-		if(ev->button == Button1 && (isarrange(floating) || c->isfloating)) {
-			restack();
+		if(ev->button == Button1) {
+			if(!isarrange(floating) && !c->isfloating)
+				togglefloating(NULL);
+			else
+				restack();
 			movemouse(c);
 		}
-		else if(ev->button == Button2)
-			zoom(NULL);
-		else if(ev->button == Button3
-		&& (isarrange(floating) || c->isfloating) && !c->isfixed)
-		{
-			restack();
+		else if(ev->button == Button2) {
+			if(isarrange(tile) && !c->isfixed && c->isfloating)
+				togglefloating(NULL);
+			else
+				zoom(NULL);
+		}
+		else if(ev->button == Button3 && !c->isfixed) {
+			if(!isarrange(floating) && !c->isfloating)
+				togglefloating(NULL);
+			else
+				restack();
 			resizemouse(c);
 		}
 	}