--- rxvt-unicode/src/scrollbar-rxvt.C	2010/03/30 10:31:07	1.40
+++ rxvt-unicode/src/scrollbar-rxvt.C	2011/09/01 08:11:27	1.43
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
  * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
- * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2004-2006 Marc Lehmann <schmorp@schmorp.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -60,8 +60,8 @@
   sz = sb->width;
   sz2 = sz / 2;
 
-  if ((dirn == UP && sb->state == STATE_UP)
-      || (dirn == DN && sb->state == STATE_DOWN))
+  if ((dirn == UP && sb->state == SB_STATE_UP)
+      || (dirn == DN && sb->state == SB_STATE_DOWN))
     {
       top = sb->botShadowGC;
       bot = sb->topShadowGC;
@@ -152,11 +152,11 @@
 {
   int sbwidth = (int)width;
 
-  if ((init & R_SB_RXVT) == 0)
+  if ((init & SB_STYLE_RXVT) == 0)
     {
       XGCValues gcvalue;
 
-      init |= R_SB_RXVT;
+      init |= SB_STYLE_RXVT;
 
       gcvalue.foreground = term->pix_colors[Color_topShadow];
       topShadowGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue);
@@ -164,9 +164,8 @@
       botShadowGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue);
       gcvalue.foreground = term->pix_colors[ (term->depth <= 2 ? Color_fg : Color_scroll)];
       scrollbarGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue);
-      if (!term->option (Opt_scrollBar_floating))
+      if (shadow)
         {
-          shadow = SHADOW_WIDTH;
           XSetWindowBackground (term->dpy, win, term->pix_colors_focused[Color_trough]);
           XClearWindow (term->dpy, win);
         }