some more refactoring

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 962b484..d3065d5 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -32,39 +31,26 @@ static unsigned int len = 0;
 
 /* extern */
 
-Client *
-getnext(Client *c) {
-       for(; c && !isvisible(c); c = c->next);
-       return c;
-}
-
-Client *
-getprev(Client *c) {
-       for(; c && !isvisible(c); c = c->prev);
-       return c;
-}
-
 void
-initrregs() {
+compileregexps(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));
-                       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;
@@ -78,17 +64,17 @@ settags(Client *c, Client *trans) {
        unsigned int i, j;
        regmatch_t tmp;
        Bool matched = trans != NULL;
-       XClassHint ch;
+       XClassHint ch = { 0 };
 
-       if(matched) {
+       if(matched)
                for(i = 0; i < ntags; i++)
                        c->tags[i] = trans->tags[i];
-       }
-       else if(XGetClassHint(dpy, c->win, &ch)) {
-               snprintf(prop, sizeof(prop), "%s:%s:%s",
+       else {
+               XGetClassHint(dpy, c->win, &ch);
+               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++) {
@@ -106,7 +92,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
@@ -115,12 +100,11 @@ 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;
-       arrange(NULL);
+               sel->tags[i] = (arg->i == -1) ? True : False;
+       if(arg->i >= 0 && arg->i < ntags)
+               sel->tags[arg->i] = True;
+       arrange();
 }
 
 void
@@ -129,11 +113,9 @@ toggletag(Arg *arg) {
 
        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();
 }