--- rxvt-unicode/src/scrollbar.C	2005/12/20 19:31:00	1.27
+++ rxvt-unicode/src/scrollbar.C	2006/01/16 15:00:20	1.31
@@ -150,14 +150,14 @@
 #ifdef HAVE_SCROLLBARS
   int             top, bot, len, adj;
 
-  if (!scrollbar_visible ())
+  if (!scrollBar.state)
     return 0;
 
   if (update)
     {
-      top = nsaved - view_start;
+      top = view_start - top_row;
       bot = top + (nrow - 1);
-      len = max (nsaved + (nrow - 1), 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);
@@ -232,8 +232,8 @@
       width = min (i, SB_WIDTH_MAXIMUM);
 
 # if defined(RXVT_SCROLLBAR)
-  if (! (options & Opt_scrollBar_floating) && style == R_SB_RXVT)
-    sb_shadow = SHADOW;
+  if (! OPTION (Opt_scrollBar_floating) && style == R_SB_RXVT)
+    sb_shadow = MENU_SHADOW;
 # endif
 
   scrollBar.style = style;