* src/conf.h (DEFAULT_FONT): new define

* src/main.c (init_defaults): use the DEFAULT_FONT define

3 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 307690b..728f5c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-10-05  Shawn Betts  <katia_dilkina@verizon.net>
 
+	* src/conf.h (DEFAULT_FONT): new define
+
+	* src/main.c (init_defaults): use the DEFAULT_FONT define
+
 	* src/actions.c: new command, sselect
 	(cmd_sselect): new function. added prototype.
 	(cmd_set): free 'var' at the appropriate places.
diff --git a/src/conf.h b/src/conf.h
index a6128f0..c47cc8b 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -115,4 +115,7 @@
 /* The name of the top level keymap */
 #define TOP_KEYMAP "top"
 
+/* The default font */
+#define DEFAULT_FONT "9x15bold"
+
 #endif /* !_ _RATPOISON_CONF_H */
diff --git a/src/main.c b/src/main.c
index 5e87c55..66609ea 100644
--- a/src/main.c
+++ b/src/main.c
@@ -477,13 +477,13 @@ init_defaults ()
   defaults.padding_top 	  = 0;
   defaults.padding_bottom = 0;
 
-  defaults.font = XLoadQueryFont (dpy, "9x15bold");
+  defaults.font = XLoadQueryFont (dpy, DEFAULT_FONT);
   if (defaults.font == NULL)
     {
-      fprintf (stderr, "ratpoison: Cannot load font %s.\n", "9x15bold");
+      fprintf (stderr, "ratpoison: Cannot load font %s.\n", DEFAULT_FONT);
       exit (EXIT_FAILURE);
     }
-  defaults.font_string = xstrdup ("9x15bold");
+  defaults.font_string = xstrdup (DEFAULT_FONT);
 
   defaults.fgcolor_string = xstrdup ("black");
   defaults.bgcolor_string = xstrdup ("white");