--- rxvt-unicode/src/scrollbar.C	2006/01/16 15:00:20	1.31
+++ rxvt-unicode/src/scrollbar.C	2006/02/02 18:04:46	1.36
@@ -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 (dpy, scrollBar.win);
           change = 1;
         }
     }
   else
     {
       scrollBar.state = 0;
-      XUnmapWindow (display->display, scrollBar.win);
+      XUnmapWindow (dpy, scrollBar.win);
       change = 1;
     }
 #endif
+
   return change;
 }
 
@@ -111,7 +112,7 @@
   if (!scrollBar.win)
     {
       /* create the scrollbar window */
-      scrollBar.win = XCreateSimpleWindow (display->display,
+      scrollBar.win = XCreateSimpleWindow (dpy,
                                            parent[0],
                                            window_sb_x, 0,
                                            scrollbar_TotalWidth (),
@@ -119,12 +120,9 @@
                                            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);
+      XDefineCursor (dpy, scrollBar.win, leftptr_cursor);
 
-      XSelectInput (display->display, scrollBar.win,
+      XSelectInput (dpy, scrollBar.win,
                    ExposureMask | ButtonPressMask | ButtonReleaseMask
                    | Button1MotionMask | Button2MotionMask
                    | Button3MotionMask);
@@ -136,7 +134,7 @@
   scrollbar_show (1);
 
   if (delayed_init)
-    XMapWindow (display->display, scrollBar.win);
+    XMapWindow (dpy, scrollBar.win);
 #endif
 }
 
@@ -231,9 +229,9 @@
     if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
       width = min (i, SB_WIDTH_MAXIMUM);
 
-# if defined(RXVT_SCROLLBAR)
+# ifdef RXVT_SCROLLBAR
   if (! OPTION (Opt_scrollBar_floating) && style == R_SB_RXVT)
-    sb_shadow = MENU_SHADOW;
+    sb_shadow = SHADOW_WIDTH;
 # endif
 
   scrollBar.style = style;