returning to old bar colorization behavior, like sander proposed for consistency...

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index ddffafa..798fd0a 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 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"


@@ -30,36 +29,22 @@ RULES
 static RReg *rreg = NULL;
 static unsigned int len = 0;
 
 static RReg *rreg = NULL;
 static unsigned int len = 0;
 

-static void
-applytag()
-{
-       /* asserts sel != NULL */
-       settitle(sel);
-       if(!isvisible(sel))
-               arrange(NULL);
-       else
-               drawstatus();
-}
-

 /* 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;
 
        unsigned int i;
        regex_t *reg;
 


@@ -67,7 +52,6 @@ initrregs()
                return;
        len = sizeof(rule) / sizeof(rule[0]);
        rreg = emallocz(len * sizeof(RReg));
                return;
        len = sizeof(rule) / sizeof(rule[0]);
        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));


@@ -87,15 +71,18 @@ initrregs()
 }
 
 void
 }
 
 void

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

        char prop[512];
        unsigned int i, j;
        regmatch_t tmp;
        char prop[512];
        unsigned int i, j;
        regmatch_t tmp;

-       Bool matched = False;
+       Bool matched = trans != NULL;

        XClassHint ch;
 
        XClassHint ch;
 

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


@@ -117,35 +104,32 @@ settags(Client *c)
        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(i = 0; i < ntags && !c->tags[i]; i++);
-       c->weight = 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++)
                sel->tags[i] = False;
        sel->tags[arg->i] = True;
        for(i = 0; i < ntags; i++)
                sel->tags[i] = False;
        sel->tags[arg->i] = True;

-       applytag();
+       sel->weight = arg->i;
+       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;

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

 }
 }