summary refs log tree commit diff
path: root/conf.c
diff options
context:
space:
mode:
authorkspillner <kspillner>2015-05-17 04:34:01 +0000
committerkspillner <kspillner>2015-05-17 04:34:01 +0000
commitd328f63c7dfe14507eb4f6f8c7c8ae1594b12dcd (patch)
tree7c38b5b27fa5826e8dbed9235e28ebeb12316ee4 /conf.c
parent557cd382dcd973fd96605c3359e3d6dfa45a4fd9 (diff)
downloadcwm-d328f63c7dfe14507eb4f6f8c7c8ae1594b12dcd.tar.gz
cwm-d328f63c7dfe14507eb4f6f8c7c8ae1594b12dcd.tar.xz
cwm-d328f63c7dfe14507eb4f6f8c7c8ae1594b12dcd.zip
Make window name and window class separate parameters to conf_autogroup.
No functional change, but will be used shortly.

ok okan@
Diffstat (limited to 'conf.c')
-rw-r--r--conf.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/conf.c b/conf.c
index e5191a3..42a1c08 100644
--- a/conf.c
+++ b/conf.c
@@ -71,19 +71,28 @@ conf_cmd_remove(struct conf *c, const char *name)
 	}
 }
 void
-conf_autogroup(struct conf *c, int num, const char *val)
+conf_autogroup(struct conf *c, int num, const char *name, const char *class)
 {
 	struct autogroupwin	*aw;
 	char			*p;
 
 	aw = xmalloc(sizeof(*aw));
 
-	if ((p = strchr(val, ',')) == NULL) {
-		aw->name = NULL;
-		aw->class = xstrdup(val);
+	if ((p = strchr(class, ',')) == NULL) {
+		if (name == NULL)
+			aw->name = NULL;
+		else
+			aw->name = xstrdup(name);
+
+		aw->class = xstrdup(class);
 	} else {
 		*(p++) = '\0';
-		aw->name = xstrdup(val);
+
+		if (name == NULL)
+			aw->name = xstrdup(class);
+		else
+			aw->name = xstrdup(name);
+
 		aw->class = xstrdup(p);
 	}
 	aw->num = num;