| … | |
… | |
| 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 | |
| … | |
… | |
| 790 | free (fname); |
790 | free (fname); |
| 791 | if (replace_field (&fname, list[i], 11, '0', "0")) |
791 | if (replace_field (&fname, list[i], 11, '0', "0")) |
| 792 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
792 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
| 793 | } |
793 | } |
| 794 | |
794 | |
| 795 | 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); |
| 796 | continue; |
801 | continue; |
| 797 | |
802 | } |
| 798 | if (prop.height != rxvt_fontprop::unset |
|
|
| 799 | && p.height > prop.height) // weed out too large fonts |
|
|
| 800 | continue; |
|
|
| 801 | |
803 | |
| 802 | 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; |
| 803 | 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); |
| 804 | 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); |
| 805 | //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); |
| … | |
… | |
| 862 | free (registry); |
864 | free (registry); |
| 863 | free (encoding); |
865 | free (encoding); |
| 864 | |
866 | |
| 865 | if (cs == CS_UNKNOWN) |
867 | if (cs == CS_UNKNOWN) |
| 866 | { |
868 | { |
| 867 | const char *charset = get_property (f, XA_FONT, 0); |
869 | char *value = get_property (f, XA_FONT, 0); |
|
|
870 | const char *charset = value; |
| 868 | |
871 | |
| 869 | if (!charset) |
872 | if (!charset) |
| 870 | charset = name; |
873 | charset = name; |
| 871 | |
874 | |
| 872 | int count = 13; |
875 | int count = 13; |
| … | |
… | |
| 875 | break; |
878 | break; |
| 876 | |
879 | |
| 877 | cs = codeset_from_name (charset); |
880 | cs = codeset_from_name (charset); |
| 878 | if (cs == CS_UNKNOWN) |
881 | if (cs == CS_UNKNOWN) |
| 879 | 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); |
| 880 | } |
885 | } |
| 881 | |
886 | |
| 882 | if (cs == CS_UNKNOWN) |
887 | if (cs == CS_UNKNOWN) |
| 883 | { |
888 | { |
| 884 | clear (); |
889 | clear (); |
| … | |
… | |
| 1607 | buf[end - desc] = 0; |
1612 | buf[end - desc] = 0; |
| 1608 | |
1613 | |
| 1609 | push_font (new_font (buf, cs)); |
1614 | push_font (new_font (buf, cs)); |
| 1610 | } |
1615 | } |
| 1611 | else |
1616 | else |
| 1612 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1617 | rxvt_warn ("fontset element too long (>511 bytes), ignored.\n"); |
| 1613 | |
1618 | |
| 1614 | desc = end + 1; |
1619 | desc = end + 1; |
| 1615 | } |
1620 | } |
| 1616 | while (*end); |
1621 | while (*end); |
| 1617 | } |
1622 | } |
