--- rxvt-unicode/src/scrollbar-xterm.C	2004/08/23 19:57:33	1.17
+++ rxvt-unicode/src/scrollbar-xterm.C	2006/02/02 18:04:46	1.20
@@ -42,7 +42,7 @@
       XGCValues       gcvalue;
 
       scrollBar.init |= R_SB_XTERM;
-      gcvalue.stipple = XCreateBitmapFromData (display->display, scrollBar.win,
+      gcvalue.stipple = XCreateBitmapFromData (dpy, scrollBar.win,
                                               (char *)x_stp_bits, x_stp_width,
                                               x_stp_height);
       if (!gcvalue.stipple)
@@ -52,34 +52,34 @@
       gcvalue.foreground = pix_colors_focused[Color_fg];
       gcvalue.background = pix_colors_focused[Color_bg];
 
-      xscrollbarGC = XCreateGC (display->display, scrollBar.win,
+      xscrollbarGC = XCreateGC (dpy, scrollBar.win,
                                 GCForeground | GCBackground
                                 | GCFillStyle | GCStipple, &gcvalue);
       gcvalue.foreground = pix_colors_focused[Color_border];
-      ShadowGC = XCreateGC (display->display, scrollBar.win, GCForeground, &gcvalue);
+      ShadowGC = XCreateGC (dpy, scrollBar.win, GCForeground, &gcvalue);
     }
 
   if (update)
     {
-      xsb = (options & Opt_scrollBar_right) ? 1 : 0;
+      xsb = OPTION (Opt_scrollBar_right) ? 1 : 0;
       if (last_top < scrollBar.top)
-        XClearArea (display->display, scrollBar.win,
+        XClearArea (dpy, scrollBar.win,
                    sb_shadow + xsb, last_top,
                    sbwidth, (scrollBar.top - last_top), False);
 
       if (scrollBar.bot < last_bot)
-        XClearArea (display->display, scrollBar.win,
+        XClearArea (dpy, scrollBar.win,
                    sb_shadow + xsb, scrollBar.bot,
                    sbwidth, (last_bot - scrollBar.bot), False);
     }
   else
-    XClearWindow (display->display, scrollBar.win);
+    XClearWindow (dpy, scrollBar.win);
 
   /* scrollbar slider */
-  XFillRectangle (display->display, scrollBar.win, xscrollbarGC,
+  XFillRectangle (dpy, scrollBar.win, xscrollbarGC,
                  xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len);
 
-  XDrawLine (display->display, scrollBar.win, ShadowGC,
+  XDrawLine (dpy, scrollBar.win, ShadowGC,
             xsb ? 0 : sbwidth, scrollBar.beg,
             xsb ? 0 : sbwidth, scrollBar.end);
   return 1;