| … | |
… | |
| 232 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
232 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
| 233 | { |
233 | { |
| 234 | dTermDisplay; |
234 | dTermDisplay; |
| 235 | dTermGC; |
235 | dTermGC; |
| 236 | |
236 | |
| 237 | if (color < 0 || color == Color_bg) |
237 | if (color == Color_bg || color == Color_transparent) |
| 238 | XClearArea (disp, d, x, y, w, h, false); |
238 | XClearArea (disp, d, x, y, w, h, false); |
| 239 | else |
239 | else if (color >= 0) |
| 240 | { |
240 | { |
| 241 | #if XFT |
241 | #if XFT |
| 242 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
242 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
| 243 | #else |
243 | #else |
| 244 | XSetForeground (disp, gc, term->pix_colors[color]); |
244 | XSetForeground (disp, gc, term->pix_colors[color]); |
| … | |
… | |
| 441 | *chrs = cc->c2; |
441 | *chrs = cc->c2; |
| 442 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
442 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
| 443 | ? f1 |
443 | ? f1 |
| 444 | : (*fs)[fs->find_font (cc->c2)]; |
444 | : (*fs)[fs->find_font (cc->c2)]; |
| 445 | |
445 | |
| 446 | f2->draw (d, x, y, chrs, width, fg, -1); |
446 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
| 447 | } |
447 | } |
| 448 | } |
448 | } |
| 449 | #endif |
449 | #endif |
| 450 | else |
450 | else |
| 451 | switch (t) |
451 | switch (t) |
| … | |
… | |
| 1274 | int w = term->fwidth * len; |
1274 | int w = term->fwidth * len; |
| 1275 | int h = term->fheight; |
1275 | int h = term->fheight; |
| 1276 | |
1276 | |
| 1277 | bool buffered = bg >= 0 // we don't use a transparent bg |
1277 | bool buffered = bg >= 0 // we don't use a transparent bg |
| 1278 | #ifndef FORCE_UNBUFFERED_XFT |
1278 | #ifndef FORCE_UNBUFFERED_XFT |
| 1279 | # if defined(XPM_BACKGROUND) || defined(TRANSPARENT) |
1279 | # ifdef ENABLE_TRANSPARENCY |
| 1280 | || !term->am_transparent // we aren't transparent |
1280 | || !term->am_transparent // we aren't transparent |
| 1281 | || term->am_pixmap_trans // we have a pixmap |
|
|
| 1282 | # endif |
1281 | # endif |
| 1283 | #endif |
1282 | #endif |
| 1284 | ; |
1283 | ; |
| 1285 | |
1284 | |
| 1286 | // cut trailing spaces |
1285 | // cut trailing spaces |
| … | |
… | |
| 1322 | { |
1321 | { |
| 1323 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1322 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
| 1324 | |
1323 | |
| 1325 | if (0) |
1324 | if (0) |
| 1326 | ; |
1325 | ; |
| 1327 | #ifdef TRANSPARENT |
1326 | #ifdef ENABLE_TRANSPARENCY |
| 1328 | else if (bg < 0 && term->am_pixmap_trans) |
1327 | else if (bg < 0 && term->am_pixmap_trans) |
| 1329 | XCopyArea (disp, term->pixmap, d2, gc, |
1328 | XCopyArea (disp, term->pixmap, d2, gc, |
| 1330 | x + term->window_vt_x, y + term->window_vt_y, |
1329 | x + term->window_vt_x, y + term->window_vt_y, |
| 1331 | w, h, 0, 0); |
1330 | w, h, 0, 0); |
| 1332 | #endif |
1331 | #endif |
