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

diff --git a/tag.c b/tag.c
index bc36f08..ddffafa 100644
--- a/tag.c
+++ b/tag.c
@@ -30,6 +30,17 @@ RULES
 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 *
@@ -78,18 +89,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 +117,8 @@ settags(Client *c)
 	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;
 }
 
 void
@@ -119,9 +132,7 @@ 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);
+	applytag();
 }
 
 void
@@ -136,7 +147,5 @@ 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);
+	applytag();
 }