Remove KEEP_SCROLLCOLOR macro.

diff --git a/src/init.C b/src/init.C
index d346d64508e07a663e560a3cd905584180c5b682..cbc01186b342471ce71a2148a3d241e7207eb844 100644 (file)
--- a/src/init.C
+++ b/src/init.C
@@ -269,10 +269,12 @@ const char *const def_colorName[] =
 #ifdef OPTION_HC
     NULL,
 #endif
-#ifdef KEEP_SCROLLCOLOR
+#ifdef HAVE_SCROLLBARS
     COLOR_SCROLLBAR,
+#endif
+#ifdef RXVT_SCROLLBAR
     COLOR_SCROLLTROUGH,
-#endif /* KEEP_SCROLLCOLOR */
+#endif
 #if ENABLE_TRANSPARENCY
     NULL,
 #endif
@@ -910,7 +912,7 @@ rxvt_term::Get_Colours ()
    * The calculations of topShadow/bottomShadow values are adapted
    * from the fvwm window manager.
    */
-#ifdef KEEP_SCROLLCOLOR
+#ifdef RXVT_SCROLLBAR
   if (depth <= 2)
     {
       /* Monochrome */
@@ -935,7 +937,7 @@ rxvt_term::Get_Colours ()
                        ))
         alias_color (Color_topShadow, Color_White);
     }
-#endif /* KEEP_SCROLLCOLOR */
+#endif
 
 #ifdef OFF_FOCUS_FADING
   for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)

diff --git a/src/rxvt.h b/src/rxvt.h
index bf7b493f884c6063c1bdb7a40f464b0b2339b672..9fd48c82d0748aa25b66413c0f963de758e9491b 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -211,15 +211,6 @@ set_environ (char **envv)
  *****************************************************************************
  */
 
-/* If we're using either the rxvt scrollbar, keep the
- * scrollColor resource.
- */
-#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
-# define KEEP_SCROLLCOLOR 1
-#else
-# undef KEEP_SCROLLCOLOR
-#endif
-
 /*
  * the 'essential' information for reporting Mouse Events
  * pared down from XButtonEvent
@@ -503,8 +494,10 @@ enum colour_list {
 #ifdef OPTION_HC
   Color_HC,
 #endif
-#ifdef KEEP_SCROLLCOLOR
+#ifdef HAVE_SCROLLBARS
   Color_scroll,
+#endif
+#ifdef RXVT_SCROLLBAR
   Color_trough,
 #endif
 #if ENABLE_TRANSPARENCY
@@ -514,7 +507,7 @@ enum colour_list {
   Color_fade,
 #endif
   NRS_COLORS,                 /* */
-#ifdef KEEP_SCROLLCOLOR
+#ifdef RXVT_SCROLLBAR
   Color_topShadow = NRS_COLORS,
   Color_bottomShadow,
   TOTAL_COLORS

diff --git a/src/xdefaults.C b/src/xdefaults.C
index 5af940d19eeb50881b88890a6f754d9d9702d8aa..44d80e47bfe71255034f659caa46e086975173dc 100644 (file)
--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -174,10 +174,12 @@ optList[] = {
 #if ENABLE_FRILLS
               RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
 #endif
-#ifdef KEEP_SCROLLCOLOR
+#ifdef HAVE_SCROLLBARS
               RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
+#endif
+#ifdef RXVT_SCROLLBAR
               RSTRG (Rs_color + Color_trough, "troughColor", "color"),
-#endif /* KEEP_SCROLLCOLOR */
+#endif
 #ifdef OPTION_HC
               STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
 #endif