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.48 by pcg, Tue Mar 16 11:07:44 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
… …
411 411
412 XFontStruct *f; 412 XFontStruct *f;
413 codeset cs; 413 codeset cs;
414 bool enc2b, encm; 414 bool enc2b, encm;
415 415
416 const char *get_property (XFontStruct *f, const char *property, const char *repl) const; 416 char *get_property (XFontStruct *f, const char *property, const char *repl) const;
417 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 417 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
418 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 418 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
419 bool set_properties (rxvt_fontprop &p, const char *name); 419 bool set_properties (rxvt_fontprop &p, const char *name);
420}; 420};
421 421
422const char * 422char *
423rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 423rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
424{ 424{
425 unsigned long value; 425 unsigned long value;
426 426
427 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 427 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
428 return XGetAtomName (DISPLAY, value); 428 return XGetAtomName (DISPLAY, value);
429 else 429 else
430 return repl; 430 return rxvt_strdup (repl);
431} 431}
432 432
433rxvt_fontprop 433rxvt_fontprop
434rxvt_font_x11::properties () 434rxvt_font_x11::properties ()
435{ 435{
… …
450} 450}
451 451
452bool 452bool
453rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 453rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
454{ 454{
455 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
456 const char *slant = get_property (f, "SLANT", "r");
457
458 unsigned long height; 455 unsigned long height;
459 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 456 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
460 return false; 457 return false;
461 458
462 unsigned long avgwidth; 459 unsigned long avgwidth;
463 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 460 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
464 avgwidth = 0; 461 avgwidth = 0;
465 462
463 char *weight = get_property (f, "WEIGHT_NAME", "medium");
464 char *slant = get_property (f, "SLANT", "r");
465
466 return set_properties (p, height, weight, slant, avgwidth); 466 set_properties (p, height, weight, slant, avgwidth);
467
468 free (weight);
469 free (slant);
470
471 return true;
467} 472}
468 473
469bool 474bool
470rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 475rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
471{ 476{
… …
534{ 539{
535 clear (); 540 clear ();
536 541
537 char **list; 542 char **list;
538 int count; 543 int count;
539 list = XListFonts (DISPLAY, name, 512, &count); 544 list = XListFonts (DISPLAY, name, 1024, &count);
540 set_name (0); 545 set_name (0);
541 546
542 if (!list) 547 if (!list)
543 return false; 548 return false;
544 549
… …
575 f = XLoadQueryFont (DISPLAY, name); 580 f = XLoadQueryFont (DISPLAY, name);
576 581
577 if (!f) 582 if (!f)
578 return false; 583 return false;
579 584
580 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 585 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
581 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 586 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
582 587
583 if (registry && encoding) 588 if (registry && encoding)
584 { 589 {
585 char charset[64]; 590 char charset[64];
586 snprintf (charset, 64, "%s-%s", registry, encoding); 591 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
599 if (*charset++ == '-' && !--count) 604 if (*charset++ == '-' && !--count)
600 break; 605 break;
601 606
602 cs = codeset_from_name (charset); 607 cs = codeset_from_name (charset);
603 } 608 }
609
610 free (registry);
611 free (encoding);
604 612
605 if (cs == CS_UNICODE) 613 if (cs == CS_UNICODE)
606 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 614 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
607 615
608 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 616 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
721 729
722 int base = r->TermWin.fbase; 730 int base = r->TermWin.fbase;
723 731
724 XGCValues v; 732 XGCValues v;
725 v.foreground = r->PixColors[fg]; 733 v.foreground = r->PixColors[fg];
726 v.background = r->PixColors[bg];
727 v.font = f->fid; 734 v.font = f->fid;
728 735
729 if (enc2b) 736 if (enc2b)
730 { 737 {
731 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 738 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
732 739
733 if (bg == Color_bg && !slow) 740 if (bg == Color_bg && !slow)
734 { 741 {
742 v.background = r->PixColors[bg];
735 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 743 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
736 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 744 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
737 } 745 }
738 else 746 else
739 { 747 {
… …
761 { 769 {
762 const char *xc = enc_char (text, len, cs, slow); 770 const char *xc = enc_char (text, len, cs, slow);
763 771
764 if (bg == Color_bg && !slow) 772 if (bg == Color_bg && !slow)
765 { 773 {
774 v.background = r->PixColors[bg];
766 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 775 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
767 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 776 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
768 } 777 }
769 else 778 else
770 { 779 {
… …
833{ 842{
834 rxvt_fontprop p; 843 rxvt_fontprop p;
835 844
836 FT_Face face = XftLockFace (f); 845 FT_Face face = XftLockFace (f);
837 846
838 p.width = width; p.height = height; 847 p.width = width;
839 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; 848 p.height = height;
840 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;
841 853
842 XftUnlockFace (f); 854 XftUnlockFace (f);
843 855
844 return p; 856 return p;
845} 857}
… …
858 870
859 if (!p) 871 if (!p)
860 return false; 872 return false;
861 873
862 FcValue v; 874 FcValue v;
875
876 if (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)
877 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
863 878
864 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 879 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
865 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 880 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
866 881
867 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 882 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
… …
989#endif 1004#endif
990 1005
991///////////////////////////////////////////////////////////////////////////// 1006/////////////////////////////////////////////////////////////////////////////
992 1007
993rxvt_fontset::rxvt_fontset (rxvt_t r) 1008rxvt_fontset::rxvt_fontset (rxvt_t r)
994: r (r) 1009: r (r), fontdesc (0)
995{ 1010{
996 clear (); 1011 clear ();
997} 1012}
998 1013
999rxvt_fontset::~rxvt_fontset () 1014rxvt_fontset::~rxvt_fontset ()
… …
1004void 1019void
1005rxvt_fontset::clear () 1020rxvt_fontset::clear ()
1006{ 1021{
1007 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1022 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1008 FONT_UNREF (*i); 1023 FONT_UNREF (*i);
1024
1025 free (fontdesc); fontdesc = 0;
1009 1026
1010 fonts.clear (); 1027 fonts.clear ();
1011 base_id = 0; 1028 base_id = 0;
1012 base_prop.height = 0x7fffffff; 1029 base_prop.height = 0x7fffffff;
1013 base_prop.weight = rxvt_fontprop::medium; 1030 base_prop.weight = rxvt_fontprop::medium;
… …
1121bool 1138bool
1122rxvt_fontset::populate (const char *desc) 1139rxvt_fontset::populate (const char *desc)
1123{ 1140{
1124 clear (); 1141 clear ();
1125 1142
1143 fontdesc = strdup (desc);
1144
1126 fonts.push_back (new_font (0, CS_UNICODE)); 1145 fonts.push_back (new_font (0, CS_UNICODE));
1127 realize_font (0); 1146 realize_font (0);
1128 1147
1129 add_fonts (desc); 1148 add_fonts (desc);
1130 1149
… …
1146 1165
1147 return true; 1166 return true;
1148} 1167}
1149 1168
1150int 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
1151rxvt_fontset::find_font (unicode_t unicode) 1180rxvt_fontset::find_font (unicode_t unicode, bool bold)
1152{ 1181{
1182
1153 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
1154 i < fonts.size (); 1184 i < fonts.size ();
1155 i++) 1185 i++)
1156 { 1186 {
1157 rxvt_font *f = fonts[i]; 1187 rxvt_font *f = fonts[i];
… …
1163 1193
1164 if (!realize_font (i)) 1194 if (!realize_font (i))
1165 goto next_font; 1195 goto next_font;
1166 } 1196 }
1167 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
1168 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) 1204 if (f->has_codepoint (unicode))
1169 return i; 1205 return i;
1170 1206
1171 next_font: 1207 next_font:
1172 if (i == fonts.size () - 1 && fallback->name) 1208 if (i == fonts.size () - 1)
1209 {
1210 if (fallback->name)
1173 { 1211 {
1212 // search through the fallback list
1174 fonts.push_back (new_font (fallback->name, fallback->cs)); 1213 fonts.push_back (new_font (fallback->name, fallback->cs));
1175 fallback++; 1214 fallback++;
1176 i = 0;
1177 } 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 }
1178 } 1258 }
1259
1260 // if no bold font found, use a regular one
1261 if (bold)
1262 return find_font (unicode);
1179 1263
1180 return 0; /* we must return SOME font */ 1264 return 0; /* we must return SOME font */
1181} 1265}
1182 1266
1183 1267

Diff Legend

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