diff options
| author | Anselm R Garbe <garbeam@gmail.com> | 2008-06-12 13:10:14 +0100 |
|---|---|---|
| committer | Anselm R Garbe <garbeam@gmail.com> | 2008-06-12 13:10:14 +0100 |
| commit | 709da0b85879f4ce3275993e4ffc1af2ca4dde93 (patch) | |
| tree | 946894b4851b4ce9d8aa486fd8346f80064f3810 | |
| parent | 5cd65f8cd85928a0f26c80a209c82781cb342365 (diff) | |
| download | dwm-709da0b85879f4ce3275993e4ffc1af2ca4dde93.tar.gz | |
some bugfixes of the patch application yesterday
| -rw-r--r-- | dwm.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/dwm.c b/dwm.c index 4153f41..d531965 100644 --- a/dwm.c +++ b/dwm.c @@ -315,23 +315,23 @@ buttonpress(XEvent *e) { 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); } @@ -1646,7 +1646,7 @@ updatewmhints(Client *c) { 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(); } |