applied patch of Paul Liu to allow onthefly resizing due to xrandr changes

[dwm.git] / layout.c

diff --git a/layout.c b/layout.c
index 9de26bc..8005894 100644 (file)
--- a/layout.c
+++ b/layout.c
@@ -1,4 +1,5 @@
-/* © 2004-2007 Anselm R. Garbe <garbeam at gmail dot com>
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>

  * See LICENSE file for license details. */
 #include "dwm.h"
 #include <stdlib.h>
  * See LICENSE file for license details. */
 #include "dwm.h"
 #include <stdlib.h>


@@ -37,18 +38,21 @@ tile(void) {
                        ny = way;
                        if(i < nmaster) {
                                ny += i * mh;
                        ny = way;
                        if(i < nmaster) {
                                ny += i * mh;

-                               nw = mw - 2 * BORDERPX;
-                               nh = mh - 2 * BORDERPX;
+                               nw = mw - 2 * c->border;
+                               nh = mh - 2 * c->border;

                        }
                        else {  /* tile window */
                                nx += mw;
                        }
                        else {  /* tile window */
                                nx += mw;

-                               nw = tw - 2 * BORDERPX;
-                               if(th > 2 * BORDERPX) {
+                               nw = tw - 2 * c->border;
+                               if(th > 2 * c->border) {

                                        ny += (i - nmaster) * th;
                                        ny += (i - nmaster) * th;

-                                       nh = th - 2 * BORDERPX;
+                                       if(i == n - 1)
+                                               nh = wah - ny - 2 * c->border;
+                                       else
+                                               nh = th - 2 * c->border;

                                }
                                }

-                               else /* fallback if th <= 2 * BORDERPX */
-                                       nh = wah - 2 * BORDERPX;
+                               else /* fallback if th <= 2 * c->border */
+                                       nh = wah - 2 * c->border;

                        }
                        resize(c, nx, ny, nw, nh, False);
                        i++;
                        }
                        resize(c, nx, ny, nw, nh, False);
                        i++;


@@ -124,7 +128,7 @@ incmasterw(const char *arg) {
                masterw = MASTERWIDTH;
        else {
                i = atoi(arg);
                masterw = MASTERWIDTH;
        else {
                i = atoi(arg);

-               if(waw * (masterw + i) / 1000 >= waw - 2 * BORDERPX
+               if(waw * (masterw + i) / 1000 >= waw - 2 * BORDERPX 

                || waw * (masterw + i) / 1000 <= 2 * BORDERPX)
                        return;
                masterw += i;
                || waw * (masterw + i) / 1000 <= 2 * BORDERPX)
                        return;
                masterw += i;