* src/data.h (struct rp_defaults): new members, font_string,

fgcolor_string, bgcolor_string.

* src/actions.c (set_font): return defaults.font_string when data is NULL
(set_fgcolor): likewise for fgcolor_string
(set_bgcolor): likewise for bgcolor_string

* src/manage.c (ungrab_top_level_keys): properly grab capital letters.

* src/main.c (init_defaults): init fgcolor_string, bgcolor_string, and font_string

* src/input.c (grab_key): change keysym type to KeySym. convert
keysym to keycode. All callers updated.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/main.c b/src/main.c
index 26a1309..584b958 100644
--- a/src/main.c
+++ b/src/main.c
@@ -483,6 +483,10 @@ init_defaults ()
       fprintf (stderr, "ratpoison: Cannot load font %s.\n", "9x15bold");
       exit (EXIT_FAILURE);
     }
+  defaults.font_string = xstrdup ("9x15bold");
+
+  defaults.fgcolor_string = xstrdup ("black");
+  defaults.bgcolor_string = xstrdup ("white");
 
   defaults.wait_for_key_cursor = 1;