* 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/data.h b/src/data.h
index ec7a303..25bd889 100644
--- a/src/data.h
+++ b/src/data.h
@@ -213,6 +213,10 @@ struct rp_defaults
   int padding_bottom;
 
   XFontStruct *font;
+  char *font_string;
+
+  char *fgcolor_string;
+  char *bgcolor_string;
 
   int wait_for_key_cursor;