--- rxvt-unicode/src/scrollbar.C	2004/08/15 22:09:24	1.19
+++ rxvt-unicode/src/scrollbar.C	2006/01/24 19:40:12	1.33
@@ -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)
@@ -110,16 +112,13 @@
     {
       /* create the scrollbar window */
       scrollBar.win = XCreateSimpleWindow (display->display,
-                                          TermWin.parent[0],
-                                          window_sb_x, 0,
-                                          scrollbar_TotalWidth (),
-                                          szHint.height,
-                                          0,
-                                          pix_colors[Color_fg],
-                                          pix_colors[Color_bg]);
-#ifdef DEBUG_X
-      XStoreName (display->display, scrollBar.win, "scrollbar");
-#endif
+                                           parent[0],
+                                           window_sb_x, 0,
+                                           scrollbar_TotalWidth (),
+                                           szHint.height,
+                                           0,
+                                           pix_colors[Color_fg],
+                                           pix_colors[Color_border]);
       XDefineCursor (display->display, scrollBar.win, leftptr_cursor);
 
       XSelectInput (display->display, scrollBar.win,
@@ -148,14 +147,14 @@
 #ifdef HAVE_SCROLLBARS
   int             top, bot, len, adj;
 
-  if (!scrollbar_visible ())
+  if (!scrollBar.state)
     return 0;
 
   if (update)
     {
-      top = (TermWin.nscrolled - TermWin.view_start);
-      bot = top + (TermWin.nrow - 1);
-      len = max ((TermWin.nscrolled + (TermWin.nrow - 1)), 1);
+      top = view_start - top_row;
+      bot = top + (nrow - 1);
+      len = max (nrow - 1 - top_row, 1);
       adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0;
 
       scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len);
@@ -229,9 +228,9 @@
     if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
       width = min (i, SB_WIDTH_MAXIMUM);
 
-# if defined(RXVT_SCROLLBAR)
-  if (! (options & Opt_scrollBar_floating) && style == R_SB_RXVT)
-    sb_shadow = SHADOW;
+# ifdef RXVT_SCROLLBAR
+  if (! OPTION (Opt_scrollBar_floating) && style == R_SB_RXVT)
+    sb_shadow = 2;
 # endif
 
   scrollBar.style = style;