next version will contain updated copyright notice

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 798fd0a..ef9cb08 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -1,4 +1,4 @@
-/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * 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++) {
@@ -104,7 +104,6 @@ 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
@@ -114,9 +113,9 @@ tag(Arg *arg) {
        if(!sel)
                return;
        for(i = 0; i < ntags; i++)
-               sel->tags[i] = False;
-       sel->tags[arg->i] = True;
-       sel->weight = arg->i;
+               sel->tags[i] = (arg->i == -1) ? True : False;
+       if(arg->i >= 0 && arg->i < ntags)
+               sel->tags[arg->i] = True;
        arrange();
 }
 
@@ -130,6 +129,5 @@ toggletag(Arg *arg) {
        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();
 }