| … | |
… | |
| 718 | f = XLoadQueryFont (disp, name); |
718 | f = XLoadQueryFont (disp, name); |
| 719 | |
719 | |
| 720 | if (!f) |
720 | if (!f) |
| 721 | return false; |
721 | return false; |
| 722 | |
722 | |
| 723 | char *new_name = get_property (f, XA_FONT, name); |
723 | char *new_name = get_property (f, XA_FONT, 0); |
| 724 | |
724 | |
| 725 | if (new_name) |
725 | if (new_name) |
| 726 | set_name (new_name); |
726 | set_name (new_name); |
| 727 | else |
727 | else |
| 728 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
728 | rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name); |
| 729 | |
729 | |
| 730 | XFreeFont (disp, f); |
730 | XFreeFont (disp, f); |
| 731 | f = 0; |
731 | f = 0; |
| 732 | } |
732 | } |
| 733 | |
733 | |
| … | |
… | |
| 864 | free (registry); |
864 | free (registry); |
| 865 | free (encoding); |
865 | free (encoding); |
| 866 | |
866 | |
| 867 | if (cs == CS_UNKNOWN) |
867 | if (cs == CS_UNKNOWN) |
| 868 | { |
868 | { |
| 869 | const char *charset = get_property (f, XA_FONT, 0); |
869 | char *value = get_property (f, XA_FONT, 0); |
|
|
870 | const char *charset = value; |
| 870 | |
871 | |
| 871 | if (!charset) |
872 | if (!charset) |
| 872 | charset = name; |
873 | charset = name; |
| 873 | |
874 | |
| 874 | int count = 13; |
875 | int count = 13; |
| … | |
… | |
| 877 | break; |
878 | break; |
| 878 | |
879 | |
| 879 | cs = codeset_from_name (charset); |
880 | cs = codeset_from_name (charset); |
| 880 | if (cs == CS_UNKNOWN) |
881 | if (cs == CS_UNKNOWN) |
| 881 | 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); |
| 882 | } |
885 | } |
| 883 | |
886 | |
| 884 | if (cs == CS_UNKNOWN) |
887 | if (cs == CS_UNKNOWN) |
| 885 | { |
888 | { |
| 886 | clear (); |
889 | clear (); |
| … | |
… | |
| 1215 | int ftheight = 0; |
1218 | int ftheight = 0; |
| 1216 | bool success = true; |
1219 | bool success = true; |
| 1217 | |
1220 | |
| 1218 | for (;;) |
1221 | for (;;) |
| 1219 | { |
1222 | { |
|
|
1223 | p = FcPatternDuplicate (match); |
| 1220 | f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); |
1224 | f = XftFontOpenPattern (disp, p); |
| 1221 | |
1225 | |
| 1222 | if (!f) |
1226 | if (!f) |
| 1223 | { |
1227 | { |
|
|
1228 | FcPatternDestroy (p); |
| 1224 | success = false; |
1229 | success = false; |
| 1225 | break; |
1230 | break; |
| 1226 | } |
1231 | } |
| 1227 | |
1232 | |
| 1228 | FT_Face face = XftLockFace (f); |
1233 | FT_Face face = XftLockFace (f); |
| … | |
… | |
| 1609 | buf[end - desc] = 0; |
1614 | buf[end - desc] = 0; |
| 1610 | |
1615 | |
| 1611 | push_font (new_font (buf, cs)); |
1616 | push_font (new_font (buf, cs)); |
| 1612 | } |
1617 | } |
| 1613 | else |
1618 | else |
| 1614 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1619 | rxvt_warn ("fontset element too long (>511 bytes), ignored.\n"); |
| 1615 | |
1620 | |
| 1616 | desc = end + 1; |
1621 | desc = end + 1; |
| 1617 | } |
1622 | } |
| 1618 | while (*end); |
1623 | while (*end); |
| 1619 | } |
1624 | } |
