| … | |
… | |
| 2114 | int fore = GET_FGCOLOR (rend); // desired foreground |
2114 | int fore = GET_FGCOLOR (rend); // desired foreground |
| 2115 | int back = GET_BGCOLOR (rend); // desired background |
2115 | int back = GET_BGCOLOR (rend); // desired background |
| 2116 | |
2116 | |
| 2117 | rend = GET_ATTR (rend); |
2117 | rend = GET_ATTR (rend); |
| 2118 | |
2118 | |
| 2119 | rvid = !! (rend & RS_RVid); |
2119 | rvid = !!(rend & RS_RVid); |
| 2120 | if (rvid) |
|
|
| 2121 | { |
|
|
| 2122 | SWAP_IT (fore, back, int); |
|
|
| 2123 | |
2120 | |
| 2124 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
| 2125 | if (ISSET_PIXCOLOR (Color_RV) |
|
|
| 2126 | # ifndef NO_CURSORCOLOR |
|
|
| 2127 | && !ISSET_PIXCOLOR (Color_cursor) |
|
|
| 2128 | # endif |
|
|
| 2129 | ) |
|
|
| 2130 | back = Color_RV; |
|
|
| 2131 | #endif |
|
|
| 2132 | |
|
|
| 2133 | } |
|
|
| 2134 | #ifdef TEXT_BLINK |
2121 | #ifdef TEXT_BLINK |
| 2135 | if (rend & RS_Blink) |
2122 | if (rend & RS_Blink) |
| 2136 | { |
2123 | { |
| 2137 | if (!text_blink_ev.active) |
2124 | if (!text_blink_ev.active) |
| 2138 | { |
2125 | { |
| … | |
… | |
| 2141 | } |
2128 | } |
| 2142 | else if (hidden_text) |
2129 | else if (hidden_text) |
| 2143 | fore = back; |
2130 | fore = back; |
| 2144 | } |
2131 | } |
| 2145 | #endif |
2132 | #endif |
|
|
2133 | |
| 2146 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2134 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
| 2147 | else if (rend & RS_Bold) |
2135 | if (rend & RS_Bold && fore == Color_fg) |
| 2148 | { |
2136 | { |
| 2149 | if (ISSET_PIXCOLOR (Color_BD)) |
2137 | if (ISSET_PIXCOLOR (Color_BD)) |
| 2150 | fore = Color_BD; |
2138 | fore = Color_BD; |
| 2151 | else if (fore == Color_fg) |
2139 | else |
| 2152 | fore = Color_White; |
2140 | rvid = !rvid; |
| 2153 | } |
2141 | } |
|
|
2142 | |
| 2154 | else if (rend & RS_Uline) |
2143 | if (rend & RS_Uline) |
| 2155 | { |
2144 | { |
| 2156 | if (ISSET_PIXCOLOR (Color_UL)) |
2145 | if (ISSET_PIXCOLOR (Color_UL)) |
| 2157 | fore = Color_UL; |
2146 | fore = Color_UL; |
| 2158 | } |
2147 | } |
| 2159 | #endif |
2148 | #endif |
|
|
2149 | |
|
|
2150 | if (rvid) |
|
|
2151 | { |
|
|
2152 | SWAP_IT (fore, back, int); |
|
|
2153 | |
|
|
2154 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2155 | if (ISSET_PIXCOLOR (Color_RV) |
|
|
2156 | # ifndef NO_CURSORCOLOR |
|
|
2157 | && !ISSET_PIXCOLOR (Color_cursor) |
|
|
2158 | # endif |
|
|
2159 | ) |
|
|
2160 | back = Color_RV; |
|
|
2161 | #endif |
|
|
2162 | } |
| 2160 | |
2163 | |
| 2161 | /* |
2164 | /* |
| 2162 | * Actually do the drawing of the string here |
2165 | * Actually do the drawing of the string here |
| 2163 | */ |
2166 | */ |
| 2164 | rxvt_font *font = (*TermWin.fontset)[fid]; |
2167 | rxvt_font *font = (*TermWin.fontset)[fid]; |
