X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tag.c;h=b0c4d142d954f8d15dd5544b3bab0e62cc713117;hb=e8389a4cc0f1c35bcb7e7646102bd6d6a830207e;hp=b7c06dea039a929f989b06acbf8ada704608e39b;hpb=aa1bda81646e9d6188fd584009be0eee619f6966;p=dwm.git

diff --git a/tag.c b/tag.c
index b7c06de..b0c4d14 100644
--- a/tag.c
+++ b/tag.c
@@ -30,17 +30,6 @@ RULES
 static RReg *rreg = NULL;
 static unsigned int len = 0;
 
-static void
-commit()
-{
-	/* asserts sel != NULL */
-	settitle(sel);
-	if(!isvisible(sel))
-		arrange(NULL);
-	else
-		drawstatus();
-}
-
 /* extern */
 
 Client *
@@ -87,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);
@@ -117,8 +110,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;
+	if(!c->isfloat)
+		for(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++);
 }
 
 void
@@ -132,7 +125,9 @@ tag(Arg *arg)
 	for(i = 0; i < ntags; i++)
 		sel->tags[i] = False;
 	sel->tags[arg->i] = True;
-	commit();
+	if(!sel->isfloat)
+		sel->weight = arg->i;
+	arrange(NULL);
 }
 
 void
@@ -147,5 +142,7 @@ toggletag(Arg *arg)
 	for(i = 0; i < ntags && !sel->tags[i]; i++);
 	if(i == ntags)
 		sel->tags[arg->i] = True;
-	commit();
+	if(!sel->isfloat)
+		sel->weight = (i == ntags) ? arg->i : i;
+	arrange(NULL);
 }