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.45 by pcg, Tue Mar 16 05:51:36 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
… …
230 bool has_codepoint (unicode_t unicode) 233 bool has_codepoint (unicode_t unicode)
231 { 234 {
232 if (unicode <= 0x001f) 235 if (unicode <= 0x001f)
233 return true; 236 return true;
234 237
235 if (unicode >= 0x0080 && unicode <= 0x009f) 238 if (unicode <= 0x007f)
239 return false;
240
241 if (unicode <= 0x009f)
236 return true; 242 return true;
237 243
238 if (unicode >= 0x2500 && unicode <= 0x259f 244 if (unicode >= 0x2500 && unicode <= 0x259f)
239 && linedraw_offs[unicode - 0x2500] & 15)
240 return true; 245 return true;
241 246
242 if (IS_COMPOSE (unicode)) 247 if (IS_COMPOSE (unicode))
243 return true; 248 return true;
244 249
… …
259void 264void
260rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 265rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
261 const text_t *text, int len, 266 const text_t *text, int len,
262 int fg, int bg) 267 int fg, int bg)
263{ 268{
264return;
265 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 269 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
266 270
267 XSetForeground (d.display->display, TGC, r->PixColors[fg]); 271 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
268 272
269 while (len--) 273 while (len--)
… …
271#if ENABLE_COMBINING 275#if ENABLE_COMBINING
272 compose_char *cc; 276 compose_char *cc;
273#endif 277#endif
274 text_t t = *text++; 278 text_t t = *text++;
275 279
276 int W = r->TermWin.fwidth , w = (W - 1) / 2;
277 int H = r->TermWin.fheight, h = (H - 1) / 2;
278 int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ;
279 int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight;
280
281 if (0x2500 <= t && t <= 0x259f 280 if (0x2500 <= t && t <= 0x259f)
282 && linedraw_offs[t - 0x2500] & 15)
283 { 281 {
284 uint16_t offs = linedraw_offs[t - 0x2500]; 282 uint16_t offs = linedraw_offs[t - 0x2500];
285 uint32_t *a = linedraw_command + (offs >> 4); 283 uint32_t *a = linedraw_command + (offs >> 4);
286 uint32_t *b = a + (offs & 15); 284 uint32_t *b = a + (offs & 15);
285
286 int W = r->TermWin.fwidth;
287 int H = r->TermWin.fheight;
287 288
288 int x_[16]; 289 int x_[16];
289 int y_[16]; 290 int y_[16];
290 291
291 for (int i = 0; i <= 8; i++) 292 for (int i = 0; i <= 8; i++)
… …
334 XChangeGC (d.display->display, TGC, 335 XChangeGC (d.display->display, TGC,
335 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 336 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
336 &gcv); 337 &gcv);
337 } 338 }
338 339
339
340 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 340 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
341 341
342 if (a) 342 if (a)
343 { 343 {
344 XFreePixmap (d.display->display, gcv.stipple); 344 XFreePixmap (d.display->display, gcv.stipple);
345 gcv.stipple = 0; 345 gcv.stipple = 0;
346 gcv.fill_style = FillSolid; 346 gcv.fill_style = FillSolid;
347 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 347 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
348 } 348 }
349
350 break; 349 break;
351 case 2: // arc 350 case 2: // arc
352 XDrawArc (d.display->display, d, TGC, 351 XDrawArc (d.display->display, d, TGC,
353 x1 - W/2, y1 - H/2, W-1, H-1, 352 x1 - W/2, y1 - H/2, W-1, H-1,
354 (a - 1) * 90*64, (b - 1) * 90*64); 353 (a - 1) * 90*64, (b - 1) * 90*64);
… …
415 414
416 XFontStruct *f; 415 XFontStruct *f;
417 codeset cs; 416 codeset cs;
418 bool enc2b, encm; 417 bool enc2b, encm;
419 418
420 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;
421 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);
422 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 421 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
423 bool set_properties (rxvt_fontprop &p, const char *name); 422 bool set_properties (rxvt_fontprop &p, const char *name);
424}; 423};
425 424
426const char * 425char *
427rxvt_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
428{ 427{
429 unsigned long value; 428 unsigned long value;
430 429
431 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 430 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
432 return XGetAtomName (DISPLAY, value); 431 return XGetAtomName (DISPLAY, value);
433 else 432 else
434 return repl; 433 return rxvt_strdup (repl);
435} 434}
436 435
437rxvt_fontprop 436rxvt_fontprop
438rxvt_font_x11::properties () 437rxvt_font_x11::properties ()
439{ 438{
… …
454} 453}
455 454
456bool 455bool
457rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 456rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
458{ 457{
459 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
460 const char *slant = get_property (f, "SLANT", "r");
461
462 unsigned long height; 458 unsigned long height;
463 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 459 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
464 return false; 460 return false;
465 461
466 unsigned long avgwidth; 462 unsigned long avgwidth;
467 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 463 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
468 avgwidth = 0; 464 avgwidth = 0;
469 465
466 char *weight = get_property (f, "WEIGHT_NAME", "medium");
467 char *slant = get_property (f, "SLANT", "r");
468
470 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;
471} 475}
472 476
473bool 477bool
474rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 478rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
475{ 479{
… …
579 f = XLoadQueryFont (DISPLAY, name); 583 f = XLoadQueryFont (DISPLAY, name);
580 584
581 if (!f) 585 if (!f)
582 return false; 586 return false;
583 587
584 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 588 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
585 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 589 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
586 590
587 if (registry && encoding) 591 if (registry && encoding)
588 { 592 {
589 char charset[64]; 593 char charset[64];
590 snprintf (charset, 64, "%s-%s", registry, encoding); 594 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
603 if (*charset++ == '-' && !--count) 607 if (*charset++ == '-' && !--count)
604 break; 608 break;
605 609
606 cs = codeset_from_name (charset); 610 cs = codeset_from_name (charset);
607 } 611 }
612
613 free (registry);
614 free (encoding);
608 615
609 if (cs == CS_UNICODE) 616 if (cs == CS_UNICODE)
610 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
611 618
612 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 619 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
725 732
726 int base = r->TermWin.fbase; 733 int base = r->TermWin.fbase;
727 734
728 XGCValues v; 735 XGCValues v;
729 v.foreground = r->PixColors[fg]; 736 v.foreground = r->PixColors[fg];
730 v.background = r->PixColors[bg];
731 v.font = f->fid; 737 v.font = f->fid;
732 738
733 if (enc2b) 739 if (enc2b)
734 { 740 {
735 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 741 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
736 742
737 if (bg == Color_bg && !slow) 743 if (bg == Color_bg && !slow)
738 { 744 {
745 v.background = r->PixColors[bg];
739 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 746 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
740 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 747 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
741 } 748 }
742 else 749 else
743 { 750 {
… …
765 { 772 {
766 const char *xc = enc_char (text, len, cs, slow); 773 const char *xc = enc_char (text, len, cs, slow);
767 774
768 if (bg == Color_bg && !slow) 775 if (bg == Color_bg && !slow)
769 { 776 {
777 v.background = r->PixColors[bg];
770 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 778 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
771 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 779 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
772 } 780 }
773 else 781 else
774 { 782 {
… …
993#endif 1001#endif
994 1002
995///////////////////////////////////////////////////////////////////////////// 1003/////////////////////////////////////////////////////////////////////////////
996 1004
997rxvt_fontset::rxvt_fontset (rxvt_t r) 1005rxvt_fontset::rxvt_fontset (rxvt_t r)
998: r (r) 1006: r (r), fontdesc (0)
999{ 1007{
1000 clear (); 1008 clear ();
1001} 1009}
1002 1010
1003rxvt_fontset::~rxvt_fontset () 1011rxvt_fontset::~rxvt_fontset ()
… …
1008void 1016void
1009rxvt_fontset::clear () 1017rxvt_fontset::clear ()
1010{ 1018{
1011 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1019 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1012 FONT_UNREF (*i); 1020 FONT_UNREF (*i);
1021
1022 free (fontdesc); fontdesc = 0;
1013 1023
1014 fonts.clear (); 1024 fonts.clear ();
1015 base_id = 0; 1025 base_id = 0;
1016 base_prop.height = 0x7fffffff; 1026 base_prop.height = 0x7fffffff;
1017 base_prop.weight = rxvt_fontprop::medium; 1027 base_prop.weight = rxvt_fontprop::medium;
… …
1125bool 1135bool
1126rxvt_fontset::populate (const char *desc) 1136rxvt_fontset::populate (const char *desc)
1127{ 1137{
1128 clear (); 1138 clear ();
1129 1139
1140 fontdesc = strdup (desc);
1141
1130 fonts.push_back (new_font (0, CS_UNICODE)); 1142 fonts.push_back (new_font (0, CS_UNICODE));
1131 realize_font (0); 1143 realize_font (0);
1132 1144
1133 add_fonts (desc); 1145 add_fonts (desc);
1134 1146
… …
1150 1162
1151 return true; 1163 return true;
1152} 1164}
1153 1165
1154int 1166int
1155rxvt_fontset::find_font (unicode_t unicode) 1167rxvt_fontset::find_font (unicode_t unicode, bool bold)
1156{ 1168{
1157 for (unsigned int i = 0; i < fonts.size (); i++) 1169 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1170 i < fonts.size ();
1171 i++)
1158 { 1172 {
1159 rxvt_font *f = fonts[i]; 1173 rxvt_font *f = fonts[i];
1160 1174
1161 if (!f->loaded) 1175 if (!f->loaded)
1162 { 1176 {
… …
1165 1179
1166 if (!realize_font (i)) 1180 if (!realize_font (i))
1167 goto next_font; 1181 goto next_font;
1168 } 1182 }
1169 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
1170 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) 1190 if (f->has_codepoint (unicode))
1171 return i; 1191 return i;
1172 1192
1173 next_font: 1193 next_font:
1174 if (i == fonts.size () - 1 && fallback->name) 1194 if (i == fonts.size () - 1 && fallback->name)
1175 { 1195 {
… …
1177 fallback++; 1197 fallback++;
1178 i = 0; 1198 i = 0;
1179 } 1199 }
1180 } 1200 }
1181 1201
1202 // if no bold font found, use a regular one
1203 if (bold)
1204 return find_font (unicode);
1205
1182 return 0; /* we must return SOME font */ 1206 return 0; /* we must return SOME font */
1183} 1207}
1184 1208
1185 1209
1186 1210

Diff Legend

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