X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tag.c;h=48abc2632b2be1d50d07cfe1dfabc8e7ae1961a1;hb=0d0e8bde134b999dd22c891d227d886ca6c9ba2c;hp=bc36f086eb2c892ce56e0bb5ef3da0cbcbce6d84;hpb=aa13727067af829b94461eb36aa029297ed8e6b9;p=dwm.git

diff --git a/tag.c b/tag.c
index bc36f08..48abc26 100644
--- a/tag.c
+++ b/tag.c
@@ -78,18 +78,18 @@ initrregs()
 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)) {
-		snprintf(classinst, sizeof(classinst), "%s:%s",
+		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,6 +106,8 @@ settags(Client *c)
 	if(!matched)
 		for(i = 0; i < ntags; i++)
 			c->tags[i] = seltag[i];
+	if(!c->isfloat)
+		for(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++);
 }
 
 void
@@ -119,9 +121,9 @@ 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);
+	if(!sel->isfloat)
+		sel->weight = arg->i;
+	arrange(NULL);
 }
 
 void
@@ -136,7 +138,7 @@ 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);
+	if(!sel->isfloat)
+		sel->weight = (i == ntags) ? arg->i : i;
+	arrange(NULL);
 }