--- rxvt-unicode/src/scrollbar-xterm.C	2006/02/02 18:04:46	1.20
+++ rxvt-unicode/src/scrollbar-xterm.C	2007/12/29 14:43:44	1.28
@@ -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
@@ -49,7 +49,7 @@
         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 (dpy, scrollBar.win,
@@ -59,17 +59,18 @@
       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 (dpy, scrollBar.win,
-                   sb_shadow + xsb, last_top,
+                   scrollBar.shadow + xsb, last_top,
                    sbwidth, (scrollBar.top - last_top), False);
 
       if (scrollBar.bot < last_bot)
         XClearArea (dpy, scrollBar.win,
-                   sb_shadow + xsb, scrollBar.bot,
+                   scrollBar.shadow + xsb, scrollBar.bot,
                    sbwidth, (last_bot - scrollBar.bot), False);
     }
   else
@@ -84,5 +85,5 @@
             xsb ? 0 : sbwidth, scrollBar.end);
   return 1;
 }
-#endif				/* XTERM_SCROLLBAR */
+#endif /* XTERM_SCROLLBAR */
 /*----------------------- end-of-file (C source) -----------------------*/