From b1a67e4bc7c319ce32cd60bb56105dc0d378c1c8 Mon Sep 17 00:00:00 2001
From: Yuri Karaban <dev@dev97.com>
Date: Sat, 12 Apr 2014 18:55:55 +0300
Subject: [PATCH] autoPlaceWindow: rewrite iteration to more comprehensible
 form

---
 src/placement.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/placement.c b/src/placement.c
index 382ffb15..c8435573 100644
--- a/src/placement.c
+++ b/src/placement.c
@@ -423,30 +423,27 @@ center_place_window(WWindow *wwin, int *x_ret, int *y_ret,
 
 static Bool
 autoPlaceWindow(WWindow *wwin, int *x_ret, int *y_ret,
-		unsigned int width, unsigned int height, int tryCount, WArea usableArea)
+		unsigned int width, unsigned int height,
+		int tryCount, WArea usableArea)
 {
 	WScreen *scr = wwin->screen_ptr;
-	int test_x = 0, test_y = Y_ORIGIN;
-	int swidth, sx;
+	int x, y;
+	int sw, sh;
 
 	set_width_height(wwin, &width, &height);
-	swidth = usableArea.x2 - usableArea.x1;
-	sx = X_ORIGIN;
+	sw = usableArea.x2 - usableArea.x1;
+	sh = usableArea.y2 - usableArea.y1;
 
 	/* this was based on fvwm2's smart placement */
-	while (((test_y + height) < (usableArea.y2 - usableArea.y1))) {
-		test_x = sx;
-
-		while (((test_x + width) < swidth)) {
-			if (screen_has_space(scr, test_x, test_y,
+	for (y = Y_ORIGIN; (y + height) < sh; y += PLACETEST_VSTEP) {
+		for (x = X_ORIGIN; (x + width) < sw; x += PLACETEST_HSTEP) {
+			if (screen_has_space(scr, x, y,
 					     width, height, tryCount)) {
-				*x_ret = test_x;
-				*y_ret = test_y;
+				*x_ret = x;
+				*y_ret = y;
 				return True;
 			}
-			test_x += PLACETEST_HSTEP;
 		}
-		test_y += PLACETEST_VSTEP;
 	}
 
 	return False;