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/screen.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/screen.c')
| -rw-r--r-- | src/screen.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/screen.c b/src/screen.c index b3b9840..ed7376a 100644 --- a/src/screen.c +++ b/src/screen.c @@ -344,22 +344,21 @@ init_screen (rp_screen *s, int screen_num) #ifdef USE_XFT_FONT { - XRenderColor rc = {0, 0, 0, 0xFFFF}; - - if (!XftColorAllocValue (dpy, DefaultVisual (dpy, screen_num), - DefaultColormap (dpy, screen_num), &rc, &s->color)) + if (!XftColorAllocName (dpy, DefaultVisual (dpy, screen_num), + DefaultColormap (dpy, screen_num), + defaults.fgcolor_string, &s->xft_color)) { PRINT_ERROR(("Failed to allocate font color\n")); - s->ft_font = NULL; + s->xft_font = NULL; } else { - s->ft_font = XftFontOpenName (dpy, screen_num, DEFAULT_XFT_FONT); - if (!s->ft_font) + s->xft_font = XftFontOpenName (dpy, screen_num, DEFAULT_XFT_FONT); + if (!s->xft_font) { PRINT_ERROR(("Failed to open font\n")); XftColorFree (dpy, DefaultVisual (dpy, screen_num), - DefaultColormap (dpy, screen_num), &s->color); + DefaultColormap (dpy, screen_num), &s->xft_color); } } } |