X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tag.c;h=67e2498326a821ff32aa3f89fa89aaf1f9a49131;hb=956113b295706ef784bedfedb6936a6eddfa2d27;hp=85098671303bcbcf6cab64b2fae5e7877e44fb17;hpb=11737233a7ce6bc656bc7bc061c68eeda824ee9b;p=dwm.git

diff --git a/tag.c b/tag.c
index 8509867..67e2498 100644
--- a/tag.c
+++ b/tag.c
@@ -20,22 +20,25 @@ typedef struct {
 
 /* CUSTOMIZE */ 
 static Rule rule[] = {
-	/* class			instance	tags		isfloat */
-	{ "Firefox.*",	{ [Twww] = "www" },			False },
-	{ "Gimp.*",		{ 0 },						True},
+	/* class:instance	tags				isfloat */
+	{ "Firefox.*",		{ [Tnet] = "net" },		False },
+	{ "Gimp.*",		{ 0 },				True},
 };
 
-/* extern */
-
-/* CUSTOMIZE */
 char *tags[TLast] = {
-	[Tscratch] = "scratch",
+	[Tfnord] = "fnord",
 	[Tdev] = "dev",
-	[Twww] = "www",
+	[Tnet] = "net",
 	[Twork] = "work",
+	[Tmisc] = "misc",
 };
+
 void (*arrange)(Arg *) = dotile;
 
+/* END CUSTOMIZE */
+
+/* extern */
+
 void
 appendtag(Arg *arg)
 {
@@ -51,8 +54,8 @@ dofloat(Arg *arg)
 {
 	Client *c;
 
-	arrange = dofloat;
 	for(c = clients; c; c = c->next) {
+		c->ismax = False;
 		if(c->tags[tsel]) {
 			resize(c, True, TopLeft);
 		}
@@ -71,11 +74,10 @@ dofloat(Arg *arg)
 void
 dotile(Arg *arg)
 {
-	Client *c;
 	int n, i, w, h;
+	Client *c;
 
 	w = sw - mw;
-	arrange = dotile;
 	for(n = 0, c = clients; c; c = c->next)
 		if(c->tags[tsel] && !c->isfloat)
 			n++;
@@ -86,6 +88,7 @@ dotile(Arg *arg)
 		h = sh - bh;
 
 	for(i = 0, c = clients; c; c = c->next) {
+		c->ismax = False;
 		if(c->tags[tsel]) {
 			if(c->isfloat) {
 				higher(c);
@@ -138,29 +141,18 @@ getnext(Client *c, unsigned int t)
 	return c;
 }
 
-void
-heretag(Arg *arg)
+Client *
+getprev(Client *c)
 {
-	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];
-	pop(c);
-	focus(c);
+	for(; c && !c->tags[tsel]; c = c->prev);
+	return c;
 }
 
 void
 replacetag(Arg *arg)
 {
 	int i;
+
 	if(!sel)
 		return;
 
@@ -173,18 +165,13 @@ void
 settags(Client *c)
 {
 	char classinst[256];
-	static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
+	static unsigned int len = sizeof(rule) / sizeof(rule[0]);
 	unsigned int i, j;
 	regex_t regex;
 	regmatch_t tmp;
 	Bool matched = False;
 	XClassHint ch;
 
-	if(!len) {
-		c->tags[tsel] = tags[tsel];
-		return;
-	}
-
 	if(XGetClassHint(dpy, c->win, &ch)) {
 		snprintf(classinst, sizeof(classinst), "%s:%s",
 				ch.res_class ? ch.res_class : "",
@@ -212,6 +199,13 @@ settags(Client *c)
 }
 
 void
+togglemode(Arg *arg)
+{
+	arrange = arrange == dofloat ? dotile : dofloat;
+	arrange(NULL);
+}
+
+void
 view(Arg *arg)
 {
 	tsel = arg->i;