applied the patch I missed from Gottox, thanks mate!

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 613b6f1..3ae709b 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -129,6 +129,7 @@ typedef struct {
 
 /* function declarations */
 static void applyrules(Client *c);
+static void applysizehints(Client *c, int *w, int *h);
 static void arrange(void);
 static void attach(Client *c);
 static void attachstack(Client *c);
@@ -169,7 +170,7 @@ static void movemouse(const Arg *arg);
 static Client *nexttiled(Client *c);
 static void propertynotify(XEvent *e);
 static void quit(const Arg *arg);
-static void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
+static void resize(Client *c, int x, int y, int w, int h);
 static void resizemouse(const Arg *arg);
 static void restack(void);
 static void run(void);
@@ -271,6 +272,58 @@ applyrules(Client *c) {
 }
 
 void
+applysizehints(Client *c, int *w, int *h) {
+       Bool baseismin;
+
+       if(!resizehints && !c->isfloating)
+               return;
+
+       /* see last two sentences in ICCCM 4.1.2.3 */
+       baseismin = c->basew == c->minw && c->baseh == c->minh;
+
+       /* set minimum possible */
+       *w = MAX(1, *w);
+       *h = MAX(1, *h);
+
+       if(!baseismin) { /* temporarily remove base dimensions */
+               *w -= c->basew;
+               *h -= c->baseh;
+       }
+
+       /* adjust for aspect limits */
+       if(c->mina > 0 && c->maxa > 0) {
+               if(c->maxa < (float)*w / *h)
+                       *w = *h * c->maxa;
+               else if(c->mina < (float)*h / *w)
+                       *h = *w * c->mina;
+       }
+
+       if(baseismin) { /* increment calculation requires this */
+               *w -= c->basew;
+               *h -= c->baseh;
+       }
+
+       /* 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;
+
+       *w = MAX(*w, c->minw);
+       *h = MAX(*h, c->minh);
+
+       if(c->maxw)
+               *w = MIN(*w, c->maxw);
+
+       if(c->maxh)
+               *h = MIN(*h, c->maxh);
+}
+
+void
 arrange(void) {
        unsigned int nt;
        Client *c;
@@ -931,7 +984,7 @@ monocle(void) {
        Client *c;
 
        for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
-               resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
+               resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
        }
 }
 
@@ -979,7 +1032,7 @@ movemouse(const Arg *arg) {
                                        togglefloating(NULL);
                        }
                        if(!lt[sellt]->arrange || c->isfloating)
-                               resize(c, nx, ny, c->w, c->h, False);
+                               resize(c, nx, ny, c->w, c->h);
                        break;
                }
        }
@@ -1035,54 +1088,10 @@ quit(const Arg *arg) {
 }
 
 void
-resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
+resize(Client *c, int x, int y, int w, int h) {
        XWindowChanges wc;
 
-       if(sizehints) {
-               /* see last two sentences in ICCCM 4.1.2.3 */
-               Bool baseismin = c->basew == c->minw && c->baseh == c->minh;
-
-               /* set minimum possible */
-               w = MAX(1, w);
-               h = MAX(1, h);
-
-               if(!baseismin) { /* temporarily remove base dimensions */
-                       w -= c->basew;
-                       h -= c->baseh;
-               }
-
-               /* adjust for aspect limits */
-               if(c->mina > 0 && c->maxa > 0) {
-                       if(c->maxa < (float)w / h)
-                               w = h * c->maxa;
-                       else if(c->mina < (float)h / w)
-                               h = w * c->mina;
-               }
-
-               if(baseismin) { /* increment calculation requires this */
-                       w -= c->basew;
-                       h -= c->baseh;
-               }
-
-               /* 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;
-
-               w = MAX(w, c->minw);
-               h = MAX(h, c->minh);
-
-               if(c->maxw)
-                       w = MIN(w, c->maxw);
-
-               if(c->maxh)
-                       h = MIN(h, c->maxh);
-       }
+       applysizehints(c, &w, &h);
        if(w <= 0 || h <= 0)
                return;
        if(x > sx + sw)
@@ -1147,7 +1156,7 @@ resizemouse(const Arg *arg) {
                                        togglefloating(NULL);
                        }
                        if(!lt[sellt]->arrange || c->isfloating)
-                               resize(c, c->x, c->y, nw, nh, True);
+                               resize(c, c->x, c->y, nw, nh);
                        break;
                }
        }
@@ -1337,7 +1346,7 @@ showhide(Client *c, unsigned int ntiled) {
        if(ISVISIBLE(c)) { /* show clients top down */
                XMoveWindow(dpy, c->win, c->x, c->y);
                if(!lt[sellt]->arrange || c->isfloating)
-                       resize(c, c->x, c->y, c->w, c->h, True);
+                       resize(c, c->x, c->y, c->w, c->h);
                showhide(c->snext, ntiled);
        }
        else { /* hide clients bottom up */
@@ -1398,7 +1407,7 @@ tile(void) {
        /* master */
        c = nexttiled(clients);
        mw = mfact * ww;
-       resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
+       resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw);
 
        if(--n == 0)
                return;
@@ -1413,7 +1422,7 @@ tile(void) {
 
        for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
                resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
-                      ? wy + wh - y - 2 * c->bw : h - 2 * c->bw), resizehints);
+                      ? wy + wh - y - 2 * c->bw : h - 2 * c->bw));
                if(h != wh)
                        y = c->y + HEIGHT(c);
        }
@@ -1433,7 +1442,7 @@ togglefloating(const Arg *arg) {
                return;
        sel->isfloating = !sel->isfloating || sel->isfixed;
        if(sel->isfloating)
-               resize(sel, sel->x, sel->y, sel->w, sel->h, True);
+               resize(sel, sel->x, sel->y, sel->w, sel->h);
        arrange();
 }