From 19da197f58bc005ad379d751f28f0a17cea3d3b8 Mon Sep 17 00:00:00 2001
From: Anselm R.Garbe
Date: Mon, 14 Aug 2006 16:59:18 +0200
Subject: changed replacetag into toggletag

---
 tag.c | 65 ++++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 36 insertions(+), 29 deletions(-)

(limited to 'tag.c')

diff --git a/tag.c b/tag.c
index edf68c6..51407e3 100644
--- a/tag.c
+++ b/tag.c
@@ -34,16 +34,6 @@ void (*arrange)(Arg *) = DEFMODE;
 
 /* extern */
 
-void
-appendtag(Arg *arg)
-{
-	if(!sel)
-		return;
-
-	sel->tags[arg->i] = True;
-	settitle(sel);
-}
-
 void
 dofloat(Arg *arg)
 {
@@ -182,19 +172,6 @@ isvisible(Client *c)
 	return False;
 }
 
-void
-replacetag(Arg *arg)
-{
-	int i;
-
-	if(!sel)
-		return;
-
-	for(i = 0; i < ntags; i++)
-		sel->tags[i] = False;
-	appendtag(arg);
-}
-
 void
 restack()
 {
@@ -280,6 +257,20 @@ settags(Client *c)
 			c->tags[i] = seltag[i];
 }
 
+void
+tag(Arg *arg)
+{
+	unsigned int i;
+
+	if(!sel)
+		return;
+
+	for(i = 0; i < ntags; i++)
+		sel->tags[i] = False;
+	sel->tags[arg->i] = True;
+	settitle(sel);
+}
+
 void
 togglemode(Arg *arg)
 {
@@ -288,24 +279,40 @@ togglemode(Arg *arg)
 }
 
 void
-view(Arg *arg)
+toggletag(Arg *arg)
 {
 	unsigned int i;
 
-	for(i = 0; i < ntags; i++)
-		seltag[i] = False;
-	seltag[arg->i] = True;
-	arrange(NULL);
+	if(!sel)
+		return;
+
+	sel->tags[arg->i] = !sel->tags[arg->i];
+	for(i = 0; i < ntags && !sel->tags[i]; i++);
+	if(i == ntags)
+		sel->tags[arg->i] = True;
+	settitle(sel);
 }
 
+
 void
 toggleview(Arg *arg)
 {
 	unsigned int i;
 
 	seltag[arg->i] = !seltag[arg->i];
-	for(i = 0; !seltag[i] && i < ntags; i++);
+	for(i = 0; i < ntags && !seltag[i]; i++);
 	if(i == ntags)
 		seltag[arg->i] = True; /* cannot toggle last view */
 	arrange(NULL);
 }
+
+void
+view(Arg *arg)
+{
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		seltag[i] = False;
+	seltag[arg->i] = True;
+	arrange(NULL);
+}
-- 
cgit v1.2.3