applied sander's patch

diff --git a/dwm.1 b/dwm.1
index a411978..96dd8d3 100644 (file)
--- a/dwm.1
+++ b/dwm.1
@@ -33,7 +33,7 @@ prints version information to standard output, then exits.
 .SH USAGE
 .TP
 .B Mod1-Return
 .SH USAGE
 .TP
 .B Mod1-Return

-Zoom
+Zoom current

 .B window
 to the 
 .B master
 .B window
 to the 
 .B master


@@ -92,12 +92,19 @@ to current
 .B window.
 .TP
 .B Mod1-Button1
 .B window.
 .TP
 .B Mod1-Button1

-Moves current
+Move current

 .B window
 while dragging.
 .TP
 .B window
 while dragging.
 .TP

+.B Mod1-Button2
+Zoom current
+.B window
+to the 
+.B master
+column.
+.TP

 .B Mod1-Button3
 .B Mod1-Button3

-Resizes current
+Resize current

 .B window
 while dragging.
 .SH CUSTOMIZATION
 .B window
 while dragging.
 .SH CUSTOMIZATION

diff --git a/event.c b/event.c
index 0f984f2..36d873f 100644 (file)
--- a/event.c
+++ b/event.c
@@ -122,25 +122,22 @@ buttonpress(XEvent *e)
                }
        }
        else if((c = getclient(ev->window))) {
                }
        }
        else if((c = getclient(ev->window))) {

+               higher(c);

                focus(c);
                switch(ev->button) {
                default:
                        break;
                case Button1:
                focus(c);
                switch(ev->button) {
                default:
                        break;
                case Button1:

-                       if(!c->ismax) {
-                               if(arrange == dofloat || c->isfloat) {
-                                       higher(c);
-                                       movemouse(c);
-                               }
-                               else
-                                       zoom(NULL);
-                       }
+                       if(!c->ismax && (arrange == dofloat || c->isfloat))
+                               movemouse(c);
+                       break;
+               case Button2:
+                       if(!c->ismax && arrange != dofloat && !c->isfloat)
+                               zoom(NULL);

                        break;
                case Button3:
                        break;
                case Button3:

-                       if(!c->ismax && (arrange == dofloat || c->isfloat)) {
-                               higher(c);
+                       if(!c->ismax && (arrange == dofloat || c->isfloat))

                                resizemouse(c);
                                resizemouse(c);

-                       }

                        break;
                }
        }
                        break;
                }
        }