--- rxvt-unicode/src/scrollbar.C	2007/12/29 14:25:43	1.40
+++ rxvt-unicode/src/scrollbar.C	2007/12/30 23:45:42	1.43
@@ -72,9 +72,9 @@
 #define R_SCROLLBEG_NEXT	0
 #define R_SCROLLEND_NEXT	szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
                                                     SB_PADDING)
-#define R_SCROLLBEG_RXVT	(scrollBar.width + 1) + scrollBar.sb_shadow
+#define R_SCROLLBEG_RXVT	(scrollBar.width + 1) + scrollBar.shadow
 #define R_SCROLLEND_RXVT	szHint.height - R_SCROLLBEG_RXVT - \
-                                    (2 * scrollBar.sb_shadow)
+                                    (2 * scrollBar.shadow)
 
 #if defined(PLAIN_SCROLLBAR)
   if (scrollBar.style == R_SB_PLAIN)
@@ -147,6 +147,7 @@
   int             ret = 0;
 #ifdef HAVE_SCROLLBARS
   int             top, bot, len, adj;
+  int             scrollbar_len = 0;
 
   if (!scrollBar.state)
     return 0;
@@ -231,19 +232,19 @@
 
 # ifdef RXVT_SCROLLBAR
   if (! option (Opt_scrollBar_floating) && style == R_SB_RXVT)
-    scrollBar.sb_shadow = SHADOW_WIDTH;
+    scrollBar.shadow = SHADOW_WIDTH;
 # endif
 
   scrollBar.style = style;
   scrollBar.width = width;
 
-  /* scrollbar_align = R_SB_ALIGN_CENTRE; */
+  /* scrollBar.align = R_SB_ALIGN_CENTRE; */
   if (scrollalign)
     {
       if (strncasecmp (scrollalign, "top", 3) == 0)
-        scrollbar_align = R_SB_ALIGN_TOP;
+        scrollBar.align = R_SB_ALIGN_TOP;
       else if (strncasecmp (scrollalign, "bottom", 6) == 0)
-        scrollbar_align = R_SB_ALIGN_BOTTOM;
+        scrollBar.align = R_SB_ALIGN_BOTTOM;
     }
 #endif
 }