diff options
author | Shawn Betts <sabetts@gmail.com> | 2009-04-30 12:50:26 -0700 |
---|---|---|
committer | Shawn Betts <sabetts@gmail.com> | 2009-04-30 12:52:05 -0700 |
commit | 3caa93e319499e77f63e25b2ef4a15c276815ca8 (patch) | |
tree | 6c6967f62a895ed3098778e3356f2161cebfc217 /src/actions.c | |
parent | d5e70ba5716dd5b807f7550f9924711365116a8b (diff) | |
download | ratpoison-3caa93e319499e77f63e25b2ef4a15c276815ca8.zip |
fix 'set fgcolor' for xft. Change screen's ft_font and color slots to xft_font and xft_color.
Diffstat (limited to 'src/actions.c')
-rw-r--r-- | src/actions.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/actions.c b/src/actions.c index da14648..0f093a6 100644 --- a/src/actions.c +++ b/src/actions.c @@ -3707,8 +3707,8 @@ set_font (struct cmdarg **args) if (font == NULL) return cmdret_new (RET_FAILURE, "deffont: unknown font"); - XftFontClose (dpy, s->ft_font); - s->ft_font = font; + XftFontClose (dpy, s->xft_font); + s->xft_font = font; #else XFontSet font; @@ -3993,6 +3993,13 @@ set_fgcolor (struct cmdarg **args) XSetWindowBorder (dpy, screens[i].frame_window, color.pixel); XSetWindowBorder (dpy, screens[i].help_window, color.pixel); +#ifdef USE_XFT_FONT + if (!XftColorAllocName (dpy, DefaultVisual (dpy, screens[i].screen_num), + DefaultColormap (dpy, screens[i].screen_num), + ARG_STRING(0), &screens[i].xft_color)) + return cmdret_new (RET_FAILURE, "deffgcolor: unknown color"); +#endif + free (defaults.fgcolor_string); defaults.fgcolor_string = xstrdup (ARG_STRING(0)); } |