ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/defaultfont.C
(Generate patch)

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.50 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.57 by root, Wed Aug 11 01:36:51 2004 UTC

1/*--------------------------------*-C-*---------------------------------*; 1/*--------------------------------*-C-*---------------------------------*
2 * File: defaultfont.C 2 * File: defaultfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
… …
30 30
31const struct rxvt_fallback_font { 31const struct rxvt_fallback_font {
32 codeset cs; 32 codeset cs;
33 const char *name; 33 const char *name;
34} fallback_fonts[] = { 34} fallback_fonts[] = {
35 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 35 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
36 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 36 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
37 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 37 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
38 38
39#if ENCODING_EU 39#if ENCODING_EU
40 // cyrillic 40 // cyrillic
41 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 41 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
42 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 42 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
43 43
44 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 44 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
45 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 45 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
46 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 46 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
47 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 47 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
48 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 48 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
49 { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" }, 49 { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" },
50 { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" }, 50 { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" },
51 { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" }, 51 { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" },
52 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, 52 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" },
53 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, 53 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" },
54 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 54 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
55 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 55 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
56 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 56 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
57#endif 57#endif
58 58
59 // japanese 59 // japanese
60#if ENCODING_JP || ENCODING_JP_EXT 60#if ENCODING_JP || ENCODING_JP_EXT
61# if XFT 61# if XFT
… …
63 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, 63 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" },
64# endif 64# endif
65 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 65 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
66 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 66 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
67 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 67 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
68 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
69 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
70 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
68#endif 71#endif
69 72
70#if ENCODING_CN || ENCODING_CN_EXT 73#if ENCODING_CN || ENCODING_CN_EXT
71# if XFT 74# if XFT
72 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 75 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
… …
89#endif 92#endif
90 93
91#if XFT 94#if XFT
92 { CS_UNICODE, "xft:Andale Mono" }, 95 { CS_UNICODE, "xft:Andale Mono" },
93 { CS_UNICODE, "xft:Arial Unicode MS" }, 96 { CS_UNICODE, "xft:Arial Unicode MS" },
97 { CS_UNICODE, "xft:FreeMono" },
94#endif 98#endif
95 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
96 { CS_UNICODE, "xft:FreeMono" },
97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 100 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 101 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 102 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
100 103
101#if UNICODE_3 && XFT
102 { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
103#endif
104
105 { CS_UNKNOWN, 0 } 104 { CS_UNKNOWN, 0 }
106}; 105};
107 106
108///////////////////////////////////////////////////////////////////////////// 107/////////////////////////////////////////////////////////////////////////////
109 108
… …
133{ 132{
134 if (len > enc_len) 133 if (len > enc_len)
135 { 134 {
136 free (enc_buf); 135 free (enc_buf);
137 enc_buf = malloc (len); 136 enc_buf = malloc (len);
137 enc_len = len;
138 } 138 }
139 139
140 return enc_buf; 140 return enc_buf;
141} 141}
142 142
… …
539{ 539{
540 clear (); 540 clear ();
541 541
542 char **list; 542 char **list;
543 int count; 543 int count;
544 list = XListFonts (DISPLAY, name, 512, &count); 544 list = XListFonts (DISPLAY, name, 1024, &count);
545 set_name (0); 545 set_name (0);
546 546
547 if (!list) 547 if (!list)
548 return false; 548 return false;
549 549
… …
842{ 842{
843 rxvt_fontprop p; 843 rxvt_fontprop p;
844 844
845 FT_Face face = XftLockFace (f); 845 FT_Face face = XftLockFace (f);
846 846
847 p.width = width; p.height = height; 847 p.width = width;
848 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; 848 p.height = height;
849 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman; 849 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
850 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
851 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
852 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
850 853
851 XftUnlockFace (f); 854 XftUnlockFace (f);
852 855
853 return p; 856 return p;
854} 857}
… …
867 870
868 if (!p) 871 if (!p)
869 return false; 872 return false;
870 873
871 FcValue v; 874 FcValue v;
875
876 if (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)
877 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
872 878
873 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 879 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
874 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 880 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
875 881
876 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 882 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
… …
998#endif 1004#endif
999 1005
1000///////////////////////////////////////////////////////////////////////////// 1006/////////////////////////////////////////////////////////////////////////////
1001 1007
1002rxvt_fontset::rxvt_fontset (rxvt_t r) 1008rxvt_fontset::rxvt_fontset (rxvt_t r)
1003: r (r) 1009: r (r), fontdesc (0)
1004{ 1010{
1005 clear (); 1011 clear ();
1006} 1012}
1007 1013
1008rxvt_fontset::~rxvt_fontset () 1014rxvt_fontset::~rxvt_fontset ()
… …
1013void 1019void
1014rxvt_fontset::clear () 1020rxvt_fontset::clear ()
1015{ 1021{
1016 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1022 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1017 FONT_UNREF (*i); 1023 FONT_UNREF (*i);
1024
1025 free (fontdesc); fontdesc = 0;
1018 1026
1019 fonts.clear (); 1027 fonts.clear ();
1020 base_id = 0; 1028 base_id = 0;
1021 base_prop.height = 0x7fffffff; 1029 base_prop.height = 0x7fffffff;
1022 base_prop.weight = rxvt_fontprop::medium; 1030 base_prop.weight = rxvt_fontprop::medium;
… …
1130bool 1138bool
1131rxvt_fontset::populate (const char *desc) 1139rxvt_fontset::populate (const char *desc)
1132{ 1140{
1133 clear (); 1141 clear ();
1134 1142
1143 fontdesc = strdup (desc);
1144
1135 fonts.push_back (new_font (0, CS_UNICODE)); 1145 fonts.push_back (new_font (0, CS_UNICODE));
1136 realize_font (0); 1146 realize_font (0);
1137 1147
1138 add_fonts (desc); 1148 add_fonts (desc);
1139 1149
… …
1155 1165
1156 return true; 1166 return true;
1157} 1167}
1158 1168
1159int 1169int
1170rxvt_fontset::find_font (const char *name) const
1171{
1172 for (rxvt_font *const *f = fonts.begin (); f < fonts.end (); f++)
1173 if ((*f)->name && !strcmp ((*f)->name, name))
1174 return f - fonts.begin ();
1175
1176 return -1;
1177}
1178
1179int
1160rxvt_fontset::find_font (unicode_t unicode) 1180rxvt_fontset::find_font (unicode_t unicode, bool bold)
1161{ 1181{
1182
1162 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii 1183 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1163 i < fonts.size (); 1184 i < fonts.size ();
1164 i++) 1185 i++)
1165 { 1186 {
1166 rxvt_font *f = fonts[i]; 1187 rxvt_font *f = fonts[i];
… …
1172 1193
1173 if (!realize_font (i)) 1194 if (!realize_font (i))
1174 goto next_font; 1195 goto next_font;
1175 } 1196 }
1176 1197
1198 if (f->cs == CS_UNKNOWN)
1199 goto next_font;
1200
1201 if (bold && f->properties ().weight < rxvt_fontprop::bold)
1202 goto next_font;
1203
1177 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) 1204 if (f->has_codepoint (unicode))
1178 return i; 1205 return i;
1179 1206
1180 next_font: 1207 next_font:
1181 if (i == fonts.size () - 1 && fallback->name) 1208 if (i == fonts.size () - 1)
1209 {
1210 if (fallback->name)
1182 { 1211 {
1212 // search through the fallback list
1183 fonts.push_back (new_font (fallback->name, fallback->cs)); 1213 fonts.push_back (new_font (fallback->name, fallback->cs));
1184 fallback++; 1214 fallback++;
1185 i = 0;
1186 } 1215 }
1216 else
1217 {
1218 // try to find a new font
1219 // only xft currently supported, as there is no
1220 // way to configure this and xft is easier to hack in,
1221 // while x11 has more framework in place already.
1222#if XFT
1223 // grab the first xft font that is suitable
1224 FcPattern *p = FcPatternCreate ();
1225
1226 FcCharSet *s = FcCharSetCreate ();
1227 FcCharSetAddChar (s, unicode);
1228 FcPatternAddCharSet (p, FC_CHARSET, s);
1229
1230 FcPatternAddInteger (p, FC_PIXEL_SIZE, base_prop.height);
1231 FcPatternAddInteger (p, FC_WEIGHT, base_prop.weight);
1232 FcPatternAddInteger (p, FC_SLANT, base_prop.slant);
1233
1234 XftResult result;
1235 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
1236
1237 FcPatternDestroy (p);
1238
1239 if (match)
1240 {
1241 FcPatternDel (match, FC_CHARSET);
1242 char *font = (char *)FcNameUnparse (match);
1243 FcPatternDestroy (match);
1244
1245 if (find_font (font) < 0)
1246 {
1247 char fontname[4096];
1248 sprintf (fontname, "xft:%-.4090s", font);
1249
1250 fonts.push_back (new_font (fontname, CS_UNICODE));
1251 }
1252
1253 free (font);
1254 }
1255#endif
1256 }
1257 }
1187 } 1258 }
1259
1260 // if no bold font found, use a regular one
1261 if (bold)
1262 return find_font (unicode);
1188 1263
1189 return 0; /* we must return SOME font */ 1264 return 0; /* we must return SOME font */
1190} 1265}
1191 1266
1192 1267

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines