--- rxvt-unicode/src/main.C 2006/01/31 19:11:43 1.213 +++ rxvt-unicode/src/main.C 2006/02/01 18:36:48 1.215 @@ -934,7 +934,7 @@ if (rs[Rs_fade]) { rgba c; - pix_colors [Color_fade].get (this, c); + pix_colors [Color_fade].get (c); pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); } #endif @@ -952,17 +952,17 @@ void rxvt_term::recolour_cursor () { - XColor xcol[2]; + XColor fg, bg; - xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) - ? pix_colors_focused[Color_pointer_fg] - : pix_colors_focused[Color_fg]; - xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) - ? pix_colors_focused[Color_pointer_bg] - : pix_colors_focused[Color_bg]; + (ISSET_PIXCOLOR (Color_pointer_fg) + ? pix_colors_focused[Color_pointer_fg] + : pix_colors_focused[Color_fg]).get (fg); - XQueryColors (xdisp, cmap, xcol, 2); - XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); + (ISSET_PIXCOLOR (Color_pointer_bg) + ? pix_colors_focused[Color_pointer_bg] + : pix_colors_focused[Color_bg]).get (bg); + + XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg); } /*----------------------------------------------------------------------*/