--- bad/graphics/x11drv/xfont.c.orig	Wed May  1 09:42:32 2002
+++ bad/graphics/x11drv/xfont.c		Wed May  1 09:46:39 2002
@@ -78,6 +78,11 @@
 
 static fontAlias *aliasTable = NULL;
 
+static UINT XTextCaps = (TC_OP_CHARACTER | TC_OP_STROKE | TC_CP_STROKE | TC_CR_ANY |
+                         TC_SA_DOUBLE | TC_SA_INTEGER | TC_SA_CONTIN |
+                         TC_UA_ABLE | TC_SO_ABLE | TC_RA_ABLE);
+                         /* X11R6 adds TC_SF_X_YINDEP, maybe more... */
+
 static const char*	INIFontMetrics = "cachedmetrics.";
 static const char*	INIFontSection = "Software\\Wine\\Wine\\Config\\fonts";
 static const char*	INIAliasSection = "Alias";
@@ -948,7 +953,7 @@
        aLFD.resolution_x = resx_string;
 
        strcpy(resy_string, resx_string);
-       if( uRelax == 0  && text_caps & TC_SF_X_YINDEP ) 
+       if( uRelax == 0  && XTextCaps & TC_SF_X_YINDEP ) 
        {
 	   if( fo->lf.lfWidth && !(fo->fo_flags & FO_SYNTH_WIDTH))
 	   {
@@ -2424,7 +2429,7 @@
    fontInfo*    pfi = pfm->pfi;         /* device font to match */
    LPLOGFONT16  plf = pfm->plf;         /* wanted logical font */
    UINT       penalty = 0;
-   BOOL       bR6 = pfm->flags & FO_MATCH_XYINDEP;    /* from text_caps */
+   BOOL       bR6 = pfm->flags & FO_MATCH_XYINDEP;    /* from XTextCaps */
    BOOL       bScale = pfi->fi_flags & FI_SCALABLE;
    int d = 0, height;
 
@@ -2947,7 +2952,7 @@
       strcpy(buffer, "-*-*-*-*-normal-*-[12 0 0 12]-*-72-*-*-*-iso8859-1");
       if( (x_fs = TSXLoadQueryFont(gdi_display, buffer)) )
       {
-	  text_caps |= TC_SF_X_YINDEP;
+	  XTextCaps |= TC_SF_X_YINDEP;
 	  TSXFreeFont(gdi_display, x_fs);
       }
   }
@@ -2980,7 +2985,7 @@
   XFONT_GetPointResolution( log_pixels_x, log_pixels_y );
 
   if(X11DRV_XRender_Installed)
-    text_caps |= TC_VA_ABLE;
+    XTextCaps |= TC_VA_ABLE;
 
   return;
 }
@@ -3055,7 +3060,7 @@
 	fm.plf = plf;
 	fm.internal_charset = internal_charset;
 
-	if( text_caps & TC_SF_X_YINDEP ) fm.flags = FO_MATCH_XYINDEP;
+	if( XTextCaps & TC_SF_X_YINDEP ) fm.flags = FO_MATCH_XYINDEP;
 
 	/* allocate new font cache entry */