going toward 4.7

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index b8fc56a..72af32f 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -232,10 +232,6 @@ Regs *regs = NULL;
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 

-#define NTAGS (sizeof tags / sizeof tags[0])
-Bool seltags[NTAGS] = {[0] = True};
-Bool prevtags[NTAGS] = {[0] = True};
-

 /* function implementations */
 void
 applyrules(Client *c) {
 /* function implementations */
 void
 applyrules(Client *c) {


@@ -1595,7 +1591,10 @@ tile(void) {
                        else
                                nh = th - 2 * c->border;
                }
                        else
                                nh = th - 2 * c->border;
                }

-               resize(c, nx, ny, nw, nh, RESIZEHINTS);
+               resize(c, nx, ny, nw, nh, True);
+               if((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw))
+                       /* client doesn't accept size constraints */
+                       resize(c, nx, ny, nw, nh, False);

                if(n > 1 && th != wah)
                        ny = c->y + c->h + 2 * c->border;
        }
                if(n > 1 && th != wah)
                        ny = c->y + c->h + 2 * c->border;
        }