--- a/event.c	Thu Aug 10 11:12:15 2006 +0200
+++ b/event.c	Thu Aug 10 11:19:25 2006 +0200
@@ -122,25 +122,22 @@
 		}
 	}
 	else if((c = getclient(ev->window))) {
+		higher(c);
 		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:
-			if(!c->ismax && (arrange == dofloat || c->isfloat)) {
-				higher(c);
+			if(!c->ismax && (arrange == dofloat || c->isfloat))
 				resizemouse(c);
-			}
 			break;
 		}
 	}