--- rxvt-unicode/src/scrollbar.C	2011/02/21 07:41:04	1.64
+++ rxvt-unicode/src/scrollbar.C	2011/08/22 17:09:46	1.68
@@ -51,7 +51,7 @@
     }
   else
     {
-      state = 0;
+      state = STATE_OFF;
       XUnmapWindow (term->dpy, win);
       change = 1;
     }
@@ -74,7 +74,7 @@
     {
       /* create the scrollbar window */
       win = XCreateSimpleWindow (term->dpy,
-                                 term->parent[0],
+                                 term->parent,
                                  window_sb_x, 0,
                                  total_width (),
                                  term->szHint.height,
@@ -143,8 +143,9 @@
 scrollBar_t::setup (rxvt_term *term)
 {
   int             i;
-  short           style, width;
+  short           width;
   const char *scrollalign, *scrollstyle, *thickness;
+  enum sb_style style;
 
   this->term = term;
   scrollalign = term->rs[Rs_scrollBar_align];
@@ -194,6 +195,11 @@
     if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
       width = min (i, SB_WIDTH_MAXIMUM);
 
+# ifdef RXVT_SCROLLBAR
+  if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT)
+    shadow = SHADOW_WIDTH;
+# endif
+
   this->style = style;
   this->width = width;
 
@@ -205,7 +211,7 @@
       else if (strncasecmp (scrollalign, "bottom", 6) == 0)
         align = R_SB_ALIGN_BOTTOM;
     }
-  last_bot = last_state = -1;
+  last_state = STATE_OFF;
   /* cursor scrollBar: Black-on-White */
   leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr);
 }