Commit 3ad77b63 authored by Alan Coopersmith's avatar Alan Coopersmith

Strip trailing whitespace

Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith's avatarAlan Coopersmith <alan.coopersmith@oracle.com>
parent d274ffc9
......@@ -64,11 +64,11 @@ AC_SUBST([XFT_LT_VERSION])
#
# Check for Xrender
#
PKG_CHECK_MODULES(XRENDER, xrender >= 0.8.2, [xrender_found_with_pkgconfig=yes],
PKG_CHECK_MODULES(XRENDER, xrender >= 0.8.2, [xrender_found_with_pkgconfig=yes],
[xrender_found_with_pkgconfig=no])
case "$xrender_found_with_pkgconfig" in
no)
PKG_CHECK_MODULES(XRENDER, xrender >= 0, [old_xrender_found_with_pkgconfig=yes],
PKG_CHECK_MODULES(XRENDER, xrender >= 0, [old_xrender_found_with_pkgconfig=yes],
[old_xrender_found_with_pkgconfig=no])
case "$old_xrender_found_with_pkgconfig" in
yes)
......@@ -97,13 +97,13 @@ esac
# Check freetype configuration
AC_ARG_WITH(freetype-config, [ --with-freetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=auto)
if test "$freetype_config" = "auto"; then
PKG_CHECK_MODULES(FREETYPE, freetype2,
PKG_CHECK_MODULES(FREETYPE, freetype2,
freetype_config=no, freetype_config=yes)
fi
if test "$freetype_config" = "yes"; then
if test "$freetype_config" = "yes"; then
AC_PATH_PROG(ft_config,freetype-config,no)
if test "$ft_config" = "no"; then
AC_MSG_ERROR([You must have freetype installed; see http://www.freetype.org/])
......@@ -112,7 +112,7 @@ else
ft_config="$freetype_config"
fi
if test "$freetype_config" != "no"; then
if test "$freetype_config" != "no"; then
FREETYPE_CFLAGS="`$ft_config --cflags`"
FREETYPE_LIBS="`$ft_config --libs`"
fi
......
......@@ -104,7 +104,7 @@ typedef struct _XftGlyphFontSpec {
_XFUNCPROTOBEGIN
/* xftcolor.c */
Bool
XftColorAllocName (Display *dpy,
......@@ -129,13 +129,13 @@ XftColorFree (Display *dpy,
/* xftdpy.c */
Bool
XftDefaultHasRender (Display *dpy);
Bool
XftDefaultSet (Display *dpy, FcPattern *defaults);
void
XftDefaultSubstitute (Display *dpy, int screen, FcPattern *pattern);
/* xftdraw.c */
XftDraw *
......@@ -149,7 +149,7 @@ XftDrawCreateBitmap (Display *dpy,
Pixmap bitmap);
XftDraw *
XftDrawCreateAlpha (Display *dpy,
XftDrawCreateAlpha (Display *dpy,
Pixmap pixmap,
int depth);
......@@ -191,7 +191,7 @@ void
XftDrawString8 (XftDraw *draw,
_Xconst XftColor *color,
XftFont *pub,
int x,
int x,
int y,
_Xconst FcChar8 *string,
int len);
......@@ -218,7 +218,7 @@ void
XftDrawStringUtf8 (XftDraw *draw,
_Xconst XftColor *color,
XftFont *pub,
int x,
int x,
int y,
_Xconst FcChar8 *string,
int len);
......@@ -262,7 +262,7 @@ XftDrawGlyphFontSpec (XftDraw *draw,
void
XftDrawRect (XftDraw *draw,
_Xconst XftColor *color,
int x,
int x,
int y,
unsigned int width,
unsigned int height);
......@@ -296,35 +296,35 @@ XftGlyphExtents (Display *dpy,
void
XftTextExtents8 (Display *dpy,
XftFont *pub,
_Xconst FcChar8 *string,
_Xconst FcChar8 *string,
int len,
XGlyphInfo *extents);
void
XftTextExtents16 (Display *dpy,
XftFont *pub,
_Xconst FcChar16 *string,
_Xconst FcChar16 *string,
int len,
XGlyphInfo *extents);
void
XftTextExtents32 (Display *dpy,
XftFont *pub,
_Xconst FcChar32 *string,
_Xconst FcChar32 *string,
int len,
XGlyphInfo *extents);
void
XftTextExtentsUtf8 (Display *dpy,
XftFont *pub,
_Xconst FcChar8 *string,
_Xconst FcChar8 *string,
int len,
XGlyphInfo *extents);
void
XftTextExtentsUtf16 (Display *dpy,
XftFont *pub,
_Xconst FcChar8 *string,
_Xconst FcChar8 *string,
FcEndian endian,
int len,
XGlyphInfo *extents);
......@@ -366,8 +366,8 @@ FcBool
XftFontInfoEqual (_Xconst XftFontInfo *a, _Xconst XftFontInfo *b);
XftFont *
XftFontOpenInfo (Display *dpy,
FcPattern *pattern,
XftFontOpenInfo (Display *dpy,
FcPattern *pattern,
XftFontInfo *fi);
XftFont *
......@@ -410,12 +410,12 @@ FcBool
XftCharExists (Display *dpy,
XftFont *pub,
FcChar32 ucs4);
FT_UInt
XftCharIndex (Display *dpy,
XftCharIndex (Display *dpy,
XftFont *pub,
FcChar32 ucs4);
/* xftinit.c */
FcBool
XftInit (_Xconst char *config);
......@@ -431,7 +431,7 @@ XftListFonts (Display *dpy,
...) _X_SENTINEL(0);
/* xftname.c */
FcPattern
FcPattern
*XftNameParse (_Xconst char *name);
/* xftrender.c */
......@@ -465,7 +465,7 @@ XftCharSpecRender (Display *dpy,
Picture src,
XftFont *pub,
Picture dst,
int srcx,
int srcx,
int srcy,
_Xconst XftCharSpec *chars,
int len);
......@@ -611,7 +611,7 @@ XftTextRenderUtf16 (Display *dpy,
/* xftxlfd.c */
FcPattern *
XftXlfdParse (_Xconst char *xlfd_orig, Bool ignore_scalable, Bool complete);
_XFUNCPROTOEND
#endif /* _XFT_H_ */
......@@ -30,7 +30,7 @@ XftColorAllocName (Display *dpy,
XftColor *result)
{
XColor screen, exact;
if (!XAllocNamedColor (dpy, cmap, name, &screen, &exact))
{
/* XXX stick standard colormap stuff here */
......@@ -97,7 +97,7 @@ XftColorAllocValue (Display *dpy,
else
{
XColor xcolor;
xcolor.red = color->red;
xcolor.green = color->green;
xcolor.blue = color->blue;
......@@ -112,7 +112,7 @@ XftColorAllocValue (Display *dpy,
return True;
}
_X_EXPORT void
_X_EXPORT void
XftColorFree (Display *dpy,
Visual *visual,
Colormap cmap,
......
......@@ -25,7 +25,7 @@
_X_HIDDEN void
XftRectCore (XftDraw *draw,
_Xconst XftColor *color,
int x,
int x,
int y,
unsigned int width,
unsigned int height)
......@@ -63,10 +63,10 @@ _XftSharpGlyphMono (XftDraw *draw,
src = srcLine;
srcLine += stride;
w = width;
bitsMask = 0x80; /* FreeType is always MSB first */
bits = *src++;
xspan = x;
while (w)
{
......@@ -85,7 +85,7 @@ _XftSharpGlyphMono (XftDraw *draw,
bitsMask = 0x80;
}
} while (bits & bitsMask);
XFillRectangle (draw->dpy, draw->drawable,
XFillRectangle (draw->dpy, draw->drawable,
draw->core.gc, xspan, y, lenspan, 1);
xspan += lenspan;
w -= lenspan;
......@@ -135,7 +135,7 @@ _XftSharpGlyphGray (XftDraw *draw,
src = srcLine;
srcLine += stride;
w = width;
bits = *src++;
xspan = x;
while (w)
......@@ -150,7 +150,7 @@ _XftSharpGlyphGray (XftDraw *draw,
break;
bits = *src++;
} while (bits >= 0x80);
XFillRectangle (draw->dpy, draw->drawable,
XFillRectangle (draw->dpy, draw->drawable,
draw->core.gc, xspan, y, lenspan, 1);
xspan += lenspan;
w -= lenspan;
......@@ -191,7 +191,7 @@ _XftSharpGlyphRgba (XftDraw *draw,
src = srcLine;
srcLine += stride;
w = width;
bits = *src++;
xspan = x;
while (w)
......@@ -206,7 +206,7 @@ _XftSharpGlyphRgba (XftDraw *draw,
break;
bits = *src++;
} while (bits >= 0x80000000);
XFillRectangle (draw->dpy, draw->drawable,
XFillRectangle (draw->dpy, draw->drawable,
draw->core.gc, xspan, y, lenspan, 1);
xspan += lenspan;
w -= lenspan;
......@@ -257,7 +257,7 @@ _XftSharpGlyphFind (XftDraw *draw, XftFont *public)
/*
* Primitives for converting between RGB values and TrueColor pixels
*/
static void
_XftExamineBitfield (unsigned long mask, int *shift, int *len)
{
......@@ -283,7 +283,7 @@ static CARD32
_XftGetField (unsigned long l_pixel, int shift, int len)
{
CARD32 pixel = (CARD32) l_pixel;
pixel = pixel & (((1 << (len)) - 1) << shift);
pixel = pixel << (32 - (shift + len)) >> 24;
while (len < 8)
......@@ -346,10 +346,10 @@ _XftSmoothGlyphMono (XImage *image,
src = srcLine;
srcLine += stride;
w = width;
bitsMask = 0x80; /* FreeType is always MSB first */
bits = *src++;
xspan = x;
while (w--)
{
......@@ -465,7 +465,7 @@ _XftSmoothGlyphGray8888 (XImage *image,
int w;
srca = color->color.alpha >> 8;
/* This handles only RGB and BGR */
g = (color->color.green & 0xff00);
if (image->red_mask == 0xff0000)
......@@ -479,10 +479,10 @@ _XftSmoothGlyphGray8888 (XImage *image,
b = (color->color.blue & 0xff00) << 8;
}
src = (srca << 24) | r | g | b;
width = xftg->metrics.width;
height = xftg->metrics.height;
x -= xftg->metrics.x;
y -= xftg->metrics.y;
......@@ -490,7 +490,7 @@ _XftSmoothGlyphGray8888 (XImage *image,
dstStride = image->bytes_per_line >> 2;
maskLine = (unsigned char *) xftg->bitmap;
maskStride = (width + 3) & ~3;
while (height--)
{
dst = dstLine;
......@@ -536,7 +536,7 @@ _XftSmoothGlyphGray565 (XImage *image,
int w;
srca = color->color.alpha >> 8;
/* This handles only RGB and BGR */
g = (color->color.green & 0xff00);
if (image->red_mask == 0xf800)
......@@ -550,10 +550,10 @@ _XftSmoothGlyphGray565 (XImage *image,
b = (color->color.blue & 0xff00) << 8;
}
src = (srca << 24) | r | g | b;
width = xftg->metrics.width;
height = xftg->metrics.height;
x -= xftg->metrics.x;
y -= xftg->metrics.y;
......@@ -561,7 +561,7 @@ _XftSmoothGlyphGray565 (XImage *image,
dstStride = image->bytes_per_line >> 1;
maskLine = (unsigned char *) xftg->bitmap;
maskStride = (width + 3) & ~3;
while (height--)
{
dst = dstLine;
......@@ -612,7 +612,7 @@ _XftSmoothGlyphGray555 (XImage *image,
int w;
srca = color->color.alpha >> 8;
/* This handles only RGB and BGR */
g = (color->color.green & 0xff00);
if (image->red_mask == 0xf800)
......@@ -626,10 +626,10 @@ _XftSmoothGlyphGray555 (XImage *image,
b = (color->color.blue & 0xff00) << 8;
}
src = (srca << 24) | r | g | b;
width = xftg->metrics.width;
height = xftg->metrics.height;
x -= xftg->metrics.x;
y -= xftg->metrics.y;
......@@ -637,7 +637,7 @@ _XftSmoothGlyphGray555 (XImage *image,
dstStride = image->bytes_per_line >> 1;
maskLine = (unsigned char *) xftg->bitmap;
maskStride = (width + 3) & ~3;
while (height--)
{
dst = dstLine;
......@@ -688,7 +688,7 @@ _XftSmoothGlyphGray (XImage *image,
unsigned long pixel;
int width, height;
int w, tx;
srca = color->color.alpha >> 8;
src = (srca << 24 |
(color->color.red & 0xff00) << 8 |
......@@ -698,7 +698,7 @@ _XftSmoothGlyphGray (XImage *image,
y -= xftg->metrics.y;
width = xftg->metrics.width;
height = xftg->metrics.height;
maskLine = (unsigned char *) xftg->bitmap;
maskStride = (width + 3) & ~3;
......@@ -711,7 +711,7 @@ _XftSmoothGlyphGray (XImage *image,
maskLine += maskStride;
w = width;
tx = x;
while (w--)
{
m = *mask++;
......@@ -766,7 +766,7 @@ _XftSmoothGlyphRgba (XImage *image,
unsigned long pixel;
int width, height;
int w, tx;
srca = color->color.alpha >> 8;
src = (srca << 24 |
(color->color.red & 0xff00) << 8 |
......@@ -776,7 +776,7 @@ _XftSmoothGlyphRgba (XImage *image,
y -= xftg->metrics.y;
width = xftg->metrics.width;
height = xftg->metrics.height;
mask = (CARD32 *) xftg->bitmap;
_XftExamineBitfield (image->red_mask, &r_shift, &r_len);
......@@ -786,7 +786,7 @@ _XftSmoothGlyphRgba (XImage *image,
{
w = width;
tx = x;
while (w--)
{
ma = *mask++;
......@@ -849,7 +849,7 @@ _XftSmoothGlyphPossible (XftDraw *draw)
return FcTrue;
}
typedef void (*XftSmoothGlyph) (XImage *image,
typedef void (*XftSmoothGlyph) (XImage *image,
_Xconst XftGlyph *xftg,
int x,
int y,
......@@ -960,7 +960,7 @@ XftGlyphCore (XftDraw *draw,
glyphs_loaded = FcTrue;
if (nmissing)
XftFontLoadGlyphs (dpy, public, FcTrue, missing, nmissing);
g = glyphs;
n = nglyphs;
if ((font->info.antialias || color->color.alpha != 0xffff) &&
......@@ -971,7 +971,7 @@ XftGlyphCore (XftDraw *draw,
unsigned int depth;
int ox, oy;
XftSmoothGlyph smooth = _XftSmoothGlyphFind (draw, public);
XftGlyphExtents (dpy, public, glyphs, nglyphs, &gi);
if (!gi.width || !gi.height)
goto bail1;
......@@ -1090,7 +1090,7 @@ XftGlyphSpecCore (XftDraw *draw,
{
XGlyphInfo gi;
int g_x1, g_x2, g_y1, g_y2;
nmissing = 0;
if (XftFontCheckGlyph (dpy, public, FcTrue, glyphs[i].glyph, missing, &nmissing))
glyphs_loaded = FcTrue;
......@@ -1121,7 +1121,7 @@ XftGlyphSpecCore (XftDraw *draw,
y2 = g_y2;
}
}
if (x1 == x2 || y1 == y2)
goto bail1;
......@@ -1186,7 +1186,7 @@ XftGlyphSpecCore (XftDraw *draw,
xftg = _XftGlyphDefault (dpy, public);
if (xftg)
{
(*smooth) (image, xftg, glyphs[i].x - x1,
(*smooth) (image, xftg, glyphs[i].x - x1,
glyphs[i].y - y1, color);
}
}
......@@ -1238,13 +1238,13 @@ XftGlyphFontSpecCore (XftDraw *draw,
XftFont *public = glyphs[i].font;
XGlyphInfo gi;
int g_x1, g_x2, g_y1, g_y2;
nmissing = 0;
if (XftFontCheckGlyph (dpy, public, FcTrue, glyphs[i].glyph, missing, &nmissing))
glyphs_loaded = FcTrue;
if (nmissing)
XftFontLoadGlyphs (dpy, public, FcTrue, missing, nmissing);
XftGlyphExtents (dpy, public, &glyphs[i].glyph, 1, &gi);
g_x1 = glyphs[i].x - gi.x;
g_y1 = glyphs[i].y - gi.y;
......@@ -1279,14 +1279,14 @@ XftGlyphFontSpecCore (XftDraw *draw,
y2 = g_y2;
}
}
if (x1 == x2 || y1 == y2)
goto bail1;
for (i = 0; i < nglyphs; i++)
if (((XftFontInt *) glyphs[i].font)->info.antialias)
break;
if ((i != nglyphs || color->color.alpha != 0xffff) &&
_XftSmoothGlyphPossible (draw))
{
......@@ -1346,12 +1346,12 @@ XftGlyphFontSpecCore (XftDraw *draw,
XftFontInt *font = (XftFontInt *) public;
XftSmoothGlyph smooth = _XftSmoothGlyphFind (draw, public);
FT_UInt glyph = glyphs[i].glyph;
if (glyph >= font->num_glyphs || !(xftg = font->glyphs[glyph]))
xftg = _XftGlyphDefault (dpy, public);
if (xftg)
{
(*smooth) (image, xftg, glyphs[i].x - x1,
(*smooth) (image, xftg, glyphs[i].x - x1,
glyphs[i].y - y1, color);
}
}
......@@ -1369,7 +1369,7 @@ XftGlyphFontSpecCore (XftDraw *draw,
XftFontInt *font = (XftFontInt *) public;
XftSharpGlyph sharp = _XftSharpGlyphFind (draw, public);
FT_UInt glyph = glyphs[i].glyph;
if (glyph >= font->num_glyphs || !(xftg = font->glyphs[glyph]))
xftg = _XftGlyphDefault (dpy, public);
if (xftg)
......
......@@ -32,19 +32,19 @@ _XftCloseDisplay (Display *dpy, XExtCodes *codes)
info = _XftDisplayInfoGet (dpy, FcFalse);
if (!info)
return 0;
/*
* Get rid of any dangling unreferenced fonts
*/
info->max_unref_fonts = 0;
XftFontManageMemory (dpy);
/*
* Clean up the default values
*/
if (info->defaults)
FcPatternDestroy (info->defaults);
/*
* Unhook from the global list
*/
......@@ -52,7 +52,7 @@ _XftCloseDisplay (Display *dpy, XExtCodes *codes)
if (info->display == dpy)
break;
*prev = info->next;
free (info);
return 0;
}
......@@ -126,8 +126,8 @@ _XftDisplayInfoGet (Display *dpy, FcBool createIfNecessary)
{
Visual *visual = DefaultVisual (dpy, DefaultScreen (dpy));
XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
printf ("XftDisplayInfoGet Default visual 0x%x ",
printf ("XftDisplayInfoGet Default visual 0x%x ",
(int) visual->visualid);
if (format)
{
......@@ -146,7 +146,7 @@ _XftDisplayInfoGet (Display *dpy, FcBool createIfNecessary)
}
else
printf ("No Render format for default visual\n");
printf ("XftDisplayInfoGet initialized, hasRender set to \"%s\"\n",
info->hasRender ? "True" : "False");
}
......@@ -156,7 +156,7 @@ _XftDisplayInfoGet (Display *dpy, FcBool createIfNecessary)
info->colors[i].pict = 0;
}
info->fonts = NULL;
info->next = _XftDisplayInfo;
_XftDisplayInfo = info;
......@@ -167,7 +167,7 @@ _XftDisplayInfoGet (Display *dpy, FcBool createIfNecessary)
if (XftDebug () & XFT_DBG_CACHE)
printf ("global max cache memory %ld\n", info->max_glyph_memory);
info->num_unref_fonts = 0;
info->max_unref_fonts = XftDefaultGetInteger (dpy,
XFT_MAX_UNREF_FONTS, 0,
......@@ -177,7 +177,7 @@ _XftDisplayInfoGet (Display *dpy, FcBool createIfNecessary)
memset (info->fontHash, '\0', sizeof (XftFont *) * XFT_NUM_FONT_HASH);
return info;
bail1:
free (info);
bail0:
......@@ -387,9 +387,9 @@ _XftDefaultInit (Display *dpy)
goto bail1;
if (!_XftDefaultInitInteger (dpy, pat, XFT_MAX_GLYPH_MEMORY))
goto bail1;
return pat;
bail1:
FcPatternDestroy (pat);
bail0:
......@@ -404,7 +404,7 @@ _XftDefaultGet (Display *dpy, const char *object, int screen, FcValue *v)
if (!info)
return FcResultNoMatch;
if (!info->defaults)
{
info->defaults = _XftDefaultInit (dpy);
......@@ -462,7 +462,7 @@ XftDefaultSubstitute (Display *dpy, int screen, FcPattern *pattern)
if (FcPatternGet (pattern, XFT_RENDER, 0, &v) == FcResultNoMatch)
{
FcPatternAddBool (pattern, XFT_RENDER,
XftDefaultGetBool (dpy, XFT_RENDER, screen,
XftDefaultGetBool (dpy, XFT_RENDER, screen,
XftDefaultHasRender (dpy)));
}
if (FcPatternGet (pattern, FC_ANTIALIAS, 0, &v) == FcResultNoMatch)
......@@ -518,7 +518,7 @@ XftDefaultSubstitute (Display *dpy, int screen, FcPattern *pattern)
}
#endif
FcPatternAddInteger (pattern, FC_RGBA,
XftDefaultGetInteger (dpy, FC_RGBA, screen,
XftDefaultGetInteger (dpy, FC_RGBA, screen,
subpixel));
}
if (FcPatternGet (pattern, FC_MINSPACE, 0, &v) == FcResultNoMatch)
......@@ -529,10 +529,10 @@ XftDefaultSubstitute (Display *dpy, int screen, FcPattern *pattern)
}
if (FcPatternGet (pattern, FC_DPI, 0, &v) == FcResultNoMatch)
{
dpi = (((double) DisplayHeight (dpy, screen) * 25.4) /
dpi = (((double) DisplayHeight (dpy, screen) * 25.4) /
(double) DisplayHeightMM (dpy, screen));
FcPatternAddDouble (pattern, FC_DPI,
XftDefaultGetDouble (dpy, FC_DPI, screen,
FcPatternAddDouble (pattern, FC_DPI,
XftDefaultGetDouble (dpy, FC_DPI, screen,
dpi));
}
if (FcPatternGet (pattern, FC_SCALE, 0, &v) == FcResultNoMatch)
......
......@@ -88,7 +88,7 @@ XftDrawDepth (XftDraw *draw)
Window root;
int x, y;
unsigned int width, height, borderWidth, depth;
if (XGetGeometry (draw->dpy, draw->drawable,
if (XGetGeometry (draw->dpy, draw->drawable,
&root, &x, &y, &width, &height,
&borderWidth, &depth))
draw->depth = depth;
......@@ -104,7 +104,7 @@ XftDrawBitsPerPixel (XftDraw *draw)
XPixmapFormatValues *formats;
int nformats;
unsigned int depth;
if ((depth = XftDrawDepth (draw)) &&
(formats = XListPixmapFormats (draw->dpy, &nformats)))
{
......@@ -135,7 +135,7 @@ XftDrawCreate (Display *dpy,
draw = (XftDraw *) malloc (sizeof (XftDraw));
if (!draw)
return NULL;
draw->dpy = dpy;
draw->drawable = drawable;
draw->screen = _XftDrawScreen (dpy, drawable, visual);
......@@ -303,7 +303,7 @@ XftDrawSrcPicture (XftDraw *draw, _Xconst XftColor *color)
if (!info || !info->solidFormat)
return 0;
/*
* Monochrome targets require special handling; the PictOp controls
* the color, and the color must be opaque
......@@ -322,9 +322,9 @@ XftDrawSrcPicture (XftDraw *draw, _Xconst XftColor *color)
*/
for (i = 0; i < XFT_NUM_SOLID_COLOR; i++)
{
if (info->colors[i].pict &&
if (info->colors[i].pict &&
info->colors[i].screen == draw->screen &&
!memcmp ((void *) &color->color,
!memcmp ((void *) &color->color,
(void *) &info->colors[i].color,
sizeof (XRenderColor)))
return info->colors[i].pict;
......@@ -348,7 +348,7 @@ XftDrawSrcPicture (XftDraw *draw, _Xconst XftColor *color)
{
Pixmap pix;
XRenderPictureAttributes pa;
pix = XCreatePixmap (dpy, RootWindow (dpy, draw->screen), 1, 1,
info->solidFormat->depth);
pa.repeat = True;
......@@ -391,7 +391,7 @@ _XftDrawRenderPrepare (XftDraw *draw)
format = _XftDrawFormat (draw);
if (!format)
return FcFalse;
if (draw->subwindow_mode == IncludeInferiors)
{
pa.subwindow_mode = IncludeInferiors;
......@@ -454,7 +454,7 @@ _XftDrawCorePrepare (XftDraw *draw, _Xconst XftColor *color)
XSetForeground (draw->dpy, draw->core.gc, color->pixel);
return FcTrue;
}
_X_EXPORT Picture
XftDrawPicture (XftDraw *draw)
{
......@@ -479,7 +479,7 @@ XftDrawGlyphs (XftDraw *draw,
if (font->format)
{
Picture src;
if (_XftDrawRenderPrepare (draw) &&
(src = XftDrawSrcPicture (draw, color)))
XftGlyphRender (draw->dpy, _XftDrawOp (draw, color),
......@@ -497,7 +497,7 @@ _X_EXPORT void
XftDrawString8 (XftDraw *draw,
_Xconst XftColor *color,
XftFont *pub,
int x,
int x,
int y,
_Xconst FcChar8 *string,
int len)
......@@ -507,7 +507,7 @@ XftDrawString8 (XftDraw *draw,
if (XftDebug () & XFT_DBG_DRAW)
printf ("DrawString \"%*.*s\"\n", len, len, string);