wmii

commit 8fd5ae90bbb77afd5f1367c80b5994529ce0ac86
parent a305332f7686e5e96514552755faef87c89050de
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Thu, 27 Apr 2006 14:06:37 +0200

removed * tag hack, this reduces various corner cases


Diffstat:
cmd/wm/rule.c
 | 
2
+-
cmd/wm/view.c
 | 
22
++--------------------

2 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/cmd/wm/rule.c b/cmd/wm/rule.c
@@ -178,6 +178,6 @@ apply_rules(Client *c)
 		cext_vdetach(vector_of_props(&prop), prop.data[0]);
 
 Fallback:
-	if(!strlen(c->tags) || (!view.size && !strncmp(c->tags, "*", 2)))
+	if(!strlen(c->tags))
 		cext_strlcpy(c->tags, "nil", sizeof(c->tags));
 }
diff --git a/cmd/wm/view.c b/cmd/wm/view.c
@@ -331,11 +331,8 @@ update_client_views(Client *c)
 	while(c->view.size)
 		cext_vdetach(vector_of_views(&c->view), c->view.data[0]);
 
-	for(i = 0; i < n; i++) {
-		if(!strncmp(toks[i], "*", 2))
-			continue;
+	for(i = 0; i < n; i++)
 		cext_vattach(vector_of_views(&c->view), get_view(toks[i]));
-	}
 }
 
 static Bool
@@ -372,7 +369,7 @@ update_views()
 		for(j = 0; j < view.size; j++) {
 			View *vw = view.data[j];
 			update_frame_selectors(vw);
-			if(is_view_of(c, vw) || strchr(c->tags, '*')) {
+			if(is_view_of(c, vw)) {
 				if(!is_of_view(vw, c))
 					attach_to_view(vw, c);
 			}
@@ -383,21 +380,6 @@ update_views()
 		}
 	}
 
-	for(i = 0; i < view.size; i++) {
-		Bool only_wildcards = True;
-		for(j = 0; only_wildcards && j < client.size; j++) {
-			Client *c = client.data[j];
-			if(is_view_of(c, view.data[i]) && !strchr(c->tags, '*'))
-					only_wildcards = False;
-		}
-		if(only_wildcards && view.size > 1) {
-			for(j = 0; j < client.size; j++) {
-				if(is_of_view(view.data[i], client.data[j]))
-					detach_from_view(view.data[i], client.data[j]);
-			}
-		}
-	}
-
 	while((v = next_empty_view())) {
 		if(v == old)
 			old = nil;