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 | |
| 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.
| -rw-r--r-- | calmwm.h | 4 | ||||
| -rw-r--r-- | conf.c | 20 | ||||
| -rw-r--r-- | screen.c | 4 |
3 files changed, 8 insertions, 20 deletions
diff --git a/calmwm.h b/calmwm.h index 5fd166d..9a1fab9 100644 --- a/calmwm.h +++ b/calmwm.h @@ -439,14 +439,12 @@ void conf_bindname(struct conf *, char *, char *); void conf_clear(struct conf *); void conf_client(struct client_ctx *); void conf_cmd_add(struct conf *, char *, char *); -void conf_color(struct conf *, struct screen_ctx *); -void conf_font(struct conf *, struct screen_ctx *); -void conf_gap(struct conf *, struct screen_ctx *); void conf_grab(struct conf *, struct keybinding *); void conf_grab_mouse(struct client_ctx *); void conf_init(struct conf *); void conf_ignore(struct conf *, char *); void conf_mousebind(struct conf *, char *, char *); +void conf_screen(struct screen_ctx *); void conf_ungrab(struct conf *, struct keybinding *); void font_draw(struct screen_ctx *, const char *, int, 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 { diff --git a/screen.c b/screen.c index 345bdcc..b3425a1 100644 --- a/screen.c +++ b/screen.c @@ -49,9 +49,7 @@ screen_init(int which) xu_ewmh_net_supported(sc); xu_ewmh_net_supported_wm_check(sc); - conf_gap(&Conf, sc); - conf_color(&Conf, sc); - conf_font(&Conf, sc); + conf_screen(sc); screen_update_geometry(sc); |