--- rxvt-unicode/src/scrollbar-xterm.C	2006/01/25 21:09:21	1.19
+++ rxvt-unicode/src/scrollbar-xterm.C	2008/02/17 19:07:20	1.30
@@ -1,10 +1,10 @@
-/*--------------------------------*-C-*---------------------------------*
+/*----------------------------------------------------------------------*
  * File:	scrollbar-xterm.C
  *----------------------------------------------------------------------*
  *
  * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
  * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
- * Copyright (c) 2004      Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,47 +42,48 @@
       XGCValues       gcvalue;
 
       scrollBar.init |= R_SB_XTERM;
-      gcvalue.stipple = XCreateBitmapFromData (xdisp, scrollBar.win,
-                                              (char *)x_stp_bits, x_stp_width,
-                                              x_stp_height);
+      gcvalue.stipple = XCreateBitmapFromData (dpy, scrollBar.win,
+                                               (char *)x_stp_bits, x_stp_width,
+                                               x_stp_height);
       if (!gcvalue.stipple)
         rxvt_fatal ("can't create bitmap\n");
 
       gcvalue.fill_style = FillOpaqueStippled;
-      gcvalue.foreground = pix_colors_focused[Color_fg];
+      gcvalue.foreground = pix_colors_focused[Color_scroll];
       gcvalue.background = pix_colors_focused[Color_bg];
 
-      xscrollbarGC = XCreateGC (xdisp, scrollBar.win,
+      xscrollbarGC = XCreateGC (dpy, scrollBar.win,
                                 GCForeground | GCBackground
                                 | GCFillStyle | GCStipple, &gcvalue);
       gcvalue.foreground = pix_colors_focused[Color_border];
-      ShadowGC = XCreateGC (xdisp, scrollBar.win, GCForeground, &gcvalue);
+      ShadowGC = XCreateGC (dpy, scrollBar.win, GCForeground, &gcvalue);
     }
 
+  xsb = option (Opt_scrollBar_right) ? 1 : 0;
+
   if (update)
     {
-      xsb = OPTION (Opt_scrollBar_right) ? 1 : 0;
       if (last_top < scrollBar.top)
-        XClearArea (xdisp, scrollBar.win,
-                   sb_shadow + xsb, last_top,
-                   sbwidth, (scrollBar.top - last_top), False);
+        XClearArea (dpy, scrollBar.win,
+                    xsb, last_top,
+                    sbwidth, (scrollBar.top - last_top), False);
 
       if (scrollBar.bot < last_bot)
-        XClearArea (xdisp, scrollBar.win,
-                   sb_shadow + xsb, scrollBar.bot,
-                   sbwidth, (last_bot - scrollBar.bot), False);
+        XClearArea (dpy, scrollBar.win,
+                    xsb, scrollBar.bot,
+                    sbwidth, (last_bot - scrollBar.bot), False);
     }
   else
-    XClearWindow (xdisp, scrollBar.win);
+    XClearWindow (dpy, scrollBar.win);
 
   /* scrollbar slider */
-  XFillRectangle (xdisp, scrollBar.win, xscrollbarGC,
-                 xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len);
+  XFillRectangle (dpy, scrollBar.win, xscrollbarGC,
+                  xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len);
 
-  XDrawLine (xdisp, scrollBar.win, ShadowGC,
-            xsb ? 0 : sbwidth, scrollBar.beg,
-            xsb ? 0 : sbwidth, scrollBar.end);
+  XDrawLine (dpy, scrollBar.win, ShadowGC,
+             xsb ? 0 : sbwidth, scrollBar.beg,
+             xsb ? 0 : sbwidth, scrollBar.end);
   return 1;
 }
-#endif				/* XTERM_SCROLLBAR */
+#endif /* XTERM_SCROLLBAR */
 /*----------------------- end-of-file (C source) -----------------------*/