X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tag.c;h=20a0a17cb8e569a7f125aafb13961e9ec56d187c;hb=42fd392e05d54db441ecbf534cfd67d20473aac0;hp=fafc2c59d55a4a2d4e2e1cb855cd63c9f0126bbb;hpb=aaad7bfd15a023ab693bb17e2974b57cae7e7e21;p=dwm.git diff --git a/tag.c b/tag.c index fafc2c5..20a0a17 100644 --- a/tag.c +++ b/tag.c @@ -1,5 +1,4 @@ -/* - * (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI Anselm R. Garbe * See LICENSE file for license details. */ #include "dwm.h" @@ -33,30 +32,26 @@ static unsigned int len = 0; /* extern */ Client * -getnext(Client *c) -{ +getnext(Client *c) { for(; c && !isvisible(c); c = c->next); return c; } Client * -getprev(Client *c) -{ +getprev(Client *c) { for(; c && !isvisible(c); c = c->prev); return c; } void -initrregs() -{ +initrregs(void) { unsigned int i; regex_t *reg; if(rreg) return; - len = sizeof(rule) / sizeof(rule[0]); + len = sizeof rule / sizeof rule[0]; rreg = emallocz(len * sizeof(RReg)); - for(i = 0; i < len; i++) { if(rule[i].clpattern) { reg = emallocz(sizeof(regex_t)); @@ -76,8 +71,7 @@ initrregs() } void -settags(Client *c, Client *trans) -{ +settags(Client *c, Client *trans) { char prop[512]; unsigned int i, j; regmatch_t tmp; @@ -89,7 +83,7 @@ settags(Client *c, Client *trans) c->tags[i] = trans->tags[i]; } else if(XGetClassHint(dpy, c->win, &ch)) { - snprintf(prop, sizeof(prop), "%s:%s:%s", + snprintf(prop, sizeof prop, "%s:%s:%s", ch.res_class ? ch.res_class : "", ch.res_name ? ch.res_name : "", c->name); for(i = 0; !matched && i < len; i++) @@ -110,36 +104,29 @@ settags(Client *c, Client *trans) if(!matched) for(i = 0; i < ntags; i++) c->tags[i] = seltag[i]; - for(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++); } void -tag(Arg *arg) -{ +tag(Arg *arg) { unsigned int i; if(!sel) return; - for(i = 0; i < ntags; i++) - sel->tags[i] = False; + sel->tags[i] = (arg->i == -1) ? True : False; sel->tags[arg->i] = True; - sel->weight = arg->i; - arrange(NULL); + arrange(); } void -toggletag(Arg *arg) -{ +toggletag(Arg *arg) { unsigned int i; if(!sel) return; - sel->tags[arg->i] = !sel->tags[arg->i]; for(i = 0; i < ntags && !sel->tags[i]; i++); if(i == ntags) sel->tags[arg->i] = True; - sel->weight = (i == ntags) ? arg->i : i; - arrange(NULL); + arrange(); }