focus() enforces visibility of a client if not NULL

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 5337d25..962b484 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -33,22 +33,19 @@ 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() {

        unsigned int i;
        regex_t *reg;
 
        unsigned int i;
        regex_t *reg;
 


@@ -76,15 +73,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);


@@ -110,8 +110,7 @@ settags(Client *c)
 }
 
 void
 }
 
 void

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

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


@@ -125,8 +124,7 @@ tag(Arg *arg)
 }
 
 void
 }
 
 void

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

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


@@ -136,6 +134,6 @@ toggletag(Arg *arg)
        for(i = 0; i < ntags && !sel->tags[i]; i++);
        if(i == ntags)
                sel->tags[arg->i] = True;
        for(i = 0; i < ntags && !sel->tags[i]; i++);
        if(i == ntags)
                sel->tags[arg->i] = True;

-       for(sel->weight = 0; sel->weight < ntags && !sel->tags[sel->weight]; sel->weight++);
+       sel->weight = (i == ntags) ? arg->i : i;

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