| … | |
… | |
| 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) |
| … | |
… | |
| 481 | const text_t *text, int len, |
481 | const text_t *text, int len, |
| 482 | int fg, int bg); |
482 | int fg, int bg); |
| 483 | |
483 | |
| 484 | bool slow; // wether this is a proportional font or has other funny characteristics |
484 | bool slow; // wether this is a proportional font or has other funny characteristics |
| 485 | XFontStruct *f; |
485 | XFontStruct *f; |
| 486 | codeset cs; |
|
|
| 487 | bool enc2b, encm; |
486 | bool enc2b, encm; |
| 488 | |
487 | |
| 489 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
488 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
| 490 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
489 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
| 491 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
490 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
