focus() enforces visibility of a client if not NULL

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index bc36f08..962b484 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -33,22 +33,19 @@ static unsigned int len = 0;
 /* extern */
 
 Client *
-getnext(Client *c)
-{
+getnext(Client *c) {
        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
-initrregs()
-{
+initrregs() {
        unsigned int i;
        regex_t *reg;
 
@@ -76,20 +73,23 @@ initrregs()
 }
 
 void
-settags(Client *c)
-{
-       char classinst[256];
+settags(Client *c, Client *trans) {
+       char prop[512];
        unsigned int i, j;
        regmatch_t tmp;
-       Bool matched = False;
+       Bool matched = trans != NULL;
        XClassHint ch;
 
-       if(XGetClassHint(dpy, c->win, &ch)) {
-               snprintf(classinst, sizeof(classinst), "%s:%s",
+       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 : "");
+                               ch.res_name ? ch.res_name : "", c->name);
                for(i = 0; !matched && i < len; i++)
-                       if(rreg[i].clregex && !regexec(rreg[i].clregex, classinst, 1, &tmp, 0)) {
+                       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(!regexec(rreg[i].tregex, tags[j], 1, &tmp, 0)) {
@@ -106,11 +106,11 @@ settags(Client *c)
        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
-tag(Arg *arg)
-{
+tag(Arg *arg) {
        unsigned int i;
 
        if(!sel)
@@ -119,14 +119,12 @@ tag(Arg *arg)
        for(i = 0; i < ntags; i++)
                sel->tags[i] = False;
        sel->tags[arg->i] = True;
-       settitle(sel);
-       if(!isvisible(sel))
-               arrange(NULL);
+       sel->weight = arg->i;
+       arrange(NULL);
 }
 
 void
-toggletag(Arg *arg)
-{
+toggletag(Arg *arg) {
        unsigned int i;
 
        if(!sel)
@@ -136,7 +134,6 @@ toggletag(Arg *arg)
        for(i = 0; i < ntags && !sel->tags[i]; i++);
        if(i == ntags)
                sel->tags[arg->i] = True;
-       settitle(sel);
-       if(!isvisible(sel))
-               arrange(NULL);
+       sel->weight = (i == ntags) ? arg->i : i;
+       arrange(NULL);
 }