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.53 by root, Mon Jun 21 19:09:44 2004 UTC vs.
Revision 1.58 by root, Wed Aug 11 03:51:32 2004 UTC

… …
60#if ENCODING_JP || ENCODING_JP_EXT 60#if ENCODING_JP || ENCODING_JP_EXT
61# if XFT 61# if XFT
62 // prefer xft for complex scripts 62 // prefer xft for complex scripts
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" },
66 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
67 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
65 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 68 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
66 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 69 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
67 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 70 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
68#endif 71#endif
69 72
… …
96 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
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)
… …
1159 1165
1160 return true; 1166 return true;
1161} 1167}
1162 1168
1163int 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
1164rxvt_fontset::find_font (unicode_t unicode) 1180rxvt_fontset::find_font (unicode_t unicode, bool bold)
1165{ 1181{
1182
1166 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
1167 i < fonts.size (); 1184 i < fonts.size ();
1168 i++) 1185 i++)
1169 { 1186 {
1170 rxvt_font *f = fonts[i]; 1187 rxvt_font *f = fonts[i];
… …
1176 1193
1177 if (!realize_font (i)) 1194 if (!realize_font (i))
1178 goto next_font; 1195 goto next_font;
1179 } 1196 }
1180 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
1181 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) 1204 if (f->has_codepoint (unicode))
1182 return i; 1205 return i;
1183 1206
1184 next_font: 1207 next_font:
1185 if (i == fonts.size () - 1 && fallback->name) 1208 if (i == fonts.size () - 1)
1209 {
1210 if (fallback->name)
1186 { 1211 {
1212 // search through the fallback list
1187 fonts.push_back (new_font (fallback->name, fallback->cs)); 1213 fonts.push_back (new_font (fallback->name, fallback->cs));
1188 fallback++; 1214 fallback++;
1189 i = 0;
1190 } 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 seems suitable
1224 FcPattern *p = FcPatternCreate ();
1225
1226 FcCharSet *s = FcCharSetCreate ();
1227 FcCharSetAddChar (s, unicode);
1228 FcPatternAddCharSet (p, FC_CHARSET, s);
1229 // charsets don't help that much, as xft might return
1230 // a non-matching font even if a better font is available :/
1231
1232 FcPatternAddInteger (p, FC_PIXEL_SIZE, base_prop.height);
1233 FcPatternAddInteger (p, FC_WEIGHT, base_prop.weight);
1234 FcPatternAddInteger (p, FC_SLANT, base_prop.slant);
1235
1236 XftResult result;
1237 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
1238
1239 FcPatternDestroy (p);
1240
1241 if (match)
1242 {
1243 FcPatternDel (match, FC_CHARSET);
1244 char *font = (char *)FcNameUnparse (match);
1245 FcPatternDestroy (match);
1246
1247 if (find_font (font) < 0)
1248 {
1249 char fontname[4096];
1250 sprintf (fontname, "xft:%-.4090s", font);
1251
1252 fonts.push_back (new_font (fontname, CS_UNICODE));
1253 }
1254
1255 free (font);
1256 }
1257#endif
1258 }
1259 }
1191 } 1260 }
1261
1262 // if no bold font found, use a regular one
1263 if (bold)
1264 return find_font (unicode);
1192 1265
1193 return 0; /* we must return SOME font */ 1266 return 0; /* we must return SOME font */
1194} 1267}
1195 1268
1196 1269

Diff Legend

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