*** empty log message ***

diff --git a/Changes b/Changes
index af4d10b..82375ab 100644 (file)
--- a/Changes
+++ b/Changes
@@ -15,6 +15,8 @@ WISH: just for fun, do shade and tint with XRender.
        - re-enabled modifer state matching as in 5.3, but implement
           a new builtin: keysym style that simply reverts to the built-in
           meaning of the given key.
+        - use scrollcolor for next scrollbar instead of hardcoded antiquewhite
+          (patch by Martin Edlman).
 
 5.4  Mon Apr 18 00:33:31 CEST 2005
        - match modifier state exactly in custom keyboard code.

diff --git a/src/rxvt.h b/src/rxvt.h
index c9d9eec..3d81c28 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -139,7 +139,7 @@ struct grwin_t;
 /* If we're using either the rxvt scrollbar or menu bars, keep the
  * scrollColor resource.
  */
-#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
+#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
 # define KEEP_SCROLLCOLOR 1
 #else
 # undef KEEP_SCROLLCOLOR

diff --git a/src/scrollbar-next.C b/src/scrollbar-next.C
index 57ec56e..6733c8f 100644 (file)
--- a/src/scrollbar-next.C
+++ b/src/scrollbar-next.C
@@ -166,8 +166,7 @@ rxvt_term::init_scrollbar_stuff ()
   xcol.red = 0xaeba;
   xcol.green = 0xaaaa;
   xcol.blue = 0xaeba;
-  //if (!rXAllocColor (&xcol, "light gray"))//TODO//D//
-  xcol.pixel = pix_colors_focused[Color_AntiqueWhite];
+  xcol.pixel = pix_colors_focused[Color_scroll];
   light = gcvalue.foreground = xcol.pixel;
   grayGC = XCreateGC (disp, scrollBar.win,
                      GCForeground | GCGraphicsExposures, &gcvalue);