--- rxvt-unicode/src/scrollbar-rxvt.C	2004/02/01 01:34:41	1.6
+++ rxvt-unicode/src/scrollbar-rxvt.C	2004/02/09 07:11:49	1.7
@@ -66,17 +66,17 @@
       pt[0].y = pt[1].y = y;
       pt[2].y = y + sz - 1;
     }
-  XFillPolygon(Xdisplay, scrollBar.win, scrollbarGC,
+  XFillPolygon(display->display, scrollBar.win, scrollbarGC,
                pt, 3, Convex, CoordModeOrigin);
 
   /* draw base */
-  XDrawLine(Xdisplay, scrollBar.win, (dirn == UP ? bot : top),
+  XDrawLine(display->display, scrollBar.win, (dirn == UP ? bot : top),
             pt[0].x, pt[0].y, pt[1].x, pt[1].y);
 
   /* draw shadow on left */
   pt[1].x = x + sz2 - 1;
   pt[1].y = y + (dirn == UP ? 0 : sz - 1);
-  XDrawLine(Xdisplay, scrollBar.win, top,
+  XDrawLine(display->display, scrollBar.win, top,
             pt[0].x, pt[0].y, pt[1].x, pt[1].y);
 
 #if (SHADOW > 1)
@@ -92,7 +92,7 @@
       pt[0].y++;
       pt[1].y--;
     }
-  XDrawLine(Xdisplay, scrollBar.win, top,
+  XDrawLine(display->display, scrollBar.win, top,
             pt[0].x, pt[0].y, pt[1].x, pt[1].y);
 #endif
   /* draw shadow on right */
@@ -100,7 +100,7 @@
   /*  pt[2].x = x + sz2; */
   pt[1].y = y + (dirn == UP ? sz - 1 : 0);
   pt[2].y = y + (dirn == UP ? 0 : sz - 1);
-  XDrawLine(Xdisplay, scrollBar.win, bot,
+  XDrawLine(display->display, scrollBar.win, bot,
             pt[2].x, pt[2].y, pt[1].x, pt[1].y);
 #if (SHADOW > 1)
   /* doubled */
@@ -115,7 +115,7 @@
       pt[2].y--;
       pt[1].y++;
     }
-  XDrawLine(Xdisplay, scrollBar.win, bot,
+  XDrawLine(display->display, scrollBar.win, bot,
             pt[2].x, pt[2].y, pt[1].x, pt[1].y);
 #endif
 }
@@ -134,22 +134,22 @@
       gcvalue.foreground = PixColors[Color_trough];
       if (sbshadow)
         {
-          XSetWindowBackground(Xdisplay, scrollBar.win,
+          XSetWindowBackground(display->display, scrollBar.win,
                                gcvalue.foreground);
-          XClearWindow(Xdisplay, scrollBar.win);
+          XClearWindow(display->display, scrollBar.win);
         }
     }
   else
     {
-      /* instead of XClearWindow (Xdisplay, scrollBar.win); */
+      /* instead of XClearWindow (display->display, scrollBar.win); */
       if (last_top < scrollBar.top)
-        XClearArea(Xdisplay, scrollBar.win,
+        XClearArea(display->display, scrollBar.win,
                    sbshadow, last_top,
                    sbwidth, (scrollBar.top - last_top),
                    False);
 
       if (scrollBar.bot < last_bot)
-        XClearArea(Xdisplay, scrollBar.win,
+        XClearArea(display->display, scrollBar.win,
                    sbshadow, scrollBar.bot,
                    sbwidth, (last_bot - scrollBar.bot),
                    False);
@@ -165,23 +165,23 @@
     else
       xofs = sbshadow ? sbwidth : sbwidth - 1;
 
-    XDrawLine(Xdisplay, scrollBar.win, botShadowGC,
+    XDrawLine(display->display, scrollBar.win, botShadowGC,
               xofs, 0, xofs, scrollBar.end + sbwidth);
   }
 #endif
-  XFillRectangle(Xdisplay, scrollBar.win, scrollbarGC,
+  XFillRectangle(display->display, scrollBar.win, scrollbarGC,
                  sbshadow, scrollBar.top, sbwidth,
                  scrollbar_len);
 
   if (sbshadow)
     /* trough shadow */
-    rxvt_Draw_Shadow(Xdisplay, scrollBar.win,
+    rxvt_Draw_Shadow(display->display, scrollBar.win,
                      botShadowGC, topShadowGC,
                      0, 0,
                      sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth() */
                      scrollBar.end + (sbwidth + 1) + sbshadow);
   /* shadow for scrollbar slider */
-  rxvt_Draw_Shadow(Xdisplay, scrollBar.win,
+  rxvt_Draw_Shadow(display->display, scrollBar.win,
                    topShadowGC, botShadowGC,
                    sbshadow, scrollBar.top, sbwidth,
                    scrollbar_len);