removing NULL-terminating **tags definition in config.h

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 5aa71b7..c9495ec 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -63,7 +63,7 @@ struct Client {
        int rx, ry, rw, rh; /* revert geometry */
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int minax, maxax, minay, maxay;
-       long flags; 
+       long flags;
        unsigned int border, oldborder;
        Bool isbanned, isfixed, ismax, isfloating, wasfloating;
        Bool *tags;
@@ -646,10 +646,8 @@ enternotify(XEvent *e) {
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
-       if((c = getclient(ev->window))) {
+       if((c = getclient(ev->window)))
                focus(c);
-               restack();
-       }
        else if(ev->window == root) {
                selscreen = True;
                focus(NULL);
@@ -1164,7 +1162,7 @@ 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; 
+       XWindowChanges wc;
 
        if(sizehints) {
                if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) {
@@ -1469,7 +1467,7 @@ setup(void) {
 
        /* init tags */
        compileregs();
-       for(ntags = 0; tags[ntags]; ntags++);
+       ntags = sizeof tags / sizeof tags[0];
        seltags = emallocz(sizeof(Bool) * ntags);
        seltags[0] = True;
 
@@ -1594,7 +1592,7 @@ tile(void) {
                else {  /* tile window */
                        if(i == 1) {
                                ny = way;
-                               nx += mc->w + mc->border;
+                               nx += mc->w + 2 * mc->border;
                                nw = waw - nx - 2 * c->border;
                        }
                        if(i + 1 == n) /* remainder */
@@ -1604,7 +1602,7 @@ tile(void) {
                }
                resize(c, nx, ny, nw, nh, RESIZEHINTS);
                if(n > 1 && th != wah)
-                       ny = c->y + c->h + c->border;
+                       ny = c->y + c->h + 2 * c->border;
        }
 }