--- rxvt-unicode/src/init.C 2006/01/30 02:21:20 1.159 +++ rxvt-unicode/src/init.C 2006/01/31 16:19:16 1.162 @@ -301,7 +301,7 @@ xa = display->xa; -#if ENABLE_FRILLS +#if XFT if (rs[Rs_depth]) set (display, strtol (rs[Rs_depth], 0, 0)); else @@ -662,7 +662,7 @@ if (!rs[Rs_color + i]) continue; - if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) + if (!set_color (xcol, rs[Rs_color + i])) { #ifndef XTERM_REVERSE_VIDEO if (i < 2 && OPTION (Opt_reverseVideo)) @@ -674,15 +674,14 @@ if (!rs[Rs_color + i]) continue; - if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) + if (!set_color (xcol, rs[Rs_color + i])) { switch (i) { case Color_fg: case Color_bg: /* fatal: need bg/fg color */ - rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); - /* NOTREACHED */ + rxvt_warn ("unable to get foreground/background colour, continuing.\n"); break; #ifndef NO_CURSORCOLOR case Color_cursor2: @@ -706,7 +705,11 @@ #ifdef OFF_FOCUS_FADING if (rs[Rs_fade]) for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) - pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]); + { + rxvt_rgba c; + pix_colors[Color_fade].get (this, c); + pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), c); + } #endif if (depth <= 2)