hotfix of settags

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index f6c33ea..9022371 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -3,7 +3,6 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
  * See LICENSE file for license details.
  */
 #include "dwm.h"

-

 #include <regex.h>
 #include <stdio.h>
 #include <string.h>
 #include <regex.h>
 #include <stdio.h>
 #include <string.h>


@@ -14,7 +13,7 @@
 
 typedef struct {
        const char *pattern;
 
 typedef struct {
        const char *pattern;

-       char *tags[TLast];
+       Bool tags[TLast];

        Bool isfloat;
 } Rule;
 
        Bool isfloat;
 } Rule;
 


@@ -31,7 +30,7 @@ appendtag(Arg *arg)
        if(!sel)
                return;
 
        if(!sel)
                return;
 

-       sel->tags[arg->i] = tags[arg->i];
+       sel->tags[arg->i] = True;

        arrange(NULL);
 }
 
        arrange(NULL);
 }
 


@@ -86,26 +85,26 @@ dotile(Arg *arg)
                        if(n == 1) {
                                c->x = sx;
                                c->y = sy + bh;
                        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;
                        }
                        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;
                        }
                        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;
                        }
                        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++;
                        }
                        resize(c, False, TopLeft);
                        i++;


@@ -147,7 +146,7 @@ replacetag(Arg *arg)
                return;
 
        for(i = 0; i < TLast; i++)
                return;
 
        for(i = 0; i < TLast; i++)

-               sel->tags[i] = NULL;
+               sel->tags[i] = False;

        appendtag(arg);
 }
 
        appendtag(arg);
 }
 


@@ -170,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(!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;
                                                        matched = True;

-                                               c->tags[j] = rule[i].tags[j];

                                        }
                                        c->isfloat = rule[i].isfloat;
                                }
                                        }
                                        c->isfloat = rule[i].isfloat;
                                }


@@ -185,7 +183,7 @@ settags(Client *c)
                        XFree(ch.res_name);
        }
        if(!matched)
                        XFree(ch.res_name);
        }
        if(!matched)

-               c->tags[tsel] = tags[tsel];
+               c->tags[tsel] = True;

 }
 
 void
 }
 
 void