--- rxvt-unicode/src/scrollbar-plain.C	2004/08/23 19:57:33	1.13
+++ rxvt-unicode/src/scrollbar-plain.C	2006/01/31 19:20:59	1.17
@@ -40,30 +40,29 @@
       scrollBar.init |= R_SB_PLAIN;
       gcvalue.foreground = pix_colors_focused[Color_scroll];
 
-      pscrollbarGC = XCreateGC (display->display, scrollBar.win,
-                                GCForeground, &gcvalue);
+      pscrollbarGC = XCreateGC (xdisp, scrollBar.win, GCForeground, &gcvalue);
     }
 
-  xsb = (options & Opt_scrollBar_right) ? 1 : 0;
+  xsb = OPTION (Opt_scrollBar_right) ? 1 : 0;
 
   if (update)
     {
       if (last_top < scrollBar.top)
-        XClearArea (display->display, scrollBar.win,
-                    sb_shadow + xsb, last_top,
+        XClearArea (xdisp, scrollBar.win,
+                    sb_shadow, last_top,
                     sbwidth + 1, (scrollBar.top - last_top), False);
 
       if (scrollBar.bot < last_bot)
-        XClearArea (display->display, scrollBar.win,
-                    sb_shadow + xsb, scrollBar.bot,
+        XClearArea (xdisp, scrollBar.win,
+                    sb_shadow, scrollBar.bot,
                     sbwidth + 1, (last_bot - scrollBar.bot), False);
     }
   else
-    XClearWindow (display->display, scrollBar.win);
+    XClearWindow (xdisp, scrollBar.win);
 
   /* scrollbar slider */
-  XFillRectangle (display->display, scrollBar.win, pscrollbarGC,
-                  xsb + 1, scrollBar.top, sbwidth, scrollbar_len);
+  XFillRectangle (xdisp, scrollBar.win, pscrollbarGC,
+                  1 - xsb, scrollBar.top, sbwidth, scrollbar_len);
 
   return 1;
 }