ach ich will auch Alt-s

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index bc36f08..9e997f9 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -78,18 +78,18 @@ initrregs()
 void
 settags(Client *c)
 {
 void
 settags(Client *c)
 {

-       char classinst[256];
+       char prop[512];

        unsigned int i, j;
        regmatch_t tmp;
        Bool matched = False;
        XClassHint ch;
 
        if(XGetClassHint(dpy, c->win, &ch)) {
        unsigned int i, j;
        regmatch_t tmp;
        Bool matched = False;
        XClassHint ch;
 
        if(XGetClassHint(dpy, c->win, &ch)) {

-               snprintf(classinst, sizeof(classinst), "%s:%s",
+               snprintf(prop, sizeof(prop), "%s:%s:%s",

                                ch.res_class ? ch.res_class : "",
                                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++)
                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)) {
                                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,6 +106,7 @@ 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(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++);

 }
 
 void
 }
 
 void


@@ -119,9 +120,8 @@ tag(Arg *arg)
        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;

-       settitle(sel);
-       if(!isvisible(sel))
-               arrange(NULL);
+       sel->weight = arg->i;
+       arrange(NULL);

 }
 
 void
 }
 
 void


@@ -136,7 +136,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;

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

 }
 }