… | |
… | |
159 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
159 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
160 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
160 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
161 | 0x304c, 0x672c, // が本 |
161 | 0x304c, 0x672c, // が本 |
162 | }; |
162 | }; |
163 | |
163 | |
164 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
|
|
165 | |
|
|
166 | #define dTermDisplay Display *disp = term->dpy |
164 | #define dTermDisplay Display *disp = term->dpy |
167 | #define dTermGC GC gc = term->gc |
165 | #define dTermGC GC gc = term->gc |
168 | |
166 | |
169 | ///////////////////////////////////////////////////////////////////////////// |
167 | ///////////////////////////////////////////////////////////////////////////// |
170 | |
168 | |
… | |
… | |
720 | f = XLoadQueryFont (disp, name); |
718 | f = XLoadQueryFont (disp, name); |
721 | |
719 | |
722 | if (!f) |
720 | if (!f) |
723 | return false; |
721 | return false; |
724 | |
722 | |
725 | char *new_name = get_property (f, XA_FONT, name); |
723 | char *new_name = get_property (f, XA_FONT, 0); |
726 | |
724 | |
727 | if (new_name) |
725 | if (new_name) |
728 | set_name (new_name); |
726 | set_name (new_name); |
729 | else |
727 | else |
730 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
728 | rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name); |
731 | |
729 | |
732 | XFreeFont (disp, f); |
730 | XFreeFont (disp, f); |
733 | f = 0; |
731 | f = 0; |
734 | } |
732 | } |
735 | |
733 | |
… | |
… | |
792 | free (fname); |
790 | free (fname); |
793 | if (replace_field (&fname, list[i], 11, '0', "0")) |
791 | if (replace_field (&fname, list[i], 11, '0', "0")) |
794 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
792 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
795 | } |
793 | } |
796 | |
794 | |
797 | 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); |
798 | continue; |
801 | continue; |
799 | |
802 | } |
800 | if (prop.height != rxvt_fontprop::unset |
|
|
801 | && p.height > prop.height) // weed out too large fonts |
|
|
802 | continue; |
|
|
803 | |
803 | |
804 | 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; |
805 | 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); |
806 | 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); |
807 | //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); |
… | |
… | |
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 (); |
… | |
… | |
918 | } |
921 | } |
919 | #endif |
922 | #endif |
920 | |
923 | |
921 | width = 1; |
924 | width = 1; |
922 | |
925 | |
923 | 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; ) |
924 | { |
927 | { |
925 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
928 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
926 | continue; |
929 | continue; |
927 | |
930 | |
928 | // ignore characters we wouldn't use anyways |
931 | // ignore characters we wouldn't use anyways |
… | |
… | |
1236 | |
1239 | |
1237 | XftUnlockFace (f); |
1240 | XftUnlockFace (f); |
1238 | |
1241 | |
1239 | int glheight = height; |
1242 | int glheight = height; |
1240 | |
1243 | |
1241 | 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; ) |
1242 | { |
1245 | { |
1243 | FcChar16 ch = *t; |
1246 | FcChar16 ch = *t; |
1244 | |
1247 | |
1245 | if (cs != CS_UNICODE |
1248 | if (cs != CS_UNICODE |
1246 | && ch > 0x100 |
1249 | && ch > 0x100 |