From b5e3cdbe512264c453033c02a088bbd72c50bf32 Mon Sep 17 00:00:00 2001
From: oga
Date: Fri, 11 Dec 2009 17:51:42 +0000
Subject: Implement _NET_DESKTOP_NAMES, this one was a bit tricky since thespec
 says that a pager can change the property at any time (most need a
 clientmessage). So deal with property updates.

Needed to shuffle some of the other code around since we can't just use
shortcut_to_name[] everywhere now.

ok okan@
---
 parse.y | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 9c501bc..337be45 100644
--- a/parse.y
+++ b/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.21 2009/06/20 00:22:39 okan Exp $ */
+/*	$OpenBSD: parse.y,v 1.22 2009/12/11 17:51:42 oga Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -123,29 +123,13 @@ main		: FONTNAME STRING		{
 			free($3);
 		}
 		| AUTOGROUP NUMBER STRING	{
-			struct autogroupwin *aw;
-			char *p;
-
 			if ($2 < 0 || $2 > 9) {
 				free($3);
 				yyerror("autogroup number out of range: %d", $2);
 				YYERROR;
 			}
 
-			aw = xcalloc(1, sizeof(*aw));
-
-			if ((p = strchr($3, ',')) == NULL) {
-				aw->name = NULL;
-				aw->class = xstrdup($3);
-			} else {
-				*(p++) = '\0';
-				aw->name = xstrdup($3);
-				aw->class = xstrdup(p);
-			}
-			aw->group = xstrdup(shortcut_to_name[$2]);
-
-			TAILQ_INSERT_TAIL(&conf->autogroupq, aw, entry);
-
+			group_make_autogroup(conf, $3, $2);
 			free($3);
 		}
 		| IGNORE STRING {
-- 
cgit v1.2.3-2-gb3c3