Mod1-Button2 on a floating but not-fixed client will make it tiled again

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 9932974..0428ba1 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -335,16 +335,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);
                }
        }