summaryrefslogtreecommitdiff
path: root/src/globals.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/globals.c')
-rw-r--r--src/globals.c8
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