mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

"defaultfont" is unclear (and confusing while reading code) when it also

Browse Source 
applies to the user supplied font, so rename.

ok oga@
This commit is contained in:
okan 2011-09-03 09:17:16 +00:00
parent a4683b55f8
commit b51f8e6a99
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calmwm.h
View File

@ -285,8 +285,8 @@ struct conf {
struct color color[CWM_COLOR_MAX]; struct color color[CWM_COLOR_MAX];
char termpath[MAXPATHLEN]; char termpath[MAXPATHLEN];
char lockpath[MAXPATHLEN]; char lockpath[MAXPATHLEN];
#define DEFAULTFONTNAME "sans-serif:pixelsize=14:bold" #define CONF_FONT "sans-serif:pixelsize=14:bold"
char *DefaultFontName; char *font;
}; };
/* MWM hints */ /* MWM hints */

6
conf.c
View File

@ -62,7 +62,7 @@ conf_gap(struct conf *c, struct screen_ctx *sc)
void void
conf_font(struct conf *c, struct screen_ctx *sc) conf_font(struct conf *c, struct screen_ctx *sc)
{ {
sc->font = font_make(sc, c->DefaultFontName); sc->font = font_make(sc, c->font);
} }
void void
@ -208,7 +208,7 @@ conf_init(struct conf *c)
c->color[CWM_COLOR_BG_MENU].name = c->color[CWM_COLOR_BG_MENU].name =
xstrdup(CONF_COLOR_MENUBG); xstrdup(CONF_COLOR_MENUBG);
c->DefaultFontName = xstrdup(DEFAULTFONTNAME); c->font = xstrdup(CONF_FONT);
} }
void void
@ -252,7 +252,7 @@ conf_clear(struct conf *c)
for (i = 0; i < CWM_COLOR_MAX; i++) for (i = 0; i < CWM_COLOR_MAX; i++)
xfree(c->color[i].name); xfree(c->color[i].name);
xfree(c->DefaultFontName); xfree(c->font);
} }
void void

6
parse.y
View File

@ -105,8 +105,8 @@ yesno : YES { $$ = 1; }
; ;
main : FONTNAME STRING { main : FONTNAME STRING {
free(conf->DefaultFontName); free(conf->font);
conf->DefaultFontName = $2; conf->font = $2;
} }
| STICKY yesno { | STICKY yesno {
if ($2 == 0) if ($2 == 0)
@ -561,7 +561,7 @@ parse_config(const char *filename, struct conf *xconf)
for (i = 0; i < CWM_COLOR_MAX; i++) for (i = 0; i < CWM_COLOR_MAX; i++)
xconf->color[i].name = conf->color[i].name; xconf->color[i].name = conf->color[i].name;
xconf->DefaultFontName = conf->DefaultFontName; xconf->font = conf->font;
} }
free(conf); free(conf);