--- rxvt-unicode/src/rxvtfont.C	2006/01/25 21:03:04	1.87
+++ rxvt-unicode/src/rxvtfont.C	2006/01/25 21:09:21	1.88
@@ -159,7 +159,7 @@
 
 #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
 
-#define dTermDisplay Display *disp = term->display->display
+#define dTermDisplay Display *disp = term->xdisp
 #define dTermGC      GC gc = term->gc
 
 /////////////////////////////////////////////////////////////////////////////
@@ -506,8 +506,8 @@
 {
   unsigned long value;
 
-  if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value))
-    return XGetAtomName (term->display->display, value);
+  if (XGetFontProperty (f, XInternAtom (term->xdisp, property, 0), &value))
+    return XGetAtomName (term->xdisp, value);
   else
     return rxvt_strdup (repl);
 }
@@ -538,14 +538,14 @@
   unsigned long height;
 
 #if 0
-  if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height))
+  if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))
     return false;
 #else
   height = f->ascent + f->descent;
 #endif
 
   unsigned long avgwidth;
-  if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth))
+  if (!XGetFontProperty (f, XInternAtom (term->xdisp, "AVERAGE_WIDTH", 0), &avgwidth))
     avgwidth = 0;
 
   char *weight = get_property (f, "WEIGHT_NAME", "medium");
@@ -886,7 +886,7 @@
 {
   if (f)
     {
-      XFreeFont (term->display->display, f);
+      XFreeFont (term->xdisp, f);
       f = 0;
     }
 }
@@ -1068,7 +1068,7 @@
 {
   if (f)
     {
-      XftFontClose (term->display->display, f);
+      XftFontClose (term->xdisp, f);
       f = 0;
     }
 }
@@ -1245,7 +1245,7 @@
 {
   careful = false;
 
-  if (!XftCharExists (term->display->display, f, unicode))
+  if (!XftCharExists (term->xdisp, f, unicode))
     return false;
 
   if (!prop || prop->width == rxvt_fontprop::unset)
@@ -1254,7 +1254,7 @@
   // check character against base font bounding box
   FcChar32 ch = unicode;
   XGlyphInfo g;
-  XftTextExtents32 (term->display->display, f, &ch, 1, &g);
+  XftTextExtents32 (term->xdisp, f, &ch, 1, &g);
 
   int w = g.width - g.x;
   int wcw = WCWIDTH (unicode);
@@ -1562,7 +1562,7 @@
               //FcPatternAddBool    (p, FC_ANTIALIAS, 1);
 
               XftResult result;
-              FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result);
+              FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);
 
               FcPatternDestroy (p);