renamed seltag into seltags

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index cb1a2c4..0b155c0 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -40,6 +40,16 @@ persistconfig(Client *c) {
                        PropModeReplace, (unsigned char *)prop, i);
 }
 
                        PropModeReplace, (unsigned char *)prop, i);
 }
 

+static unsigned int
+idxoftag(const char *tag) {
+       unsigned int i;
+
+       for(i = 0; i < ntags; i++)
+               if(tags[i] == tag)
+                       return i;
+       return 0;
+}
+

 /* extern */
 
 void
 /* extern */
 
 void


@@ -49,19 +59,19 @@ compileregs(void) {
 
        if(regs)
                return;
 
        if(regs)
                return;

-       nrules = sizeof rule / sizeof rule[0];
+       nrules = sizeof rules / sizeof rules[0];

        regs = emallocz(nrules * sizeof(Regs));
        for(i = 0; i < nrules; i++) {
        regs = emallocz(nrules * sizeof(Regs));
        for(i = 0; i < nrules; i++) {

-               if(rule[i].prop) {
+               if(rules[i].prop) {

                        reg = emallocz(sizeof(regex_t));
                        reg = emallocz(sizeof(regex_t));

-                       if(regcomp(reg, rule[i].prop, REG_EXTENDED))
+                       if(regcomp(reg, rules[i].prop, REG_EXTENDED))

                                free(reg);
                        else
                                regs[i].propregex = reg;
                }
                                free(reg);
                        else
                                regs[i].propregex = reg;
                }

-               if(rule[i].tags) {
+               if(rules[i].tags) {

                        reg = emallocz(sizeof(regex_t));
                        reg = emallocz(sizeof(regex_t));

-                       if(regcomp(reg, rule[i].tags, REG_EXTENDED))
+                       if(regcomp(reg, rules[i].tags, REG_EXTENDED))

                                free(reg);
                        else
                                regs[i].tagregex = reg;
                                free(reg);
                        else
                                regs[i].tagregex = reg;


@@ -74,7 +84,7 @@ isvisible(Client *c) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
        unsigned int i;
 
        for(i = 0; i < ntags; i++)

-               if(c->tags[i] && seltag[i])
+               if(c->tags[i] && seltags[i])

                        return True;
        return False;
 }
                        return True;
        return False;
 }


@@ -114,7 +124,7 @@ settags(Client *c, Client *trans) {
                                ch.res_name ? ch.res_name : "", c->name);
                for(i = 0; i < nrules; i++)
                        if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) {
                                ch.res_name ? ch.res_name : "", c->name);
                for(i = 0; i < nrules; i++)
                        if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) {

-                               c->isfloating = rule[i].isfloating;
+                               c->isfloating = rules[i].isfloating;

                                for(j = 0; regs[i].tagregex && j < ntags; j++) {
                                        if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
                                                matched = True;
                                for(j = 0; regs[i].tagregex && j < ntags; j++) {
                                        if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
                                                matched = True;


@@ -129,23 +139,22 @@ settags(Client *c, Client *trans) {
        }
        if(!matched)
                for(i = 0; i < ntags; i++)
        }
        if(!matched)
                for(i = 0; i < ntags; i++)

-                       c->tags[i] = seltag[i];
+                       c->tags[i] = seltags[i];

        persistconfig(c);
 }
 
 void
 tag(const char *arg) {
        persistconfig(c);
 }
 
 void
 tag(const char *arg) {

-       int i;
+       unsigned int i;

 
        if(!sel)
                return;
        for(i = 0; i < ntags; i++)
                sel->tags[i] = arg == NULL;
 
        if(!sel)
                return;
        for(i = 0; i < ntags; i++)
                sel->tags[i] = arg == NULL;

-       i = arg ? atoi(arg) : 0;
+       i = idxoftag(arg);

        if(i >= 0 && i < ntags)
                sel->tags[i] = True;
        if(i >= 0 && i < ntags)
                sel->tags[i] = True;

-       if(sel)
-               persistconfig(sel);
+       persistconfig(sel);

        arrange();
 }
 
        arrange();
 }
 


@@ -154,47 +163,48 @@ togglefloating(const char *arg) {
        if(!sel || isfloating())
                return;
        sel->isfloating = !sel->isfloating;
        if(!sel || isfloating())
                return;
        sel->isfloating = !sel->isfloating;

-       if(sel->isfloating)
+       if(sel->isfloating) {

                resize(sel, sel->x, sel->y, sel->w, sel->h, True);
                resize(sel, sel->x, sel->y, sel->w, sel->h, True);

+               persistconfig(sel);
+       }

        arrange();
 }
 
 void
 toggletag(const char *arg) {
        arrange();
 }
 
 void
 toggletag(const char *arg) {

-       int i, j;
+       unsigned int i, j;

 
        if(!sel)
                return;
 
        if(!sel)
                return;

-       i = arg ? atoi(arg) : 0;
+       i = idxoftag(arg);

        sel->tags[i] = !sel->tags[i];
        for(j = 0; j < ntags && !sel->tags[j]; j++);
        if(j == ntags)
                sel->tags[i] = True;
        sel->tags[i] = !sel->tags[i];
        for(j = 0; j < ntags && !sel->tags[j]; j++);
        if(j == ntags)
                sel->tags[i] = True;

-       if(sel)
-               persistconfig(sel);
+       persistconfig(sel);

        arrange();
 }
 
 void
 toggleview(const char *arg) {
        arrange();
 }
 
 void
 toggleview(const char *arg) {

-       int i, j;
+       unsigned int i, j;

 
 

-       i = arg ? atoi(arg) : 0;
-       seltag[i] = !seltag[i];
-       for(j = 0; j < ntags && !seltag[j]; j++);
+       i = idxoftag(arg);
+       seltags[i] = !seltags[i];
+       for(j = 0; j < ntags && !seltags[j]; j++);

        if(j == ntags)
        if(j == ntags)

-               seltag[i] = True; /* cannot toggle last view */
+               seltags[i] = True; /* cannot toggle last view */

        arrange();
 }
 
 void
 view(const char *arg) {
        arrange();
 }
 
 void
 view(const char *arg) {

-       int i;
+       unsigned int i;

 
        for(i = 0; i < ntags; i++)
 
        for(i = 0; i < ntags; i++)

-               seltag[i] = arg == NULL;
-       i = arg ? atoi(arg) : 0;
+               seltags[i] = arg == NULL;
+       i = idxoftag(arg);

        if(i >= 0 && i < ntags)
        if(i >= 0 && i < ntags)

-               seltag[i] = True;
+               seltags[i] = True;

        arrange();
 }
        arrange();
 }