--- rxvt-unicode/src/scrollbar.C	2004/08/15 22:09:24	1.19
+++ rxvt-unicode/src/scrollbar.C	2005/01/02 10:55:43	1.25
@@ -37,18 +37,20 @@
   int             change = 0;
 
 #ifdef HAVE_SCROLLBARS
-  if (map && !scrollbar_visible ())
+  if (map)
     {
       scrollBar.setIdle ();
+
       if (!scrollBar.win)
         resize_scrollbar ();
+
       if (scrollBar.win)
         {
           XMapWindow (display->display, scrollBar.win);
           change = 1;
         }
     }
-  else if (!map && scrollbar_visible ())
+  else
     {
       scrollBar.state = 0;
       XUnmapWindow (display->display, scrollBar.win);
@@ -68,10 +70,10 @@
 #define R_SCROLLEND_XTERM	szHint.height
 #define R_SCROLLBEG_NEXT	0
 #define R_SCROLLEND_NEXT	szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
-						    SB_PADDING)
+                                                    SB_PADDING)
 #define R_SCROLLBEG_RXVT	(scrollBar.width + 1) + sb_shadow
 #define R_SCROLLEND_RXVT	szHint.height - R_SCROLLBEG_RXVT - \
-				    (2 * sb_shadow)
+                                    (2 * sb_shadow)
 
 #if defined(PLAIN_SCROLLBAR)
   if (scrollBar.style == R_SB_PLAIN)
@@ -116,7 +118,7 @@
                                           szHint.height,
                                           0,
                                           pix_colors[Color_fg],
-                                          pix_colors[Color_bg]);
+                                          pix_colors[Color_border]);
 #ifdef DEBUG_X
       XStoreName (display->display, scrollBar.win, "scrollbar");
 #endif