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/globals.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/globals.c')
-rw-r--r-- | src/globals.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/globals.c b/src/globals.c index 9638996..f21195f 100644 --- a/src/globals.c +++ b/src/globals.c @@ -278,14 +278,14 @@ rp_draw_string (rp_screen *s, Drawable d, GC gc, int x, int y, char *string, int length = strlen (string); #ifdef USE_XFT_FONT - if (s->ft_font) + if (s->xft_font) { XftDraw *draw; draw = XftDrawCreate (dpy, d, DefaultVisual (dpy, s->screen_num), DefaultColormap (dpy, s->screen_num)); if (draw) { - XftDrawString8 (draw, &s->color, s->ft_font, x, y, (FcChar8*) string, length); + XftDrawString8 (draw, &s->xft_color, s->xft_font, x, y, (FcChar8*) string, length); XftDrawDestroy (draw); } else @@ -303,10 +303,10 @@ rp_text_width (rp_screen *s, XFontSet font, char *string, int count) count = strlen (string); #ifdef USE_XFT_FONT - if (s->ft_font) + if (s->xft_font) { XGlyphInfo extents; - XftTextExtents8 (dpy, s->ft_font, (FcChar8*) string, count, &extents); + XftTextExtents8 (dpy, s->xft_font, (FcChar8*) string, count, &extents); return extents.xOff; } else |