From 10bc0ce912eb99fec49d954c80d92e04429ed0ee Mon Sep 17 00:00:00 2001
From: Anselm R. Garbe
Date: Thu, 16 Aug 2007 17:55:55 +0200
Subject: made tag/view/toggle{tag,view} work on pointer to tags-array, there
 was the need to define Key key[] not static to do this. split focusclient
 into focusnext/prev, fixed config.*.h's

---
 tag.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'tag.c')

diff --git a/tag.c b/tag.c
index 4aeadc2..cf983b8 100644
--- a/tag.c
+++ b/tag.c
@@ -40,6 +40,16 @@ persistconfig(Client *c) {
 			PropModeReplace, (unsigned char *)prop, i);
 }
 
+static unsigned int
+idxoftag(const char *tag) {
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		if(tags[i] == tag)
+			return i;
+	return 0;
+}
+
 /* extern */
 
 void
@@ -135,13 +145,13 @@ settags(Client *c, Client *trans) {
 
 void
 tag(const char *arg) {
-	int i;
+	unsigned int i;
 
 	if(!sel)
 		return;
 	for(i = 0; i < ntags; i++)
 		sel->tags[i] = arg == NULL;
-	i = arg ? atoi(arg) : 0;
+	i = idxoftag(arg);
 	if(i >= 0 && i < ntags)
 		sel->tags[i] = True;
 	persistconfig(sel);
@@ -162,11 +172,11 @@ togglefloating(const char *arg) {
 
 void
 toggletag(const char *arg) {
-	int i, j;
+	unsigned int i, j;
 
 	if(!sel)
 		return;
-	i = arg ? atoi(arg) : 0;
+	i = idxoftag(arg);
 	sel->tags[i] = !sel->tags[i];
 	for(j = 0; j < ntags && !sel->tags[j]; j++);
 	if(j == ntags)
@@ -177,9 +187,9 @@ toggletag(const char *arg) {
 
 void
 toggleview(const char *arg) {
-	int i, j;
+	unsigned int i, j;
 
-	i = arg ? atoi(arg) : 0;
+	i = idxoftag(arg);
 	seltag[i] = !seltag[i];
 	for(j = 0; j < ntags && !seltag[j]; j++);
 	if(j == ntags)
@@ -189,11 +199,11 @@ toggleview(const char *arg) {
 
 void
 view(const char *arg) {
-	int i;
+	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
 		seltag[i] = arg == NULL;
-	i = arg ? atoi(arg) : 0;
+	i = idxoftag(arg);
 	if(i >= 0 && i < ntags)
 		seltag[i] = True;
 	arrange();
-- 
cgit v1.2.3