| … | |
… | |
| 2169 | * Actually do the drawing of the string here |
2169 | * Actually do the drawing of the string here |
| 2170 | */ |
2170 | */ |
| 2171 | rxvt_font *font = (*TermWin.fontset)[fid]; |
2171 | rxvt_font *font = (*TermWin.fontset)[fid]; |
| 2172 | |
2172 | |
| 2173 | if (back == fore) |
2173 | if (back == fore) |
| 2174 | font->clear_rect (xpixel, ypixel, |
2174 | font->clear_rect (*TermWin.drawable, xpixel, ypixel, |
| 2175 | TermWin.fwidth * count, TermWin.fheight, |
2175 | TermWin.fwidth * count, TermWin.fheight, |
| 2176 | back); |
2176 | back); |
| 2177 | else if (back == Color_bg) |
2177 | else if (back == Color_bg) |
| 2178 | { |
2178 | { |
| 2179 | if (must_clear) |
2179 | if (must_clear) |
| … | |
… | |
| 2181 | CLEAR_CHARS (xpixel, ypixel, count); |
2181 | CLEAR_CHARS (xpixel, ypixel, count); |
| 2182 | |
2182 | |
| 2183 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2183 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
| 2184 | if (text[i] != ' ') |
2184 | if (text[i] != ' ') |
| 2185 | { |
2185 | { |
| 2186 | font->draw (xpixel, ypixel, text, count, fore, -1); |
2186 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); |
| 2187 | break; |
2187 | break; |
| 2188 | } |
2188 | } |
| 2189 | } |
2189 | } |
| 2190 | else |
2190 | else |
| 2191 | font->draw (xpixel, ypixel, text, count, fore, Color_bg); |
2191 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); |
| 2192 | } |
2192 | } |
| 2193 | else |
2193 | else |
| 2194 | font->draw (xpixel, ypixel, text, count, fore, back); |
2194 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
| 2195 | |
2195 | |
| 2196 | if ((rend & RS_Uline) && (font->descent > 1)) |
2196 | if ((rend & RS_Uline) && (font->descent > 1)) |
| 2197 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2197 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
| 2198 | xpixel, ypixel + font->ascent + 1, |
2198 | xpixel, ypixel + font->ascent + 1, |
| 2199 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2199 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
