From: Anselm R Garbe <garbeam@gmail.com>
Date: Sun, 22 Jun 2008 08:29:35 +0000 (+0100)
Subject: another merge
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;ds=sidebyside;h=277155cf775369ad9645e68da59339acdc8f1117;hp=-c;p=dwm.git

another merge
---

277155cf775369ad9645e68da59339acdc8f1117
diff --combined dwm.c
index fe2dc1f,d4ce1e4..188e445
--- a/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();