X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=tag.c;h=ef9cb0889300657441809adf32b17c5ae08ef917;hp=fd08853c43c18a3d9adc5810828aec904d460624;hb=cb4aa5bc35cf16a06bb2b4e880648e390fa2cc55;hpb=321e8d51edb8fe433e8e2ce8d5463c6999cc0576 diff --git a/tag.c b/tag.c index fd08853..ef9cb08 100644 --- a/tag.c +++ b/tag.c @@ -1,4 +1,4 @@ -/* (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVII Anselm R. Garbe * See LICENSE file for license details. */ #include "dwm.h" @@ -50,19 +50,19 @@ initrregs(void) { 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)); - if(regcomp(reg, rule[i].clpattern, 0)) + if(regcomp(reg, rule[i].clpattern, REG_EXTENDED)) free(reg); else rreg[i].clregex = reg; } if(rule[i].tpattern) { reg = emallocz(sizeof(regex_t)); - if(regcomp(reg, rule[i].tpattern, 0)) + if(regcomp(reg, rule[i].tpattern, REG_EXTENDED)) free(reg); else rreg[i].tregex = reg; @@ -83,10 +83,10 @@ 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++) + for(i = 0; i < len; i++) if(rreg[i].clregex && !regexec(rreg[i].clregex, prop, 1, &tmp, 0)) { c->isfloat = rule[i].isfloat; for(j = 0; rreg[i].tregex && j < ntags; j++) { @@ -113,8 +113,9 @@ tag(Arg *arg) { if(!sel) return; for(i = 0; i < ntags; i++) - sel->tags[i] = False; - sel->tags[arg->i] = True; + sel->tags[i] = (arg->i == -1) ? True : False; + if(arg->i >= 0 && arg->i < ntags) + sel->tags[arg->i] = True; arrange(); }