introduced tile.c, some refactoring of functions

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 20a0a17..d3065d5 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 MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -31,20 +31,8 @@ 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(void) {
+compileregexps(void) {
        unsigned int i;
        regex_t *reg;
 
@@ -55,14 +43,14 @@ initrregs(void) {
        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;
@@ -76,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)) {
+       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++) {
@@ -114,7 +102,8 @@ tag(Arg *arg) {
                return;
        for(i = 0; i < ntags; i++)
                sel->tags[i] = (arg->i == -1) ? True : False;
-       sel->tags[arg->i] = True;
+       if(arg->i >= 0 && arg->i < ntags)
+               sel->tags[arg->i] = True;
        arrange();
 }