floatpos: refactoring

2 files changed, 87 insertions, 226 deletions

diff --git a/patch/floatpos.c b/patch/floatpos.c
index 25207b4..0f9c57a 100644
--- a/patch/floatpos.c
+++ b/patch/floatpos.c
@@ -19,13 +19,11 @@ void
 setfloatpos(Client *c, const char *floatpos)
 {
 	char xCh, yCh, wCh, hCh;
-	int x, y, w, h, cx, cy, cw, ch, wx, ww, wy, wh, bw;
-	unsigned int i;
+	int x, y, w, h, wx, ww, wy, wh;
 	#if FLOATPOS_RESPECT_GAPS_PATCH
 	int oh, ov, ih, iv;
 	unsigned int n;
 	#endif // FLOATPOS_RESPECT_GAPS_PATCH
-	int absx, absy, absw, absh, delta, rest;
 
 	if (!c || !floatpos)
 		return;
@@ -54,11 +52,6 @@ setfloatpos(Client *c, const char *floatpos)
 			return;
 	}
 
-	absx = xCh == 'A' || xCh == 'a';
-	absy = yCh == 'A' || yCh == 'a';
-	absw = wCh == 'A' || wCh == 'a';
-	absh = hCh == 'A' || hCh == 'a';
-
 	#if FLOATPOS_RESPECT_GAPS_PATCH
 	getgaps(c->mon, &oh, &ov, &ih, &iv, &n);
 	wx = c->mon->wx + ov;
@@ -72,260 +65,127 @@ setfloatpos(Client *c, const char *floatpos)
 	wh = c->mon->wh;
 	#endif // FLOATPOS_RESPECT_GAPS_PATCH
 
