| … | |
… | |
| 1284 | CLEAR_ROWS (row, num); |
1284 | CLEAR_ROWS (row, num); |
| 1285 | } |
1285 | } |
| 1286 | else |
1286 | else |
| 1287 | { |
1287 | { |
| 1288 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1288 | ren = rstyle & (RS_fgMask | RS_bgMask); |
| 1289 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1289 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
| 1290 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1290 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
| 1291 | ERASE_ROWS (row, num); |
1291 | ERASE_ROWS (row, num); |
| 1292 | gcvalue.foreground = pix_colors[Color_fg]; |
1292 | gcvalue.foreground = pix_colors[Color_fg]; |
| 1293 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1293 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
| 1294 | } |
1294 | } |
| … | |
… | |
| 1988 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
1988 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
| 1989 | if (ISSET_PIXCOLOR (Color_cursor)) |
1989 | if (ISSET_PIXCOLOR (Color_cursor)) |
| 1990 | ccol1 = Color_cursor; |
1990 | ccol1 = Color_cursor; |
| 1991 | else |
1991 | else |
| 1992 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1992 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
| 1993 | ccol1 = GET_FGCOLOR (rstyle); |
1993 | ccol1 = fgcolor_of (rstyle); |
| 1994 | #else |
1994 | #else |
| 1995 | ccol1 = Color_fg; |
1995 | ccol1 = Color_fg; |
| 1996 | #endif |
1996 | #endif |
| 1997 | if (ISSET_PIXCOLOR (Color_cursor2)) |
1997 | if (ISSET_PIXCOLOR (Color_cursor2)) |
| 1998 | ccol2 = Color_cursor2; |
1998 | ccol2 = Color_cursor2; |
| 1999 | else |
1999 | else |
| 2000 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2000 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
| 2001 | ccol2 = GET_BGCOLOR (rstyle); |
2001 | ccol2 = bgcolor_of (rstyle); |
| 2002 | #else |
2002 | #else |
| 2003 | ccol2 = Color_bg; |
2003 | ccol2 = Color_bg; |
| 2004 | #endif |
2004 | #endif |
| 2005 | *crp = SET_FGCOLOR (*crp, ccol1); |
2005 | *crp = SET_FGCOLOR (*crp, ccol1); |
| 2006 | *crp = SET_BGCOLOR (*crp, ccol2); |
2006 | *crp = SET_BGCOLOR (*crp, ccol2); |
| … | |
… | |
| 2187 | count++, i--; |
2187 | count++, i--; |
| 2188 | |
2188 | |
| 2189 | /* |
2189 | /* |
| 2190 | * Determine the attributes for the string |
2190 | * Determine the attributes for the string |
| 2191 | */ |
2191 | */ |
| 2192 | int fore = GET_FGCOLOR (rend); // desired foreground |
2192 | int fore = fgcolor_of (rend); // desired foreground |
| 2193 | int back = GET_BGCOLOR (rend); // desired background |
2193 | int back = bgcolor_of (rend); // desired background |
| 2194 | |
2194 | |
| 2195 | // only do special processing if any attributes are set, which is unlikely |
2195 | // only do special processing if any attributes are set, which is unlikely |
| 2196 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2196 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
| 2197 | { |
2197 | { |
| 2198 | #if ENABLE_STYLES |
2198 | #if ENABLE_STYLES |
