about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAnselm R.Garbe <arg@10ksloc.org>2006-08-10 11:19:25 +0200
committerAnselm R.Garbe <arg@10ksloc.org>2006-08-10 11:19:25 +0200
commit4bd0d33f57c6fb764ef546a9b0ebfcd20ff1df70 (patch)
treeddf4135c8b7269d3f6bfaad4a6a00c564404e6af
parent00255728aae0dcbb657e8a4e145515c673b546a4 (diff)
downloaddwm-4bd0d33f57c6fb764ef546a9b0ebfcd20ff1df70.tar.gz
applied sander's patch
-rw-r--r--dwm.113
-rw-r--r--event.c19
2 files changed, 18 insertions, 14 deletions
diff --git a/dwm.1 b/dwm.1
index a411978..96dd8d3 100644
--- a/dwm.1
+++ b/dwm.1
@@ -33,7 +33,7 @@ prints version information to standard output, then exits.
 .SH USAGE
 .TP
 .B Mod1-Return
-Zoom
+Zoom current
 .B window
 to the 
 .B master
@@ -92,12 +92,19 @@ to current
 .B window.
 .TP
 .B Mod1-Button1
-Moves current
+Move current
 .B window
 while dragging.
 .TP
+.B Mod1-Button2
+Zoom current
+.B window
+to the 
+.B master
+column.
+.TP
 .B Mod1-Button3
-Resizes current
+Resize current
 .B window
 while dragging.
 .SH CUSTOMIZATION
diff --git a/event.c b/event.c
index 0f984f2..36d873f 100644
--- a/event.c
+++ b/event.c
@@ -122,25 +122,22 @@ buttonpress(XEvent *e)
 		}
 	}
 	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;
 		}
 	}
id='n211' href='#n211'>211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317