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.55 by root, Mon Jul 26 14:57:12 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 104#if UNICODE_3 && XFT
… …
411 414
412 XFontStruct *f; 415 XFontStruct *f;
413 codeset cs; 416 codeset cs;
414 bool enc2b, encm; 417 bool enc2b, encm;
415 418
416 const char *get_property (XFontStruct *f, const char *property, const char *repl) const; 419 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); 420 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); 421 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
419 bool set_properties (rxvt_fontprop &p, const char *name); 422 bool set_properties (rxvt_fontprop &p, const char *name);
420}; 423};
421 424
422const char * 425char *
423rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 426rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
424{ 427{
425 unsigned long value; 428 unsigned long value;
426 429
427 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 430 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
428 return XGetAtomName (DISPLAY, value); 431 return XGetAtomName (DISPLAY, value);
429 else 432 else
430 return repl; 433 return rxvt_strdup (repl);
431} 434}
432 435
433rxvt_fontprop 436rxvt_fontprop
434rxvt_font_x11::properties () 437rxvt_font_x11::properties ()
435{ 438{
… …
450} 453}
451 454
452bool 455bool
453rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 456rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
454{ 457{
455 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
456 const char *slant = get_property (f, "SLANT", "r");
457
458 unsigned long height; 458 unsigned long height;
459 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 459 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
460 return false; 460 return false;
461 461
462 unsigned long avgwidth; 462 unsigned long avgwidth;
463 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 463 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
464 avgwidth = 0; 464 avgwidth = 0;
465 465
466 char *weight = get_property (f, "WEIGHT_NAME", "medium");
467 char *slant = get_property (f, "SLANT", "r");
468
466 return set_properties (p, height, weight, slant, avgwidth); 469 set_properties (p, height, weight, slant, avgwidth);
470
471 free (weight);
472 free (slant);
473
474 return true;
467} 475}
468 476
469bool 477bool
470rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 478rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
471{ 479{
… …
575 f = XLoadQueryFont (DISPLAY, name); 583 f = XLoadQueryFont (DISPLAY, name);
576 584
577 if (!f) 585 if (!f)
578 return false; 586 return false;
579 587
580 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 588 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
581 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 589 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
582 590
583 if (registry && encoding) 591 if (registry && encoding)
584 { 592 {
585 char charset[64]; 593 char charset[64];
586 snprintf (charset, 64, "%s-%s", registry, encoding); 594 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
599 if (*charset++ == '-' && !--count) 607 if (*charset++ == '-' && !--count)
600 break; 608 break;
601 609
602 cs = codeset_from_name (charset); 610 cs = codeset_from_name (charset);
603 } 611 }
612
613 free (registry);
614 free (encoding);
604 615
605 if (cs == CS_UNICODE) 616 if (cs == CS_UNICODE)
606 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 617 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
607 618
608 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 619 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
721 732
722 int base = r->TermWin.fbase; 733 int base = r->TermWin.fbase;
723 734
724 XGCValues v; 735 XGCValues v;
725 v.foreground = r->PixColors[fg]; 736 v.foreground = r->PixColors[fg];
726 v.background = r->PixColors[bg];
727 v.font = f->fid; 737 v.font = f->fid;
728 738
729 if (enc2b) 739 if (enc2b)
730 { 740 {
731 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 741 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
732 742
733 if (bg == Color_bg && !slow) 743 if (bg == Color_bg && !slow)
734 { 744 {
745 v.background = r->PixColors[bg];
735 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 746 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
736 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 747 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
737 } 748 }
738 else 749 else
739 { 750 {
… …
761 { 772 {
762 const char *xc = enc_char (text, len, cs, slow); 773 const char *xc = enc_char (text, len, cs, slow);
763 774
764 if (bg == Color_bg && !slow) 775 if (bg == Color_bg && !slow)
765 { 776 {
777 v.background = r->PixColors[bg];
766 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 778 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
767 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 779 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
768 } 780 }
769 else 781 else
770 { 782 {
… …
989#endif 1001#endif
990 1002
991///////////////////////////////////////////////////////////////////////////// 1003/////////////////////////////////////////////////////////////////////////////
992 1004
993rxvt_fontset::rxvt_fontset (rxvt_t r) 1005rxvt_fontset::rxvt_fontset (rxvt_t r)
994: r (r) 1006: r (r), fontdesc (0)
995{ 1007{
996 clear (); 1008 clear ();
997} 1009}
998 1010
999rxvt_fontset::~rxvt_fontset () 1011rxvt_fontset::~rxvt_fontset ()
… …
1004void 1016void
1005rxvt_fontset::clear () 1017rxvt_fontset::clear ()
1006{ 1018{
1007 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1019 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1008 FONT_UNREF (*i); 1020 FONT_UNREF (*i);
1021
1022 free (fontdesc); fontdesc = 0;
1009 1023
1010 fonts.clear (); 1024 fonts.clear ();
1011 base_id = 0; 1025 base_id = 0;
1012 base_prop.height = 0x7fffffff; 1026 base_prop.height = 0x7fffffff;
1013 base_prop.weight = rxvt_fontprop::medium; 1027 base_prop.weight = rxvt_fontprop::medium;
… …
1121bool 1135bool
1122rxvt_fontset::populate (const char *desc) 1136rxvt_fontset::populate (const char *desc)
1123{ 1137{
1124 clear (); 1138 clear ();
1125 1139
1140 fontdesc = strdup (desc);
1141
1126 fonts.push_back (new_font (0, CS_UNICODE)); 1142 fonts.push_back (new_font (0, CS_UNICODE));
1127 realize_font (0); 1143 realize_font (0);
1128 1144
1129 add_fonts (desc); 1145 add_fonts (desc);
1130 1146
… …
1146 1162
1147 return true; 1163 return true;
1148} 1164}
1149 1165
1150int 1166int
1151rxvt_fontset::find_font (unicode_t unicode) 1167rxvt_fontset::find_font (unicode_t unicode, bool bold)
1152{ 1168{
1153 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii 1169 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1154 i < fonts.size (); 1170 i < fonts.size ();
1155 i++) 1171 i++)
1156 { 1172 {
… …
1163 1179
1164 if (!realize_font (i)) 1180 if (!realize_font (i))
1165 goto next_font; 1181 goto next_font;
1166 } 1182 }
1167 1183
1184 if (f->cs == CS_UNKNOWN)
1185 goto next_font;
1186
1187 if (bold && f->properties ().weight < rxvt_fontprop::bold)
1188 goto next_font;
1189
1168 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) 1190 if (f->has_codepoint (unicode))
1169 return i; 1191 return i;
1170 1192
1171 next_font: 1193 next_font:
1172 if (i == fonts.size () - 1 && fallback->name) 1194 if (i == fonts.size () - 1 && fallback->name)
1173 { 1195 {
… …
1175 fallback++; 1197 fallback++;
1176 i = 0; 1198 i = 0;
1177 } 1199 }
1178 } 1200 }
1179 1201
1202 // if no bold font found, use a regular one
1203 if (bold)
1204 return find_font (unicode);
1205
1180 return 0; /* we must return SOME font */ 1206 return 0; /* we must return SOME font */
1181} 1207}
1182 1208
1183 1209
1184 1210

Diff Legend

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