… | |
… | |
26 | |
26 | |
27 | #include <cstdlib> |
27 | #include <cstdlib> |
28 | |
28 | |
29 | #include <inttypes.h> |
29 | #include <inttypes.h> |
30 | |
30 | |
|
|
31 | #if XFT |
|
|
32 | # include <fontconfig/fontconfig.h> |
|
|
33 | #endif |
|
|
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) <= ( \ |
35 | (prop)->slant >= rxvt_fontprop::italic \ |
39 | (prop)->slant >= rxvt_fontprop::italic \ |
36 | ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
40 | ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
37 | : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
41 | : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
38 | )) |
42 | )) |
39 | |
43 | |
40 | const struct rxvt_fallback_font { |
44 | static const struct rxvt_fallback_font { |
41 | codeset cs; |
45 | codeset cs; |
42 | const char *name; |
46 | const char *name; |
43 | } fallback_fonts[] = { |
47 | } fallback_fonts[] = { |
44 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
48 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
45 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
49 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
… | |
… | |
155 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
159 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
156 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
160 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
157 | 0x304c, 0x672c, // が本 |
161 | 0x304c, 0x672c, // が本 |
158 | }; |
162 | }; |
159 | |
163 | |
160 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
|
|
161 | |
|
|
162 | #define dTermDisplay Display *disp = term->dpy |
164 | #define dTermDisplay Display *disp = term->dpy |
163 | #define dTermGC GC gc = term->gc |
165 | #define dTermGC GC gc = term->gc |
164 | |
166 | |
165 | ///////////////////////////////////////////////////////////////////////////// |
167 | ///////////////////////////////////////////////////////////////////////////// |
166 | |
168 | |
… | |
… | |
448 | |
450 | |
449 | text_t chrs[2]; |
451 | text_t chrs[2]; |
450 | chrs [1] = NOCHAR; |
452 | chrs [1] = NOCHAR; |
451 | |
453 | |
452 | *chrs = cc->c1; |
454 | *chrs = cc->c1; |
453 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
455 | rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; |
454 | f1->draw (d, x, y, chrs, width, fg, bg); |
456 | f1->draw (d, x, y, chrs, width, fg, bg); |
455 | |
457 | |
456 | if (cc->c2 != NOCHAR) |
458 | if (cc->c2 != NOCHAR) |
457 | { |
459 | { |
458 | bool careful; |
460 | bool careful; |
459 | |
461 | |
460 | // prefer font of first character, for no good reasons |
462 | // prefer font of first character, for no good reasons |
461 | *chrs = cc->c2; |
463 | *chrs = cc->c2; |
462 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
464 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
463 | ? f1 |
465 | ? f1 |
464 | : (*fs)[fs->find_font (cc->c2)]; |
466 | : (*fs)[fs->find_font_idx (cc->c2)]; |
465 | |
467 | |
466 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
468 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
467 | } |
469 | } |
468 | } |
470 | } |
469 | #endif |
471 | #endif |
… | |
… | |
788 | free (fname); |
790 | free (fname); |
789 | if (replace_field (&fname, list[i], 11, '0', "0")) |
791 | if (replace_field (&fname, list[i], 11, '0', "0")) |
790 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
792 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
791 | } |
793 | } |
792 | |
794 | |
793 | if (!set_properties (p, fname)) |
795 | if (!set_properties (p, fname) |
|
|
796 | // also weed out too large fonts |
|
|
797 | || (prop.height != rxvt_fontprop::unset |
|
|
798 | && p.height > prop.height)) |
|
|
799 | { |
|
|
800 | free (fname); |
794 | continue; |
801 | continue; |
795 | |
802 | } |
796 | if (prop.height != rxvt_fontprop::unset |
|
|
797 | && p.height > prop.height) // weed out too large fonts |
|
|
798 | continue; |
|
|
799 | |
803 | |
800 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
804 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
801 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
805 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
802 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
806 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
803 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
807 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
… | |
… | |
860 | free (registry); |
864 | free (registry); |
861 | free (encoding); |
865 | free (encoding); |
862 | |
866 | |
863 | if (cs == CS_UNKNOWN) |
867 | if (cs == CS_UNKNOWN) |
864 | { |
868 | { |
865 | const char *charset = get_property (f, XA_FONT, 0); |
869 | char *value = get_property (f, XA_FONT, 0); |
|
|
870 | const char *charset = value; |
866 | |
871 | |
867 | if (!charset) |
872 | if (!charset) |
868 | charset = name; |
873 | charset = name; |
869 | |
874 | |
870 | int count = 13; |
875 | int count = 13; |
… | |
… | |
873 | break; |
878 | break; |
874 | |
879 | |
875 | cs = codeset_from_name (charset); |
880 | cs = codeset_from_name (charset); |
876 | if (cs == CS_UNKNOWN) |
881 | if (cs == CS_UNKNOWN) |
877 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
882 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
|
|
883 | |
|
|
884 | free (value); |
878 | } |
885 | } |
879 | |
886 | |
880 | if (cs == CS_UNKNOWN) |
887 | if (cs == CS_UNKNOWN) |
881 | { |
888 | { |
882 | clear (); |
889 | clear (); |
… | |
… | |
914 | } |
921 | } |
915 | #endif |
922 | #endif |
916 | |
923 | |
917 | width = 1; |
924 | width = 1; |
918 | |
925 | |
919 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
926 | for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) |
920 | { |
927 | { |
921 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
928 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
922 | continue; |
929 | continue; |
923 | |
930 | |
924 | // ignore characters we wouldn't use anyways |
931 | // ignore characters we wouldn't use anyways |
… | |
… | |
1232 | |
1239 | |
1233 | XftUnlockFace (f); |
1240 | XftUnlockFace (f); |
1234 | |
1241 | |
1235 | int glheight = height; |
1242 | int glheight = height; |
1236 | |
1243 | |
1237 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1244 | for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) |
1238 | { |
1245 | { |
1239 | FcChar16 ch = *t; |
1246 | FcChar16 ch = *t; |
1240 | |
1247 | |
1241 | if (cs != CS_UNICODE |
1248 | if (cs != CS_UNICODE |
1242 | && ch > 0x100 |
1249 | && ch > 0x100 |
… | |
… | |
1403 | && (bg == Color_transparent || bg == Color_bg |
1410 | && (bg == Color_transparent || bg == Color_bg |
1404 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1411 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1405 | { |
1412 | { |
1406 | int src_x = x, src_y = y; |
1413 | int src_x = x, src_y = y; |
1407 | |
1414 | |
1408 | if (term->bgPixmap.is_parentOrigin ()) |
1415 | if (term->bgPixmap.flags & bgPixmap_t::isTransparent) |
1409 | { |
1416 | { |
1410 | src_x += term->window_vt_x; |
1417 | src_x += term->window_vt_x; |
1411 | src_y += term->window_vt_y; |
1418 | src_y += term->window_vt_y; |
1412 | } |
1419 | } |
1413 | |
1420 | |
… | |
… | |
1482 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1489 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1483 | = rxvt_fontprop::unset; |
1490 | = rxvt_fontprop::unset; |
1484 | force_prop = false; |
1491 | force_prop = false; |
1485 | |
1492 | |
1486 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1493 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1487 | FONT_UNREF (*i); |
1494 | (*i)->unref (); |
1488 | |
1495 | |
1489 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1496 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1490 | delete *p; |
1497 | delete *p; |
1491 | |
1498 | |
1492 | free (fontdesc); fontdesc = 0; |
1499 | free (fontdesc); fontdesc = 0; |
… | |
… | |
1539 | ///////////////////////////////////////////////////////////////////////////// |
1546 | ///////////////////////////////////////////////////////////////////////////// |
1540 | |
1547 | |
1541 | void |
1548 | void |
1542 | rxvt_fontset::push_font (rxvt_font *font) |
1549 | rxvt_fontset::push_font (rxvt_font *font) |
1543 | { |
1550 | { |
|
|
1551 | // the fontCount index is reserved for the overflow font, it is only |
|
|
1552 | // necessary when we get fontCount or more fonts, as they cannot be |
|
|
1553 | // represented in the rendition. |
1544 | if (fonts.size () == fontCount) |
1554 | if (fonts.size () == fontCount) |
1545 | { |
1555 | { |
1546 | rxvt_font *f = new rxvt_font_overflow (this); |
1556 | rxvt_font *f = new rxvt_font_overflow (this); |
1547 | |
1557 | |
1548 | prepare_font (f, CS_UNICODE); |
1558 | prepare_font (f, CS_UNICODE); |