| … | |
… | |
| 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 | |
| … | |
… | |
| 1218 | int ftheight = 0; |
1218 | int ftheight = 0; |
| 1219 | bool success = true; |
1219 | bool success = true; |
| 1220 | |
1220 | |
| 1221 | for (;;) |
1221 | for (;;) |
| 1222 | { |
1222 | { |
|
|
1223 | p = FcPatternDuplicate (match); |
| 1223 | f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); |
1224 | f = XftFontOpenPattern (disp, p); |
| 1224 | |
1225 | |
| 1225 | if (!f) |
1226 | if (!f) |
| 1226 | { |
1227 | { |
|
|
1228 | FcPatternDestroy (p); |
| 1227 | success = false; |
1229 | success = false; |
| 1228 | break; |
1230 | break; |
| 1229 | } |
1231 | } |
| 1230 | |
1232 | |
| 1231 | FT_Face face = XftLockFace (f); |
1233 | FT_Face face = XftLockFace (f); |
| … | |
… | |
| 1612 | buf[end - desc] = 0; |
1614 | buf[end - desc] = 0; |
| 1613 | |
1615 | |
| 1614 | push_font (new_font (buf, cs)); |
1616 | push_font (new_font (buf, cs)); |
| 1615 | } |
1617 | } |
| 1616 | else |
1618 | else |
| 1617 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1619 | rxvt_warn ("fontset element too long (>511 bytes), ignored.\n"); |
| 1618 | |
1620 | |
| 1619 | desc = end + 1; |
1621 | desc = end + 1; |
| 1620 | } |
1622 | } |
| 1621 | while (*end); |
1623 | while (*end); |
| 1622 | } |
1624 | } |
