diff options
| author | okan <okan> | 2013-05-11 21:46:27 +0000 |
|---|---|---|
| committer | okan <okan> | 2013-05-11 21:46:27 +0000 |
| commit | 3a38686137d0a0fad56db25a4c7c23ca6419f467 (patch) | |
| tree | 332b6411dd9274f70433beca7ee93351c4c0edb8 /conf.c | |
| parent | 9b9e95d74236b135d799c19c94d9b8070ffc6a58 (diff) | |
| download | cwm-3a38686137d0a0fad56db25a4c7c23ca6419f467.tar.gz cwm-3a38686137d0a0fad56db25a4c7c23ca6419f467.tar.xz cwm-3a38686137d0a0fad56db25a4c7c23ca6419f467.zip | |
replace conf_{gap,color,font} with conf_screen since really we are
configuring the screen *after* parsing, just as we do a conf_client on client manage.
Diffstat (limited to 'conf.c')
| -rw-r--r-- | conf.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/conf.c b/conf.c index e580b9e..698ab4c 100644 --- a/conf.c +++ b/conf.c @@ -84,18 +84,6 @@ conf_ignore(struct conf *c, char *val) TAILQ_INSERT_TAIL(&c->ignoreq, wm, entry); } -void -conf_gap(struct conf *c, struct screen_ctx *sc) -{ - sc->gap = c->gap; -} - -void -conf_font(struct conf *c, struct screen_ctx *sc) -{ - font_init(sc, c->font, (const char **)c->menucolor); -} - static char *menu_color_binds[CWM_COLOR_MENU_MAX] = { "black", /* CWM_COLOR_MENU_FG */ "white", /* CWM_COLOR_MENU_BG */ @@ -111,12 +99,16 @@ static char *color_binds[CWM_COLOR_BORDER_MAX] = { }; void -conf_color(struct conf *c, struct screen_ctx *sc) +conf_screen(struct screen_ctx *sc) { int i; + sc->gap = Conf.gap; + + font_init(sc, Conf.font, (const char **)Conf.menucolor); + for (i = 0; i < CWM_COLOR_BORDER_MAX; i++) - sc->color[i] = xu_getcolor(sc, c->color[i]); + sc->color[i] = xu_getcolor(sc, Conf.color[i]); } static struct { |