dwm: comparison dwm.c

equal deleted inserted replaced

-:ef082062dccc
+:9f20458e3bbc
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
 enum { NetSupported, NetWMName, NetLast };              /* EWMH atoms */
 enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
-enum { ClkLtSymbol = 64, ClkStatusText, ClkWinTitle,
+enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
 ClkClientWin, ClkRootWin, ClkLast };             /* clicks */
 /* typedefs */
 typedef unsigned int uint;
 typedef unsigned long ulong;
 }
 void
 buttonpress(XEvent *e) {
 	uint i, x, click;
+	Arg arg = {0};
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
 	click = ClkRootWin;
 	if(ev->window == barwin) {
-		i = x = 0;
+		for(i = x = 0; ev->x >= x && ++i < LENGTH(tags); i++)
-		do
 			x += TEXTW(tags[i]);
-		while(ev->x >= x && ++i < LENGTH(tags));
+		if(i < LENGTH(tags)) {
-		if(i < LENGTH(tags))
+			click = ClkTagBar;
-			click = i;
+			arg.ui = 1 << i;
+		}
 		else if(ev->x < x + blw)
 			click = ClkLtSymbol;
 		else if(ev->x > wx + ww - TEXTW(stext))
 			click = ClkStatusText;
 		else
 	}
 	for(i = 0; i < LENGTH(buttons); i++)
 		if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
 		   && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
-			buttons[i].func(&buttons[i].arg);
+			buttons[i].func(click == ClkTagBar ? &arg : &buttons[i].arg);
 }
 void
 checkotherwm(void) {
 	otherwm = False;
 			PropModeReplace, (unsigned char *)data, 2);
 }
 void
 setlayout(const Arg *arg) {
-	sellt ^= 1;
+	if(!arg || !arg->v || arg->v != lt[sellt])
-	if(arg && arg->v && arg->v != lt[sellt])
+		sellt ^= 1;
+	if(arg && arg->v)
 		lt[sellt] = (Layout *)arg->v;
 	if(sel)
 		arrange();
 	else
 		drawbar();

changeset 1295	9f20458e3bbc
parent 1294	ef082062dccc
child 1296	739b1baaa853
child 1297	20481c9d647c