| … | |
… | |
| 23 | #include "rxvt.h" |
23 | #include "rxvt.h" |
| 24 | #include "defaultfont.h" |
24 | #include "defaultfont.h" |
| 25 | |
25 | |
| 26 | #include <cstdlib> |
26 | #include <cstdlib> |
| 27 | |
27 | |
| 28 | #define DISPLAY r->Xdisplay |
28 | #define DISPLAY r->display->display |
| 29 | #define DRAWABLE r->TermWin.vt |
29 | #define DRAWABLE r->TermWin.vt |
| 30 | #define GC r->TermWin.gc |
30 | #define GC r->TermWin.gc |
| 31 | |
31 | |
| 32 | const struct rxvt_fallback_font { |
32 | const struct rxvt_fallback_font { |
| 33 | codeset cs; |
33 | codeset cs; |
| … | |
… | |
| 891 | rxvt_font_xft::draw (int x, int y, |
891 | rxvt_font_xft::draw (int x, int y, |
| 892 | const text_t *text, int len, |
892 | const text_t *text, int len, |
| 893 | int fg, int bg) |
893 | int fg, int bg) |
| 894 | { |
894 | { |
| 895 | if (!d) |
895 | if (!d) |
| 896 | d = XftDrawCreate (DISPLAY, DRAWABLE, r->Xvisual, r->Xcmap); |
896 | d = XftDrawCreate (DISPLAY, DRAWABLE, r->display->visual, r->display->cmap); |
| 897 | |
897 | |
| 898 | if (bg >= 0 && bg != Color_bg) |
898 | if (bg >= 0 && bg != Color_bg) |
| 899 | XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); |
899 | XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); |
| 900 | else |
900 | else |
| 901 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
901 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
