going toward 4.7

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index f61ce3b..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"
 
-#define NTAGS (sizeof tags / sizeof tags[0])
-Bool seltags[NTAGS] = {[0] = True};
-Bool prevtags[NTAGS] = {[0] = True};
-
 /* function implementations */
 void
 applyrules(Client *c) {
@@ -1596,7 +1592,8 @@ tile(void) {
                                nh = th - 2 * c->border;
                }
                resize(c, nx, ny, nw, nh, True);
-               if((c->h < bh) || (c->h > nh)) /* client doesn't accept geometry */
+               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;