diff options
| -rw-r--r-- | calmwm.h | 4 | ||||
| -rw-r--r-- | conf.c | 6 | ||||
| -rw-r--r-- | parse.y | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/calmwm.h b/calmwm.h index fb77499..631aaff 100644 --- a/calmwm.h +++ b/calmwm.h @@ -285,8 +285,8 @@ struct conf { struct color color[CWM_COLOR_MAX]; char termpath[MAXPATHLEN]; char lockpath[MAXPATHLEN]; -#define DEFAULTFONTNAME "sans-serif:pixelsize=14:bold" - char *DefaultFontName; +#define CONF_FONT "sans-serif:pixelsize=14:bold" + char *font; }; /* MWM hints */ diff --git a/conf.c b/conf.c index f8b306c..9f19ae2 100644 --- a/conf.c +++ b/conf.c @@ -62,7 +62,7 @@ conf_gap(struct conf *c, struct screen_ctx *sc) void conf_font(struct conf *c, struct screen_ctx *sc) { - sc->font = font_make(sc, c->DefaultFontName); + sc->font = font_make(sc, c->font); } void @@ -208,7 +208,7 @@ conf_init(struct conf *c) c->color[CWM_COLOR_BG_MENU].name = xstrdup(CONF_COLOR_MENUBG); - c->DefaultFontName = xstrdup(DEFAULTFONTNAME); + c->font = xstrdup(CONF_FONT); } void @@ -252,7 +252,7 @@ conf_clear(struct conf *c) for (i = 0; i < CWM_COLOR_MAX; i++) xfree(c->color[i].name); - xfree(c->DefaultFontName); + xfree(c->font); } void diff --git a/parse.y b/parse.y index 1b55f08..1b291ca 100644 --- a/parse.y +++ b/parse.y @@ -105,8 +105,8 @@ yesno : YES { $$ = 1; } ; main : FONTNAME STRING { - free(conf->DefaultFontName); - conf->DefaultFontName = $2; + free(conf->font); + conf->font = $2; } | STICKY yesno { if ($2 == 0) @@ -561,7 +561,7 @@ parse_config(const char *filename, struct conf *xconf) for (i = 0; i < CWM_COLOR_MAX; i++) xconf->color[i].name = conf->color[i].name; - xconf->DefaultFontName = conf->DefaultFontName; + xconf->font = conf->font; } free(conf); |