removed TLast tag enum, now tags is simple defined as char *[] array, the rest is...

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index f6c33ea..b20e71e 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -3,7 +3,6 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-
 #include <regex.h>
 #include <stdio.h>
 #include <string.h>
@@ -14,7 +13,7 @@
 
 typedef struct {
        const char *pattern;
-       char *tags[TLast];
+       const unsigned int *tags;
        Bool isfloat;
 } Rule;
 
@@ -31,7 +30,7 @@ appendtag(Arg *arg)
        if(!sel)
                return;
 
-       sel->tags[arg->i] = tags[arg->i];
+       sel->tags[arg->i] = True;
        arrange(NULL);
 }
 
@@ -86,26 +85,26 @@ dotile(Arg *arg)
                        if(n == 1) {
                                c->x = sx;
                                c->y = sy + bh;
-                               c->w = sw - 2 * c->border;
-                               c->h = sh - 2 * c->border - bh;
+                               c->w = sw - 2;
+                               c->h = sh - 2 - bh;
                        }
                        else if(i == 0) {
                                c->x = sx;
                                c->y = sy + bh;
-                               c->w = mw - 2 * c->border;
-                               c->h = sh - 2 * c->border - bh;
+                               c->w = mw - 2;
+                               c->h = sh - 2 - bh;
                        }
                        else if(h > bh) {
                                c->x = sx + mw;
                                c->y = sy + (i - 1) * h + bh;
-                               c->w = w - 2 * c->border;
-                               c->h = h - 2 * c->border;
+                               c->w = w - 2;
+                               c->h = h - 2;
                        }
                        else { /* fallback if h < bh */
                                c->x = sx + mw;
                                c->y = sy + bh;
-                               c->w = w - 2 * c->border;
-                               c->h = sh - 2 * c->border - bh;
+                               c->w = w - 2;
+                               c->h = sh - 2 - bh;
                        }
                        resize(c, False, TopLeft);
                        i++;
@@ -146,8 +145,8 @@ replacetag(Arg *arg)
        if(!sel)
                return;
 
-       for(i = 0; i < TLast; i++)
-               sel->tags[i] = NULL;
+       for(i = 0; i < ntags; i++)
+               sel->tags[i] = False;
        appendtag(arg);
 }
 
@@ -156,7 +155,7 @@ settags(Client *c)
 {
        char classinst[256];
        static unsigned int len = sizeof(rule) / sizeof(rule[0]);
-       unsigned int i, j;
+       unsigned int i, j, n;
        regex_t regex;
        regmatch_t tmp;
        Bool matched = False;
@@ -169,11 +168,11 @@ settags(Client *c)
                for(i = 0; !matched && i < len; i++) {
                        if(!regcomp(&regex, rule[i].pattern, 0)) {
                                if(!regexec(&regex, classinst, 1, &tmp, 0)) {
-                                       for(j = 0; j < TLast; j++) {
-                                               if(rule[i].tags[j])
-                                                       matched = True;
-                                               c->tags[j] = rule[i].tags[j];
-                                       }
+                                       n = rule[i].tags ?
+                                               sizeof(rule[i].tags) / sizeof(rule[i].tags[0]) : 0;
+                                       matched = n != 0;
+                                       for(j = 0; j < n; j++)
+                                               c->tags[rule[i].tags[j]] = True;
                                        c->isfloat = rule[i].isfloat;
                                }
                                regfree(&regex);
@@ -185,7 +184,7 @@ settags(Client *c)
                        XFree(ch.res_name);
        }
        if(!matched)
-               c->tags[tsel] = tags[tsel];
+               c->tags[tsel] = True;
 }
 
 void
@@ -206,13 +205,13 @@ view(Arg *arg)
 void
 viewnext(Arg *arg)
 {
-       arg->i = (tsel < TLast-1) ? tsel+1 : 0;
+       arg->i = (tsel < ntags-1) ? tsel+1 : 0;
        view(arg);
 }
 
 void
 viewprev(Arg *arg)
 {
-       arg->i = (tsel > 0) ? tsel-1 : TLast-1;
+       arg->i = (tsel > 0) ? tsel-1 : ntags-1;
        view(arg);
 }