hotfix of settags

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 6b7e184..9022371 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,28 +13,14 @@
 
 typedef struct {
        const char *pattern;
-       char *tags[TLast];
+       Bool tags[TLast];
        Bool isfloat;
 } Rule;
 
-/* CUSTOMIZE */ 
-static Rule rule[] = {
-       /* class:instance       tags                            isfloat */
-       { "Firefox.*",          { [Tnet] = "net" },             False },
-       { "Gimp.*",             { 0 },                          True},
-};
-
-char *tags[TLast] = {
-       [Tfnord] = "fnord",
-       [Tdev] = "dev",
-       [Tnet] = "net",
-       [Twork] = "work",
-       [Tmisc] = "misc",
-};
-
-void (*arrange)(Arg *) = dotile;
+TAGS
+RULES
 
-/* END CUSTOMIZE */
+void (*arrange)(Arg *) = DEFMODE;
 
 /* extern */
 
@@ -45,7 +30,7 @@ appendtag(Arg *arg)
        if(!sel)
                return;
 
-       sel->tags[arg->i] = tags[arg->i];
+       sel->tags[arg->i] = True;
        arrange(NULL);
 }
 
@@ -100,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++;
@@ -161,7 +146,7 @@ replacetag(Arg *arg)
                return;
 
        for(i = 0; i < TLast; i++)
-               sel->tags[i] = NULL;
+               sel->tags[i] = False;
        appendtag(arg);
 }
 
@@ -184,9 +169,8 @@ settags(Client *c)
                        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])
+                                               if((c->tags[j] = rule[i].tags[j]))
                                                        matched = True;
-                                               c->tags[j] = rule[i].tags[j];
                                        }
                                        c->isfloat = rule[i].isfloat;
                                }
@@ -199,7 +183,7 @@ settags(Client *c)
                        XFree(ch.res_name);
        }
        if(!matched)
-               c->tags[tsel] = tags[tsel];
+               c->tags[tsel] = True;
 }
 
 void