… | |
… | |
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 (); |