-	cx = (!absx && c->x < wx ? wx : c->x);
-	cy = (!absy && c->y < wy ? wy : c->y);
-	cw = (!absw && c->w > ww ? ww : c->w);
-	ch = (!absh && c->h > wh ? wh : c->h);
+	getfloatpos(x, xCh, w, wCh, wx, ww, c->x, c->w, c->bw, floatposgrid_x, &c->x, &c->w);
+	getfloatpos(y, yCh, h, hCh, wy, wh, c->y, c->h, c->bw, floatposgrid_y, &c->y, &c->h);
+}
+
+/* p - position, s - size, cp and cs represents current position and size */
+void
+getfloatpos(int pos, char pCh, int size, char sCh, int min_p, int max_s, int cp, int cs, int cbw, int defgrid, int *out_p, int *out_s)
+{
+	int abs_p, abs_s, i, delta, rest;
+
+	abs_p = pCh == 'A' || pCh == 'a';
+	abs_s = sCh == 'A' || sCh == 'a';
+
+	cs += 2*cbw;
 
-	switch(xCh) {
+	switch(pCh) {
 	case 'A': // absolute position
-		cx = x;
+		cp = pos;
 		break;
 	case 'a': // absolute relative position
-		cx += x;
+		cp += pos;
 		break;
+	case 'y':
 	case 'x': // client relative position
-		if (cx + x > ww)
-			cx = ww;
-		else
-			cx += x;
+		cp = MIN(cp + pos, min_p + max_s);
 		break;
+	case 'Y':
 	case 'X': // client position relative to monitor
-		if (x > ww)
-			x = ww;
-		cx = wx + x;
+		cp = min_p + MIN(pos, max_s);
 		break;
 	case 'S': // fixed client position (sticky)
 	case 'C': // fixed client position (center)
-	case 'Z': // fixed client right-hand position (position + width)
-		if (x == -1)
+	case 'Z': // fixed client right-hand position (position + size)
+		if (pos == -1)
 			break;
-		if (x > ww)
-			x = ww;
-		if (x < 0)
-			x = 0;
-		if (xCh == 'Z')
-			cw = abs((cx + cw) - (wx + x));
-		else if (xCh == 'C')
-			cw = abs((cx + cw / 2) - (wx + x));
+		if (pos > max_s)
+			pos = max_s;
+		if (pos < 0)
+			pos = 0;
+		if (pCh == 'Z')
+			cs = abs((cp + cs) - (min_p + pos));
+		else if (pCh == 'C')
+			cs = abs((cp + cs / 2) - (min_p + pos));
 		else
-			cw = abs(cx - (wx + x));
-		cx = wx + x;
-		wCh = 0; // size determined by position, override defined width
+			cs = abs(cp - (min_p + pos));
+		cp = min_p + pos;
+		sCh = 0; // size determined by position, override defined size
 		break;
 	case 'G': // grid
-		if (x <= 0)
-			x = floatposgrid_x; // default configurable
-		if (w == 0 || x < 2 || (wCh != 'p' && wCh != 'P'))
+		if (pos <= 0)
+			pos = defgrid; // default configurable
+		if (size == 0 || pos < 2 || (sCh != 'p' && sCh != 'P'))
 			break;
-		delta = (ww - cw - 2*c->bw) / (x - 1);
-		rest = ww - cw - 2*c->bw - delta * (x - 1);
-		if (wCh == 'P') {
-			if (w < 1 || w > x)
+		delta = (max_s - cs) / (pos - 1);
+		rest = max_s - cs - delta * (pos - 1);
+		if (sCh == 'P') {
+			if (size < 1 || size > pos)
 				break;
-			cx = wx + delta * (w - 1);
+			cp = min_p + delta * (size - 1);
 		} else {
-			for (i = 0; i < x -1 && cx >= wx + delta * i + (i > x - rest ? i + rest - x + 1 : 0); i++);
-			cx = wx + delta * (MAX(MIN(i + w, x), 1) - 1) + (i > x - rest ? i + rest - x + 1 : 0);
+			for (i = 0; i < pos -1 && cp >= min_p + delta * i + (i > pos - rest ? i + rest - pos + 1 : 0); i++);
+			cp = min_p + delta * (MAX(MIN(i + size, pos), 1) - 1) + (i > pos - rest ? i + rest - pos + 1 : 0);
 		}
 		break;
 	}
 
-	switch(yCh) {
-	case 'A': // absolute position
-		cy = y;
+	switch(sCh) {
+	case 'A': // absolute size
+		cs = size;
 		break;
-	case 'a': // absolute relative position
-		cy += y;
+	case 'a': // absolute relative size
+		cs = MAX(1, cs + size);
 		break;
-	case 'y': // client relative position
-		if (cy + y > wh)
-			cy = wh;
-		else
-			cy += y;
-		break;
-	case 'Y': // client position relative to monitor
-		if (y > wh)
-			y = wh;
-		cy = wy + y;
-		break;
-	case 'S': // fixed client y position (sticky)
-	case 'C': // fixed client position (center)
-	case 'Z': // fixed client right-hand position (position + height)
-		if (y == -1)
+	case '%': // client size percentage in relation to monitor window area size
+		if (size <= 0)
 			break;
-		if (y > wh)
-			y = wh;
-		if (y < 0)
-			y = 0;
-		if (yCh == 'Z')
-			ch = abs((cy + ch) - (wy + y));
-		else if (yCh == 'C')
-			ch = abs((cy + ch / 2) - (wy + y));
-		else
-			ch = abs(cy - (wy + y));
-		cy = wy + y;
-		hCh = 0; // size determined by position, override defined width
-		break;
-	case 'G': // grid
-		if (y <= 0)
-			y = floatposgrid_y; // default configurable
-		if (h == 0 || y < 1 || (hCh != 'p' && hCh != 'P'))
-			break;
-		delta = (wh - ch - 2*c->bw) / (y - 1);
-		rest = wh - ch - 2*c->bw - delta * (y - 1);
-		if (hCh == 'P') {
-			if (h < 1 || h > y)
-				break;
-			cy = wy + delta * (h - 1);
-		} else {
-			for (i = 0; i < y - 1 && cy >= wy + delta * i + (i > y - rest ? i + rest - y + 1: 0); i++);
-			cy = wy + delta * (MAX(MIN(i + h, y), 1) - 1) + (i > y - rest ? i + rest - y + 1: 0);
-		}
-		hCh = 0; // size determined by position, override defined width
-		break;
-	}
-
-	bw = 2*c->bw;
-	switch(wCh) {
-	case 'A': // absolute width
-		cw = w - 2*c->bw;
-		break;
-	case 'a': // absolute relative width
-		if (cw + w < 1)
-			cw = 1;
-		else
-			cw += w;
-		break;
-	case '%': // client width percentage in relation to monitor window area width
-		if (w > 100)
-			w = 100;
-		if (w <= 0)
-			break;
-		w = ww * w / 100;
-		/* falls through */
-	case 'w': // width relative to client
-		if (wCh == 'w') {
-			if (w == 0)
-				break;
-			else {
-				w += cw;
-				bw = 0;
-			}
-		}
-		/* falls through */
-	case 'W': // normal width, position takes precedence
-		if (xCh == 'S' && cx + w > wx + ww)
-			w = wx + ww - cx;
-		else if (xCh == 'C' && cx + cw / 2 + w / 2 > wx + ww)
-			w = wx + ww - cx + cw / 2;
-		else if (xCh == 'Z' && w > cx - ww)
-			w = cx - wx;
-		else if (w > ww)
-			w = ww;
-
-		if (xCh == 'C') { // fixed client center, expand or contract client
-			delta = w - bw - cw;
-			if (delta < 0 || (cx - delta / 2 + w + 2*c->bw <= wx + ww))
-				cx -= delta / 2;
-			else if (cx - delta / 2 < wx)
-				cx = wx;
-			else if (delta)
-				cx = wx + ww - cw - bw;
-		}
-
-		cw = w - bw;
-		break;
-	}
-
-	bw = 2*c->bw;
-	switch(hCh) {
-	case 'A': // absolute height
-		ch = h - 2*c->bw;
-		break;
-	case 'a': // absolute relative height
-		if (ch + h < 1)
-			ch = 1;
-		else
-			ch += h;
-		break;
-	case '%': // client height percentage in relation to monitor window area height
-		if (h > 100)
-			h = 100;
-		if (h <= 0)
-			break;
-		h = wh * h / 100;
+		size = max_s * MIN(size, 100) / 100;
 		/* falls through */
-	case 'h': // height relative to client
-		if (hCh == 'h') {
-			if (h == 0)
+	case 'h':
+	case 'w': // size relative to client
+		if (sCh == 'w' || sCh == 'h') {
+			if (size == 0)
 				break;
-			else {
-				h += ch;
-				bw = 0;
-			}
+			size += cs;
 		}
 		/* falls through */
-	case 'H': /* normal height, position takes precedence */
-		if (yCh == 'S' && cy + h > wy + wh)
-			h = wy + wh - cy;
-		else if (yCh == 'C' && cy + ch / 2 + h / 2 > wy + wh)
-			h = wy + wh - cy + ch / 2;
-		else if (yCh == 'Z' && h > cy - wh)
-			h = cy - wy;
-		else if (h > wh)
-			h = wh;
-
-		if (yCh == 'C') { // fixed client center, expand or contract client
-			delta = h - bw - ch;
-			if (delta < 0 || (cy - delta / 2 + ch + 2*c->bw <= wy + wh))
-				cy -= delta / 2;
-			else if (cy - delta / 2 < wy)
-				cy = wy;
+	case 'H':
+	case 'W': // normal size, position takes precedence
+		if (pCh == 'S' && cp + size > min_p + max_s)
+			size = min_p + max_s - cp;
+		else if (pCh == 'Z' && size > cp - max_s)
+			size = cp - min_p;
+		else if (size > max_s)
+			size = max_s;
+
+		if (pCh == 'C') { // fixed client center, expand or contract client
+			delta = size - cs;
+			if (delta < 0 || (cp - delta / 2 + size <= min_p + max_s))
+				cp -= delta / 2;
+			else if (cp - delta / 2 < min_p)
+				cp = min_p;
 			else if (delta)
-				cy = wy + wh - ch - bw;
+				cp = min_p + max_s;
 		}
 
-		ch = h - bw;
+		cs = size;
 		break;
 	}
 
-	if (xCh == '%') { // client mid-point position in relation to monitor window area width
-		if (x > 100)
-			x = 100;
-		if (x < 0)
-			x = 0;
-		cx = wx + ww * x / 100 - (cw + 2*c->bw) / 2;
-	}
+	if (pCh == '%') // client mid-point position in relation to monitor window area size
+		cp = min_p + max_s * MAX(MIN(pos, 100), 0) / 100 - (cs) / 2;
 
-	if (yCh == '%') { // client mid-point position in relation to monitor window area height
-		if (y > 100)
-			y = 100;
-		if (y < 0)
-			y = 0;
-		cy = wy + wh * y / 100 - (ch + 2*c->bw) / 2;
-	}
-
-	if (!absx && cx < wx)
-		cx = wx;
-	if (cx + cw + 2*c->bw > wx + ww && !(absx && absw)) {
-		if (absx || cx == wx)
-			cw = ww - cx + wx - 2*c->bw;
-		else
-			cx = wx + ww - cw - 2*c->bw;
-	}
-
-	if (!absy && cy < wy)
-		cy = wy;
-	if (cy + ch + 2*c->bw > wy + wh && !(absy && absh)) {
-		if (absy || cy == wy)
-			ch = wh - cy + wy - 2*c->bw;
+	if (!abs_p && cp < min_p)
+		cp = min_p;
+	if (cp + cs > min_p + max_s && !(abs_p && abs_s)) {
+		if (abs_p || cp == min_p)
+			cs = min_p + max_s - cp;
 		else
-			cy = wy + wh - ch - 2*c->bw;
+			cp = min_p + max_s - cs;
 	}
 
-	c->x = cx;
-	c->y = cy;
-	c->w = MAX(cw, 1);
-	c->h = MAX(ch, 1);
-}
\ No newline at end of file
+	*out_p = cp;
+	*out_s = MAX(cs - 2*cbw, 1);
+}
diff --git a/patch/floatpos.h b/patch/floatpos.h
index c0a5853..21e94ef 100644
--- a/patch/floatpos.h
+++ b/patch/floatpos.h
@@ -1,2 +1,3 @@
 static void floatpos(const Arg *arg);
 static void setfloatpos(Client *c, const char *floatpos);
+static void getfloatpos(int pos, char pCh, int size, char sCh, int min_p, int max_s, int cp, int cs, int cbw, int defgrid, int *out_p, int *out_s);
\ No newline at end of file