X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=99920d034e20752699aae2e3ad034a58c0dd75f4;hb=cd7ebaad25fa5f10a4442f9d80a05f344ca271d3;hp=a4447f6707480cfe9407ce5d87f44853815c1286;hpb=a73de0cff42588d3dc3b40e4e8b198c847208dca;p=dwm.git

diff --git a/dwm.c b/dwm.c
index a4447f6..99920d0 100644
--- a/dwm.c
+++ b/dwm.c
@@ -57,7 +57,6 @@ enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
 
 /* typedefs */
 typedef struct Client Client;
-
 struct Client {
 	char name[256];
 	int x, y, w, h;
@@ -112,7 +111,7 @@ typedef struct {
 	regex_t *tagregex;
 } Regs;
 
-/* forward declarations */
+/* functions */
 void applyrules(Client *c);
 void arrange(void);
 void attach(Client *c);
@@ -233,12 +232,10 @@ Regs *regs = NULL;
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
-/* Statically define the number of tags. */
+/* statically define the number of tags. */
 unsigned int ntags = sizeof tags / sizeof tags[0];
 Bool seltags[sizeof tags / sizeof tags[0]] = {[0] = True};
 Bool prevtags[sizeof tags / sizeof tags[0]] = {[0] = True};
-
-/* functions*/
 void
 applyrules(Client *c) {
 	static char buf[512];
@@ -1163,43 +1160,45 @@ quit(const char *arg) {
 
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
-	double dx, dy, max, min, ratio;
 	XWindowChanges wc;
 
 	if(sizehints) {
-		if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) {
-			dx = (double)(w - c->basew);
-			dy = (double)(h - c->baseh);
-			min = (double)(c->minax) / (double)(c->minay);
-			max = (double)(c->maxax) / (double)(c->maxay);
-			ratio = dx / dy;
-			if(max > 0 && min > 0 && ratio > 0) {
-				if(ratio < min) {
-					dy = (dx * min + dy) / (min * min + 1);
-					dx = dy * min;
-					w = (int)dx + c->basew;
-					h = (int)dy + c->baseh;
-				}
-				else if(ratio > max) {
-					dy = (dx * min + dy) / (max * max + 1);
-					dx = dy * min;
-					w = (int)dx + c->basew;
-					h = (int)dy + c->baseh;
-				}
-			}
+		/* set minimum possible */
+		if (w < 1)
+			w = 1;
+		if (h < 1)
+			h = 1;
+
+		/* temporarily remove base dimensions */
+		w -= c->basew;
+		h -= c->baseh;
+
+		/* adjust for aspect limits */
+		if (c->minay > 0 && c->maxay > 0 && c->minax > 0 && c->maxax > 0) {
+			if (w * c->maxay > h * c->maxax)
+				w = h * c->maxax / c->maxay;
+			else if (w * c->minay < h * c->minax)
+				h = w * c->minay / c->minax;
 		}
-		if(c->minw && w < c->minw)
+
+		/* adjust for increment value */
+		if(c->incw)
+			w -= w % c->incw;
+		if(c->inch)
+			h -= h % c->inch;
+
+		/* restore base dimensions */
+		w += c->basew;
+		h += c->baseh;
+
+		if(c->minw > 0 && w < c->minw)
 			w = c->minw;
-		if(c->minh && h < c->minh)
+		if(c->minh > 0 && h < c->minh)
 			h = c->minh;
-		if(c->maxw && w > c->maxw)
+		if(c->maxw > 0 && w > c->maxw)
 			w = c->maxw;
-		if(c->maxh && h > c->maxh)
+		if(c->maxh > 0 && h > c->maxh)
 			h = c->maxh;
-		if(c->incw)
-			w -= (w - c->basew) % c->incw;
-		if(c->inch)
-			h -= (h - c->baseh) % c->inch;
 	}
 	if(w <= 0 || h <= 0)
 		return;