| … | |
… | |
| 237 | if (color == Color_bg || color == Color_transparent) |
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 if (color >= 0) |
239 | else if (color >= 0) |
| 240 | { |
240 | { |
| 241 | #if XFT |
241 | #if XFT |
|
|
242 | bool done = false; |
|
|
243 | #ifdef HAVE_BG_PIXMAP |
|
|
244 | if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) |
|
|
245 | { |
|
|
246 | Picture dst = XftDrawPicture (d); |
|
|
247 | if (dst != 0) |
|
|
248 | { |
|
|
249 | XClearArea (disp, d, x, y, w, h, false); |
|
|
250 | Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); |
|
|
251 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); |
|
|
252 | done = true; |
|
|
253 | } |
|
|
254 | } |
|
|
255 | #endif |
|
|
256 | if (!done) |
| 242 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
257 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
| 243 | #else |
258 | #else |
| 244 | XSetForeground (disp, gc, term->pix_colors[color]); |
259 | XSetForeground (disp, gc, term->pix_colors[color]); |
| 245 | XFillRectangle (disp, d, gc, x, y, w, h); |
260 | XFillRectangle (disp, d, gc, x, y, w, h); |
| 246 | #endif |
261 | #endif |
| 247 | } |
262 | } |
| … | |
… | |
| 497 | unsigned long value; |
512 | unsigned long value; |
| 498 | |
513 | |
| 499 | if (XGetFontProperty (f, property, &value)) |
514 | if (XGetFontProperty (f, property, &value)) |
| 500 | return XGetAtomName (term->dpy, value); |
515 | return XGetAtomName (term->dpy, value); |
| 501 | else |
516 | else |
| 502 | return rxvt_strdup (repl); |
517 | return repl ? strdup (repl) : 0; |
| 503 | } |
518 | } |
| 504 | |
519 | |
| 505 | rxvt_fontprop |
520 | rxvt_fontprop |
| 506 | rxvt_font_x11::properties () |
521 | rxvt_font_x11::properties () |
| 507 | { |
522 | { |
| … | |
… | |
| 1043 | |
1058 | |
| 1044 | void draw (rxvt_drawable &d, int x, int y, |
1059 | void draw (rxvt_drawable &d, int x, int y, |
| 1045 | const text_t *text, int len, |
1060 | const text_t *text, int len, |
| 1046 | int fg, int bg); |
1061 | int fg, int bg); |
| 1047 | |
1062 | |
| 1048 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; |
1063 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
| 1049 | |
1064 | |
| 1050 | protected: |
1065 | protected: |
| 1051 | XftFont *f; |
1066 | XftFont *f; |
| 1052 | }; |
1067 | }; |
| 1053 | |
1068 | |
| … | |
… | |
| 1316 | x_ += cwidth; |
1331 | x_ += cwidth; |
| 1317 | } |
1332 | } |
| 1318 | |
1333 | |
| 1319 | if (buffered) |
1334 | if (buffered) |
| 1320 | { |
1335 | { |
|
|
1336 | bool back_rendered = false; |
| 1321 | if (ep != enc) |
1337 | if (ep != enc) |
| 1322 | { |
1338 | { |
| 1323 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1339 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
| 1324 | bool back_rendered = false; |
|
|
| 1325 | |
1340 | |
| 1326 | #ifdef HAVE_BG_PIXMAP |
1341 | #ifdef HAVE_BG_PIXMAP |
| 1327 | if (term->bgPixmap.pixmap) |
1342 | if (term->bgPixmap.pixmap) |
| 1328 | { |
1343 | { |
| 1329 | Picture dst = 0; |
1344 | Picture dst = 0; |
