… | |
… | |
25 | #include "rxvtfont.h" |
25 | #include "rxvtfont.h" |
26 | |
26 | |
27 | #include <cstdlib> |
27 | #include <cstdlib> |
28 | |
28 | |
29 | #include <inttypes.h> |
29 | #include <inttypes.h> |
|
|
30 | |
|
|
31 | #if XFT |
|
|
32 | # include <fontconfig/fontconfig.h> |
|
|
33 | #endif |
30 | |
34 | |
31 | #define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width |
35 | #define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width |
32 | #define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts |
36 | #define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts |
33 | |
37 | |
34 | #define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ |
38 | #define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ |
… | |
… | |
1403 | && (bg == Color_transparent || bg == Color_bg |
1407 | && (bg == Color_transparent || bg == Color_bg |
1404 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1408 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1405 | { |
1409 | { |
1406 | int src_x = x, src_y = y; |
1410 | int src_x = x, src_y = y; |
1407 | |
1411 | |
1408 | if (term->bgPixmap.is_parentOrigin ()) |
1412 | if (term->bgPixmap.flags & bgPixmap_t::isTransparent) |
1409 | { |
1413 | { |
1410 | src_x += term->window_vt_x; |
1414 | src_x += term->window_vt_x; |
1411 | src_y += term->window_vt_y; |
1415 | src_y += term->window_vt_y; |
1412 | } |
1416 | } |
1413 | |
1417 | |