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

applies to the user supplied font, so rename.

ok oga@

3 files changed, 11 insertions, 11 deletions

diff --git a/calmwm.h b/calmwm.h
index 94f6648..e9b284a 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: calmwm.h,v 1.135 2011/07/23 13:09:11 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.136 2011/09/03 09:17:16 okan Exp $
  */
 
 #ifndef _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 f5b98ac..656133e 100644
--- a/conf.c
+++ b/conf.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: conf.c,v 1.91 2011/08/29 09:10:49 okan Exp $
+ * $OpenBSD: conf.c,v 1.92 2011/09/03 09:17:16 okan Exp $
  */
 
 #include <sys/param.h>
@@ -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 5421b12..acec2b2 100644
--- a/parse.y
+++ b/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.30 2011/08/22 16:18:05 okan Exp $ */
+/*	$OpenBSD: parse.y,v 1.31 2011/09/03 09:17:16 okan Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -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);