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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.41 by root, Wed Aug 25 02:33:09 2004 UTC vs.
Revision 1.46 by root, Wed Sep 8 05:45:30 2004 UTC

… …
88 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 88 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
89 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 89 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
90 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 90 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
91#endif 91#endif
92 92
93#if ENCODING_CN || ENCODING_CN_EXT 93#if ENCODING_ZH || ENCODING_ZH_EXT
94# if XFT 94# if XFT
95 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 95 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
96 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 96 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
97 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 97 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
98 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 98 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
… …
125 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 125 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
126 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 126 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
127 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 127 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
128 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 128 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
129#if XFT 129#if XFT
130 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false"}, 130 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"},
131 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
131 { CS_UNICODE, "xft:Andale Mono:antialias=false" }, 132 { CS_UNICODE, "xft:Andale Mono:antialias=false" },
132 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, 133 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" },
133 { CS_UNICODE, "xft:Courier New:antialias=false" },
134 134
135 // FreeMono is usually uglier than x fonts, so try last only. 135 // FreeMono is usually uglier than x fonts, so try last only.
136 { CS_UNICODE, "xft:FreeMono" }, 136 { CS_UNICODE, "xft:FreeMono:autohint=true" },
137#endif 137#endif
138 138
139 { CS_UNKNOWN, 0 } 139 { CS_UNKNOWN, 0 }
140}; 140};
141 141
… …
418 } 418 }
419 } 419 }
420#if ENABLE_COMBINING 420#if ENABLE_COMBINING
421 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 421 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
422 { 422 {
423 text_t c2[2];
424 int len2 = 1;
425
426 // support double-width (but not more) combining characters
427 if (len && *text == NOCHAR)
428 {
429 c2[1] = *text; // not text++ to get correct x-width
430 len2++;
431 }
432
433 c2[0] = cc->c1;
423 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 434 rxvt_font *f1 = (*fs)[fs->find_font (c2[0])];
424 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); 435 f1->draw (d, x, y, c2, len2, fg, bg);
436
425 if (cc->c2 != NOCHAR) 437 if (cc->c2 != NOCHAR)
426 { 438 {
439 bool careful;
440
427 // prefer font of first character, for no good reasons 441 // prefer font of first character, for no good reasons
428 bool careful; 442 c2[0] = cc->c2;
429 rxvt_font *f2 = f1->has_char (cc->c2, 0, careful) 443 rxvt_font *f2 = (f1->has_char (c2[0], 0, careful) && !careful)
430 ? f1 444 ? f1
431 : (*fs)[fs->find_font (cc->c2)]; 445 : (*fs)[fs->find_font (c2[0])];
432 446
433 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); 447 f2->draw (d, x, y, c2, len2, fg, -1);
434 } 448 }
435 } 449 }
436#endif 450#endif
437 else 451 else
438 switch (t) 452 switch (t)
… …
1264} 1278}
1265 1279
1266void 1280void
1267rxvt_fontset::clear () 1281rxvt_fontset::clear ()
1268{ 1282{
1283 prop.width = prop.height = prop.weight = prop.slant
1284 = rxvt_fontprop::unset;
1285
1269 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1286 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1270 FONT_UNREF (*i); 1287 FONT_UNREF (*i);
1271 1288
1272 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1289 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1273 delete *p; 1290 delete *p;
… …
1393 1410
1394 return true; 1411 return true;
1395} 1412}
1396 1413
1397bool 1414bool
1398rxvt_fontset::populate (const char *desc, const rxvt_fontprop &prop) 1415rxvt_fontset::populate (const char *desc)
1399{ 1416{
1400 clear (); 1417 clear ();
1401 1418
1402 fontdesc = strdup (desc); 1419 fontdesc = strdup (desc);
1403 1420
1404 fonts.push_back (new_font (0, CS_UNICODE)); 1421 fonts.push_back (new_font (0, CS_UNICODE));
1405 realize_font (0); 1422 realize_font (0);
1406
1407 this->prop = prop;
1408 1423
1409 add_fonts (desc); 1424 add_fonts (desc);
1410 1425
1411 return true; 1426 return true;
1412} 1427}

Diff Legend

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