another merge

diff --combined dwm.c
index fe2dc1f,d4ce1e4..188e445
--- 1/dwm.c
--- 2/dwm.c
+++ b/dwm.c
@@@ -310,8 -310,8 +310,8 @@@ buttonpress(XEvent *e) 
  
        click = ClkRootWin;
        if(ev->window == barwin) {
-               for(i = x = 0; ev->x >= x && ++i < LENGTH(tags); i++)
-                       x += TEXTW(tags[i]);
+               i = x = 0;
+               do x += TEXTW(tags[i]); while(ev->x >= x && ++i < LENGTH(tags));
                if(i < LENGTH(tags)) {
                        click = ClkTagBar;
                        arg.ui = 1 << i;
@@@ -929,7 -929,7 +929,7 @@@ manage(Window w, XWindowAttributes *wa
                XRaiseWindow(dpy, c->win);
        attach(c);
        attachstack(c);
 -      XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
 +      XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
        XMapWindow(dpy, c->win);
        setclientstate(c, NormalState);
        arrange();