--- rxvt-unicode/src/init.C 2015/10/13 08:10:43 1.345 +++ rxvt-unicode/src/init.C 2016/07/14 05:33:26 1.348 @@ -153,6 +153,31 @@ } #endif +#define NULL_5 \ + NULL, \ + NULL, \ + NULL, \ + NULL, \ + NULL, + +#define NULL_10 \ + NULL_5 \ + NULL_5 + +#define NULL_40 \ + NULL_10 \ + NULL_10 \ + NULL_10 \ + NULL_10 + +#define NULL_50 \ + NULL_40 \ + NULL_10 + +#define NULL_100 \ + NULL_50 \ + NULL_50 + static const char *const def_colorName[] = { COLOR_FOREGROUND, @@ -258,6 +283,12 @@ "rgb:b9/b9/b9", "rgb:d0/d0/d0", "rgb:e7/e7/e7", + NULL_100 + NULL_40 + NULL, + NULL, + NULL, + NULL, #else // 256 xterm colours "rgb:00/00/00", @@ -500,6 +531,10 @@ "rgb:da/da/da", "rgb:e4/e4/e4", "rgb:ee/ee/ee", + NULL_100 + NULL_100 + NULL_40 + NULL_5 #endif #ifndef NO_CURSORCOLOR @@ -526,9 +561,6 @@ #ifdef RXVT_SCROLLBAR COLOR_SCROLLTROUGH, #endif -#if BG_IMAGE_FROM_ROOT - NULL, -#endif #if OFF_FOCUS_FADING "rgb:00/00/00", #endif @@ -568,6 +600,14 @@ set_option (Opt_buffered); } +#if ENABLE_PERL +static void +rxvt_perl_parse_resource (rxvt_term *term, const char *k, const char *v) +{ + rxvt_perl.parse_resource (term, k, false, false, 0, v); +} +#endif + /*----------------------------------------------------------------------*/ const char ** rxvt_term::init_resources (int argc, const char *const *argv) @@ -615,6 +655,7 @@ || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) { rxvt_perl.init (this); + enumerate_resources (rxvt_perl_parse_resource); HOOK_INVOKE ((this, HOOK_INIT, DT_END)); } #endif @@ -824,10 +865,6 @@ if (option (Opt_scrollBar)) scrollBar.resize (); /* create and map scrollbar */ -#ifdef HAVE_BG_PIXMAP - bg_init (); -#endif - #if ENABLE_PERL rootwin_ev.start (display, display->root); #endif