git.stevedylan.dev

some bugfixes of the patch application yesterday 709da0b8

Anselm R Garbe · 2008-06-12 13:10 1 file(s) · +12 −12

dwm.c +12 −12

	click = ClkRootWin;
	if(ev->window == barwin) {
		x = 0;
		for(i = 0; i < LENGTH(tags) && ev->x >= x; i++) {
		for(i = 0; i < LENGTH(tags) && ev->x >= x; i++)
			x += TEXTW(tags[i]);
			if(i < LENGTH(tags) || ev->x <= x)
				click = i - 1;
			else if(ev->x < x + blw)
				click = ClkLtSymbol;
			else if(ev->x > wx + ww - TEXTW(stext))
				click = ClkStatusText;
			else
				click = ClkWinTitle;
		}
		if(i < LENGTH(tags) || ev->x <= x)
			click = i - 1;
		else if(ev->x < x + blw)
			click = ClkLtSymbol;
		else if(ev->x > wx + ww - TEXTW(stext))
			click = ClkStatusText;
		else
			click = ClkWinTitle;
	}
	else if((c = getclient(ev->window)))
		click = ClkClientWin;

	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))
		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);
}


void
view(const Arg *arg) {
	seltags ^= 1; /* toggle sel tagset */
	if(arg && (arg->ui & TAGMASK) && (arg->ui & TAGMASK) != tagset[seltags ^ 1])
	if(arg && (arg->ui & TAGMASK))
		tagset[seltags] = arg->i & TAGMASK;
	arrange();
}

315	315		click = ClkRootWin;
316	316		if(ev->window == barwin) {
317	317		x = 0;
318		-	for(i = 0; i < LENGTH(tags) && ev->x >= x; i++) {
	318	+	for(i = 0; i < LENGTH(tags) && ev->x >= x; i++)
319	319		x += TEXTW(tags[i]);
320		-	if(i < LENGTH(tags) \|\| ev->x <= x)
321		-	click = i - 1;
322		-	else if(ev->x < x + blw)
323		-	click = ClkLtSymbol;
324		-	else if(ev->x > wx + ww - TEXTW(stext))
325		-	click = ClkStatusText;
326		-	else
327		-	click = ClkWinTitle;
328		-	}
	320	+	if(i < LENGTH(tags) \|\| ev->x <= x)
	321	+	click = i - 1;
	322	+	else if(ev->x < x + blw)
	323	+	click = ClkLtSymbol;
	324	+	else if(ev->x > wx + ww - TEXTW(stext))
	325	+	click = ClkStatusText;
	326	+	else
	327	+	click = ClkWinTitle;
329	328		}
330	329		else if((c = getclient(ev->window)))
331	330		click = ClkClientWin;
332	331
333	332		for(i = 0; i < LENGTH(buttons); i++)
334		-	if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
	333	+	if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
	334	+	&& CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
335	335		buttons[i].func(&buttons[i].arg);
336	336		}
337	337

1646	1646		void
1647	1647		view(const Arg *arg) {
1648	1648		seltags ^= 1; /* toggle sel tagset */
1649		-	if(arg && (arg->ui & TAGMASK) && (arg->ui & TAGMASK) != tagset[seltags ^ 1])
	1649	+	if(arg && (arg->ui & TAGMASK))
1650	1650		tagset[seltags] = arg->i & TAGMASK;
1651	1651		arrange();
1652	1652		}