wmii

commit f5bdd9a03d2698a2a111afb0a60497505736c598
parent d7dc09cc8b5206f97a6f465f60611020c5386cbe
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Wed, 12 Apr 2006 09:09:46 +0200

fixed * tag bug in rules reported by sander, revsersed order of matching, classinst need to have the highest prio


Diffstat:
cmd/wm/client.c
 | 
12
++++++------
cmd/wm/rule.c
 | 
4
++--

2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cmd/wm/client.c b/cmd/wm/client.c
@@ -547,9 +547,11 @@ send2area_client(Client *c, char *arg)
 		return;
 
 	if(!strncmp(arg, "prev", 5) && i) {
+		if(a->frame.size == 1)
+			return;
 		if(i > 1)
 			to = v->area.data[i - 1];
-		else if(a->frame.size > 1) {
+		else {
 			Area *p, *n;
 			unsigned int j;
 			p = to = alloc_area(v);
@@ -560,18 +562,16 @@ send2area_client(Client *c, char *arg)
 			}
 			arrange_view(v, True);
 		}
-		else
-			return;
 	}
 	else if(!strncmp(arg, "next", 5) && i) {
+		if(a->frame.size == 1)
+			return;
 		if(i < v->area.size - 1)
 			to = v->area.data[i + 1];
-		else if(a->frame.size > 1) {
+		else {
 			to = alloc_area(v);
 			arrange_view(v, True);
 		}
-		else
-			return;
 	}
 	else if(!strncmp(arg, "toggle", 7)) {
 		if(i)
diff --git a/cmd/wm/rule.c b/cmd/wm/rule.c
@@ -135,11 +135,11 @@ match_tags(Client *c)
 {
 	if(!def.rules)
 		goto Fallback;
-	match(c, c->classinst);
 	match(c, c->name);
+	match(c, c->classinst);
 
 Fallback:
-	if(!strlen(c->tags))
+	if(!strlen(c->tags) || !strncmp(c->tags, "*", 2))
 		cext_strlcpy(c->tags, "nil", sizeof(c->tags));
 }