X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tag.c;h=fafc2c59d55a4a2d4e2e1cb855cd63c9f0126bbb;hb=fd00b3a18620c70721c4c4d9f0169e06b9ce4437;hp=a2e1c8994d1ba5987a738c7a028769789347be19;hpb=9d739090750ffb3b3a64e86e2331215b8901c360;p=dwm.git

diff --git a/tag.c b/tag.c
index a2e1c89..fafc2c5 100644
--- a/tag.c
+++ b/tag.c
@@ -76,15 +76,19 @@ initrregs()
 }
 
 void
-settags(Client *c)
+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)) {
+	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);
@@ -106,8 +110,7 @@ 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;
+	for(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++);
 }
 
 void
@@ -121,11 +124,8 @@ 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);
-	else
-		drawstatus();
+	sel->weight = arg->i;
+	arrange(NULL);
 }
 
 void
@@ -140,9 +140,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);
-	else
-		drawstatus();
+	sel->weight = (i == ntags) ? arg->i : i;
+	arrange(NULL);
 }