summary refs log tree commit diff
path: root/parse.y
diff options
context:
space:
mode:
authorokan <okan>2010-01-27 03:04:50 +0000
committerokan <okan>2010-01-27 03:04:50 +0000
commite88bda0df5002adb58fb96bd8f5b5b34f619c41d (patch)
treefe4ebd536a985ed479a7df0bf79062ca02927619 /parse.y
parentccb207a8a8d95d9673614727a5f60facdf57b275 (diff)
downloadcwm-e88bda0df5002adb58fb96bd8f5b5b34f619c41d.tar.gz
cwm-e88bda0df5002adb58fb96bd8f5b5b34f619c41d.tar.xz
cwm-e88bda0df5002adb58fb96bd8f5b5b34f619c41d.zip
- allow per-screen gap; not (yet) user configurable.
- teach _NET_WORKAREA about gap.

ok oga@
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y11
1 files changed, 5 insertions, 6 deletions
diff --git a/parse.y b/parse.y
index 9d049c9..20b1d8b 100644
--- a/parse.y
+++ b/parse.y
@@ -150,10 +150,10 @@ main		: FONTNAME STRING		{
 			free($3);
 		}
 		| GAP NUMBER NUMBER NUMBER NUMBER {
-			conf->gap_top = $2;
-			conf->gap_bottom = $3;
-			conf->gap_left = $4;
-			conf->gap_right = $5;
+			conf->gap.top = $2;
+			conf->gap.bottom = $3;
+			conf->gap.left = $4;
+			conf->gap.right = $5;
 		}
 		| MOUSEBIND STRING string	{
 			conf_mousebind(conf, $2, $3);
@@ -522,6 +522,7 @@ parse_config(const char *filename, struct conf *xconf)
 		xconf->flags = conf->flags;
 		xconf->bwidth = conf->bwidth;
 		xconf->mamount = conf->mamount;
+		xconf->gap = conf->gap;
 
 		while ((cmd = TAILQ_FIRST(&conf->cmdq)) != NULL) {
 			TAILQ_REMOVE(&conf->cmdq, cmd, entry);
@@ -557,8 +558,6 @@ parse_config(const char *filename, struct conf *xconf)
 			xconf->color[i].name = conf->color[i].name;
 
 		xconf->DefaultFontName = conf->DefaultFontName;
-
-		bcopy(&(conf->gap_top), &(xconf->gap_top), sizeof(int) * 4);
 	}
 
 	free(conf);