wmii

commit 20a9a089a771a3b1347eb8c630c0e2c2de95e541
parent 9ec94a273b3191cb9cbb88f13cc7e1c8744199e4
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Tue, 11 Apr 2006 09:20:19 +0200

fixed wildcard handling (though now geometry issues on retag)


Diffstat:
cmd/wm/view.c
 | 
32
+++++++++++++++++++++++---------
cmd/wm/wm.h
 | 
2
--

2 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/cmd/wm/view.c b/cmd/wm/view.c
@@ -152,11 +152,20 @@ name2view(char *name)
 View *
 get_view(char *name)
 {
+	unsigned int i;
 	View *v = name2view(name);
-	return v ? v : alloc_view(name);
+
+	if(!v)
+		v = alloc_view(name);
+
+	for(i = 0; i < client.size; i++)
+		if(strstr(client.data[i]->tags, "*"))
+			attach_toview(v, client.data[i]);
+
+	return v;
 }
 
-Bool
+static Bool
 hasclient(View *v)
 {
 	unsigned int i;
@@ -175,7 +184,7 @@ select_view(char *arg)
 	focus_view(v);
 }
 
-Bool
+static Bool
 clientofview(View *v, Client *c)
 {
 	unsigned int i;
@@ -205,7 +214,8 @@ attach_toview(View *v, Client *c)
 {
 	Area *a;
 
-	fprintf(stderr, "attach_toview: %s\n", c->name);
+	if(clientofview(v, c))
+		return;
 
 	if(c->trans || c->floating)
 		a = v->area.data[0];
@@ -304,21 +314,25 @@ update_views(Client *c)
 		unsigned int j, n;
 		Bool match;
 
-		fprintf(stderr, "tags: %s\n", c->tags);
 		cext_strlcpy(buf, c->tags, sizeof(buf));
 		n = cext_tokenize(toks, 16, buf, '+');
 
 		for(i = 0; i < n; i++) {
-			View *v = get_view(toks[i]);
-			if(!clientofview(v, c))
-				attach_toview(v, c);
+			if(!strncmp(toks[i], "*", 2)) {
+				for(j = 0; j < view.size; j++) {
+					attach_toview(view.data[j], c);
+				}
+			}
+			else
+				attach_toview(get_view(toks[i]), c);
 		}
 
 		for(i = 0; i < c->view.size; i++) {
 			View *v = c->view.data[i];
 			match = False;
 			for(j = 0; j < n; j++) {
-				if(!strncmp(v->name, toks[j], sizeof(v->name)))
+				if(!strncmp(v->name, toks[j], sizeof(v->name))
+					|| !strncmp(toks[j], "*", 2))
 					match = True;
 			}
 			if(!match)
diff --git a/cmd/wm/wm.h b/cmd/wm/wm.h
@@ -270,12 +270,10 @@ XRectangle *rectangles(View *v, Bool isfloat, unsigned int *num);
 int vid2index(unsigned short id);
 void select_view(char *arg);
 int view2index(View *v);
-Bool clientofview(View *v, Client *c);
 void detach_fromview(View *v, Client *c);
 void attach_toview(View *v, Client *c);
 Client *sel_client_of_view(View *v);
 void restack_view(View *v);
-Bool hasclient(View *v);
 View *name2view(char *name);
 void destroy_view(View *v);
 View *get_view(char *name);