--- rxvt-unicode/src/scrollbar.C	2005/01/02 10:55:43	1.25
+++ rxvt-unicode/src/scrollbar.C	2006/01/31 20:07:18	1.35
@@ -34,7 +34,7 @@
 int
 rxvt_term::scrollbar_mapping (int map)
 {
-  int             change = 0;
+  int change = 0;
 
 #ifdef HAVE_SCROLLBARS
   if (map)
@@ -46,17 +46,18 @@
 
       if (scrollBar.win)
         {
-          XMapWindow (display->display, scrollBar.win);
+          XMapWindow (xdisp, scrollBar.win);
           change = 1;
         }
     }
   else
     {
       scrollBar.state = 0;
-      XUnmapWindow (display->display, scrollBar.win);
+      XUnmapWindow (xdisp, scrollBar.win);
       change = 1;
     }
 #endif
+
   return change;
 }
 
@@ -111,20 +112,17 @@
   if (!scrollBar.win)
     {
       /* 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_border]);
-#ifdef DEBUG_X
-      XStoreName (display->display, scrollBar.win, "scrollbar");
-#endif
-      XDefineCursor (display->display, scrollBar.win, leftptr_cursor);
+      scrollBar.win = XCreateSimpleWindow (xdisp,
+                                           parent[0],
+                                           window_sb_x, 0,
+                                           scrollbar_TotalWidth (),
+                                           szHint.height,
+                                           0,
+                                           pix_colors[Color_fg],
+                                           pix_colors[Color_border]);
+      XDefineCursor (xdisp, scrollBar.win, leftptr_cursor);
 
-      XSelectInput (display->display, scrollBar.win,
+      XSelectInput (xdisp, scrollBar.win,
                    ExposureMask | ButtonPressMask | ButtonReleaseMask
                    | Button1MotionMask | Button2MotionMask
                    | Button3MotionMask);
@@ -136,7 +134,7 @@
   scrollbar_show (1);
 
   if (delayed_init)
-    XMapWindow (display->display, scrollBar.win);
+    XMapWindow (xdisp, scrollBar.win);
 #endif
 }
 
@@ -150,14 +148,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);
@@ -231,9 +229,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 = SHADOW_WIDTH;
 # endif
 
   scrollBar.style = style;