adapting John Grahor's patch to dwm-3.5

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index fafc2c5..bc731c9 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -1,5 +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"
  * See LICENSE file for license details.
  */
 #include "dwm.h"


@@ -33,41 +32,37 @@ static unsigned int len = 0;
 /* extern */
 
 Client *
 /* extern */
 
 Client *

-getnext(Client *c)
-{
+getnext(Client *c) {

        for(; c && !isvisible(c); c = c->next);
        return c;
 }
 
 Client *
        for(; c && !isvisible(c); c = c->next);
        return c;
 }
 
 Client *

-getprev(Client *c)
-{
+getprev(Client *c) {

        for(; c && !isvisible(c); c = c->prev);
        return c;
 }
 
 void
        for(; c && !isvisible(c); c = c->prev);
        return c;
 }
 
 void

-initrregs()
-{
+initrregs(void) {

        unsigned int i;
        regex_t *reg;
 
        if(rreg)
                return;
        unsigned int i;
        regex_t *reg;
 
        if(rreg)
                return;

-       len = sizeof(rule) / sizeof(rule[0]);
+       len = sizeof rule / sizeof rule[0];

        rreg = emallocz(len * sizeof(RReg));
        rreg = emallocz(len * sizeof(RReg));

-

        for(i = 0; i < len; i++) {
                if(rule[i].clpattern) {
                        reg = emallocz(sizeof(regex_t));
        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));
                                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;
                                free(reg);
                        else
                                rreg[i].tregex = reg;


@@ -76,23 +71,23 @@ initrregs()
 }
 
 void
 }
 
 void

-settags(Client *c, Client *trans)
-{
+settags(Client *c, Client *trans) {

        char prop[512];
        unsigned int i, j;
        regmatch_t tmp;
        Bool matched = trans != NULL;
        char prop[512];
        unsigned int i, j;
        regmatch_t tmp;
        Bool matched = trans != NULL;

-       XClassHint ch;
+       XClassHint ch = { 0 };

 
        if(matched) {
                for(i = 0; i < ntags; i++)
                        c->tags[i] = trans->tags[i];
        }
 
        if(matched) {
                for(i = 0; i < ntags; i++)
                        c->tags[i] = trans->tags[i];
        }

-       else if(XGetClassHint(dpy, c->win, &ch)) {
-               snprintf(prop, sizeof(prop), "%s:%s:%s",
+       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);
                                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++) {
                        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++) {


@@ -110,36 +105,30 @@ settags(Client *c, Client *trans)
        if(!matched)
                for(i = 0; i < ntags; i++)
                        c->tags[i] = seltag[i];
        if(!matched)
                for(i = 0; i < ntags; i++)
                        c->tags[i] = seltag[i];

-       for(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++);

 }
 
 void
 }
 
 void

-tag(Arg *arg)
-{
+tag(Arg *arg) {

        unsigned int i;
 
        if(!sel)
                return;
        unsigned int i;
 
        if(!sel)
                return;

-

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

-               sel->tags[i] = False;
-       sel->tags[arg->i] = True;
-       sel->weight = arg->i;
-       arrange(NULL);
+               sel->tags[i] = (arg->i == -1) ? True : False;
+       if(arg->i >= 0 && arg->i < ntags)
+               sel->tags[arg->i] = True;
+       arrange();

 }
 
 void
 }
 
 void

-toggletag(Arg *arg)
-{
+toggletag(Arg *arg) {

        unsigned int i;
 
        if(!sel)
                return;
        unsigned int i;
 
        if(!sel)
                return;

-

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

-       sel->weight = (i == ntags) ? arg->i : i;
-       arrange(NULL);
+       arrange();

 }
 }