X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=tag.c;h=3837fbdbde6d293e000e93fbfe536317038820c1;hp=8951dd82bc89ab5f040714f7473f02f7c03b7cfa;hb=4f8b08d330a6c377ab919f48b8e922d1c5ded601;hpb=adaa28a6e600f636f5e86244ccef69e98419ba1a

diff --git a/tag.c b/tag.c
index 8951dd8..3837fbd 100644
--- a/tag.c
+++ b/tag.c
@@ -7,24 +7,23 @@
 #include <string.h>
 #include <X11/Xutil.h>
 
-/********** CUSTOMIZE **********/
+/* static */
 
+/* CUSTOMIZE */ 
+static Rule rule[] = {
+	/* class			instance	tags						isfloat */
+	{ "Firefox-bin",	"Gecko",	{ [Twww] = "www" },			False },
+};
+
+/* extern */
+
+/* CUSTOMIZE */
 char *tags[TLast] = {
 	[Tscratch] = "scratch",
 	[Tdev] = "dev",
 	[Twww] = "www",
 	[Twork] = "work",
 };
-
-static Rule rule[] = {
-	/* class			instance	tags						dofloat */
-	{ "Firefox-bin",	"Gecko",	{ [Twww] = "www" },			False },
-};
-
-/********** CUSTOMIZE **********/
-
-/* extern functions */
-
 void (*arrange)(Arg *) = dotile;
 
 void
@@ -50,7 +49,7 @@ dofloat(Arg *arg)
 			ban(c);
 	}
 	if(sel && !sel->tags[tsel]) {
-		if((sel = getnext(clients))) {
+		if((sel = getnext(clients, tsel))) {
 			higher(sel);
 			focus(sel);
 		}
@@ -67,7 +66,7 @@ dotile(Arg *arg)
 	w = sw - mw;
 	arrange = dotile;
 	for(n = 0, c = clients; c; c = c->next)
-		if(c->tags[tsel] && !c->dofloat)
+		if(c->tags[tsel] && !c->isfloat)
 			n++;
 
 	if(n > 1)
@@ -77,7 +76,7 @@ dotile(Arg *arg)
 
 	for(i = 0, c = clients; c; c = c->next) {
 		if(c->tags[tsel]) {
-			if(c->dofloat) {
+			if(c->isfloat) {
 				higher(c);
 				resize(c, True);
 				continue;
@@ -107,7 +106,7 @@ dotile(Arg *arg)
 			ban(c);
 	}
 	if(!sel || (sel && !sel->tags[tsel])) {
-		if((sel = getnext(clients))) {
+		if((sel = getnext(clients, tsel))) {
 			higher(sel);
 			focus(sel);
 		}
@@ -116,13 +115,32 @@ dotile(Arg *arg)
 }
 
 Client *
-getnext(Client *c)
+getnext(Client *c, unsigned int t)
 {
-	for(; c && !c->tags[tsel]; c = c->next);
+	for(; c && !c->tags[t]; c = c->next);
 	return c;
 }
 
 void
+heretag(Arg *arg)
+{
+	int i;
+	Client *c;
+
+	if(arg->i == tsel)
+		return;
+
+	if(!(c = getnext(clients, arg->i)))
+		return;
+
+	for(i = 0; i < TLast; i++)
+		c->tags[i] = NULL;
+	c->tags[tsel] = tags[tsel];
+	arrange(NULL);
+	focus(c);
+}
+
+void
 replacetag(Arg *arg)
 {
 	int i;
@@ -155,7 +173,7 @@ settags(Client *c)
 				{
 					for(j = 0; j < TLast; j++)
 						c->tags[j] = rule[i].tags[j];
-					c->dofloat = rule[i].dofloat;
+					c->isfloat = rule[i].isfloat;
 					matched = True;
 					break;
 				}