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.204 by root, Thu Jun 17 11:45:19 2021 UTC vs.
Revision 1.218 by root, Sat Jul 3 04:33:01 2021 UTC

… …
134# endif 134# endif
135#endif 135#endif
136 136
137 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. 137 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
138#if XFT 138#if XFT
139 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:DejaVu Sans Mono:antialias=false:autohint=true" },
140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
142 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 142 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
143 143
144 // FreeMono is usually uglier than x fonts, so try after the others 144 // FreeMono is usually uglier than x fonts, so try after the others
145 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 145 { CS_UNICODE, "xft:FreeMono:autohint=true" },
146#endif 146#endif
147 147
… …
212} 212}
213 213
214///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
215 215
216rxvt_font::rxvt_font () 216rxvt_font::rxvt_font ()
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset), can_compose(false) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{ 218{
219} 219}
220 220
221void 221void
222rxvt_font::set_name (char *name_) 222rxvt_font::set_name (char *name_)
… …
445#endif 445#endif
446#if ENABLE_COMBINING 446#if ENABLE_COMBINING
447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
448 { 448 {
449 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
450
451 #if NOT_YET
452 vector<text_t> chrs;
453 chrs.reserve (rxvt_composite.expand (t));
454 rxvt_composite.expand (t, &chrs[0]);
455
456 while (!chrs.empty ())
457 {
458 rxvt_font *f1 = fs->find_font_idx (chrs[0])
459
460 int i = 0;
461 while (i < chrs.size () - 1
462 && f1->can_combine
463 && f1->has-char (chrs[i + 1], careful)
464 && !careful
465 ++i;
466
467 (*fs)[f1]->draw (d, x, y, &chrs[0], width, fg, bg);
468 chrs.erase (&chrs[0], &chrs[i]);
469 }
470 #endif
471
472 #if 1
473 text_t chrs[2]; 450 text_t chrs[2];
474 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
475 452
476 *chrs = cc->c1; 453 *chrs = cc->c1;
477 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
… …
487 ? f1 464 ? f1
488 : (*fs)[fs->find_font_idx (cc->c2)]; 465 : (*fs)[fs->find_font_idx (cc->c2)];
489 466
490 f2->draw (d, x, y, chrs, width, fg, Color_none); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
491 } 468 }
492 #endif
493 } 469 }
494#endif 470#endif
495 else 471 else
496 switch (t) 472 switch (t)
497 { 473 {
… …
1161 1137
1162#if XFT 1138#if XFT
1163 1139
1164struct rxvt_font_xft : rxvt_font 1140struct rxvt_font_xft : rxvt_font
1165{ 1141{
1142#if XFT_CHAR_CACHE
1143 // we cache the qascii range xoffsets in the name of speed,
1144 // expecting terminals to deal mostly with these characters
1145 // we also assume the xoff always fits into uint8_t,
1146 // which is questionable, but let's see...
1147 // also, it is uncomfortably bug, due toit he uints.
1148 enum { char_cache_min = 0x20, char_cache_max = 0x7e };
1149 uint8_t xoff_cache [char_cache_max - char_cache_min + 1];
1150 FT_UInt glyph_cache [char_cache_max - char_cache_min + 1];
1151#endif
1152
1166 rxvt_font_xft () 1153 rxvt_font_xft ()
1167 { 1154 {
1168 can_compose = true;
1169 f = 0; 1155 f = 0;
1170 } 1156 }
1171 1157
1172 void clear (); 1158 void clear ();
1173 1159
… …
1355 clear (); 1341 clear ();
1356 success = false; 1342 success = false;
1357 } 1343 }
1358#endif 1344#endif
1359 1345
1346#if XFT_CHAR_CACHE
1347 // populate char cache
1348 for (FcChar16 ch = char_cache_min; ch <= char_cache_max; ++ch)
1349 {
1350 FT_UInt glyph = XftCharIndex (disp, f, ch);
1351 glyph_cache [ch - char_cache_min] = glyph;
1352
1353 XGlyphInfo g;
1354 XftGlyphExtents (disp, f, &glyph, 1, &g);
1355 xoff_cache [ch - char_cache_min] = g.xOff;
1356 }
1357#endif
1358
1360 return success; 1359 return success;
1361} 1360}
1362 1361
1363bool 1362bool
1364rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1363rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1365{ 1364{
1366 careful = false; 1365 careful = false;
1367 1366
1367 // handle non-bmp chars when text_t is 16 bit
1368#if ENABLE_COMBINING && !UNICODE_3 1368#if ENABLE_COMBINING && !UNICODE_3
1369 if (ecb_expect_false (IS_COMPOSE (unicode))) 1369 if (ecb_expect_false (IS_COMPOSE (unicode)))
1370 if (compose_char *cc = rxvt_composite[unicode]) 1370 if (compose_char *cc = rxvt_composite [unicode])
1371 if (cc->c2 == NOCHAR) 1371 if (cc->c2 == NOCHAR)
1372 unicode = cc->c1; 1372 unicode = cc->c1;
1373#endif 1373 else
1374 1374 return false;
1375 if (!XftCharExists (term->dpy, f, unicode)) 1375 else
1376 return false; 1376 return false;
1377#endif
1377 1378
1378 // some fonts claim they can render private use chars and then 1379 FcChar32 chr = unicode;
1379 // render them as boxes. 1380
1380 if (ecb_expect_false (IS_COMPOSE (unicode))) 1381 if (!XftCharExists (term->dpy, f, chr))
1381 return false; 1382 return false;
1382 1383
1383 if (!prop || prop->width == rxvt_fontprop::unset) 1384 if (!prop || prop->width == rxvt_fontprop::unset)
1384 return true; 1385 return true;
1385 1386
1386 // check character against base font bounding box 1387 int wcw = max (WCWIDTH (chr), 1);
1387 FcChar32 ch = unicode; 1388
1388 XGlyphInfo g; 1389 XGlyphInfo g;
1389 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1390 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1390 1391
1391 int w = g.width - g.x; 1392 int w = g.width - g.x;
1392 int wcw = max (WCWIDTH (unicode), 1);
1393 1393
1394 careful = g.x > 0 || w > prop->width * wcw; 1394 careful = g.x > 0 || w > prop->width * wcw;
1395 1395
1396 if (careful && !OVERLAP_OK (w, wcw, prop)) 1396 if (careful && !OVERLAP_OK (w, wcw, prop))
1397 return false; 1397 return false;
… …
1406void 1406void
1407rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1407rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1408 const text_t *text, int len, 1408 const text_t *text, int len,
1409 int fg, int bg) 1409 int fg, int bg)
1410{ 1410{
1411 XGlyphInfo extents;
1412 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1411 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1413 XftGlyphSpec *ep = enc; 1412 XftGlyphSpec *ep = enc;
1414 1413
1415 dTermDisplay; 1414 dTermDisplay;
1416 dTermGC; 1415 dTermGC;
… …
1429 int y_ = buffered ? 0 : y; 1428 int y_ = buffered ? 0 : y;
1430 1429
1431 while (len) 1430 while (len)
1432 { 1431 {
1433 int cwidth = term->fwidth; 1432 int cwidth = term->fwidth;
1434 FcChar32 fc = *text++; len--; 1433 FcChar32 chr = *text++; len--;
1435
1436#if ENABLE_COMBINING && !UNICODE_3
1437 if (ecb_expect_false (IS_COMPOSE (fc)))
1438 if (compose_char *cc = rxvt_composite[fc]) // should always be true, but better be safe than sorry
1439 fc = cc->c1; // c2 must be NOCHAR, as has_char handles it that way
1440#endif
1441 1434
1442 while (len && *text == NOCHAR) 1435 while (len && *text == NOCHAR)
1443 text++, len--, cwidth += term->fwidth; 1436 text++, len--, cwidth += term->fwidth;
1444 1437
1445 if (fc != ' ') // skip spaces 1438 if (chr != ' ') // skip spaces
1439 {
1440 // handle non-bmp chars when text_t is 16 bit
1441 #if ENABLE_COMBINING && !UNICODE_3
1442 if (ecb_expect_false (IS_COMPOSE (chr)))
1443 if (compose_char *cc = rxvt_composite [chr])
1444 if (cc->c2 == NOCHAR)
1445 chr = cc->c1;
1446 #endif
1447
1448 #if 0
1449 FT_UInt glyphs [decltype (exp)::max_size];
1450
1451 for (int i = 0; i < nchrs; ++i)
1452 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1453
1454 for (int i = 0; i < nchrs; ++i)
1446 { 1455 {
1456 XGlyphInfo ep;
1457 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1458 printf ("gs %4x g %4x + %3d,%3d o %3d,%3d wh %3d,%3d\n", chrs[i],glyphs[i],ep.x,ep.y,ep.xOff,ep.yOff,ep.width,ep.height);
1459 }
1460 #endif
1461
1462 FT_UInt glyph;
1463 int xOff;
1464
1465 #if XFT_CHAR_CACHE
1466 if (ecb_expect_true (IN_RANGE_INC (chr, char_cache_min, char_cache_max)))
1467 {
1468 glyph = glyph_cache [chr - char_cache_min];
1469 xOff = xoff_cache [chr - char_cache_min];
1470 }
1471 else
1472 #endif
1473 {
1447 FT_UInt glyph = XftCharIndex (disp, f, fc); 1474 glyph = XftCharIndex (disp, f, chr);
1475 XGlyphInfo extents;
1448 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1476 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1477 xOff = extents.xOff;
1478 }
1449 1479
1450 ep->glyph = glyph; 1480 ep->glyph = glyph;
1451 ep->x = x_ + (cwidth - extents.xOff >> 1); 1481 ep->x = x_;
1452 ep->y = y_ + ascent; 1482 ep->y = y_ + ascent;
1453 1483
1454 if (extents.xOff == 0) 1484 // the xft font cell might differ from the terminal font cell,
1485 // in which case we use the average between the two.
1486 ep->x += xOff ? cwidth - xOff >> 1 : 0;
1487
1488 // xft/freetype represent combining characters as characters with zero
1489 // width rendered over the previous character with some fonts, while
1490 // in other fonts, they are considered normal characters, while yet
1491 // in other fonts, they are shifted all over the place.
1492 // we handle the first two cases by keying off on xOff being 0
1493 // for zero-width chars. normally, we would add extents.xOff
1494 // of the base character here, but we don't have that, so we use cwidth.
1455 ep->x = x_ + cwidth; 1495 ep->x += xOff ? 0 : cwidth;
1456 1496
1457 ep++; 1497 ++ep;
1458 } 1498 }
1459 1499
1460 x_ += cwidth; 1500 x_ += cwidth;
1461 } 1501 }
1462 1502
… …
1731} 1771}
1732 1772
1733int 1773int
1734rxvt_fontset::find_font_idx (unicode_t unicode) 1774rxvt_fontset::find_font_idx (unicode_t unicode)
1735{ 1775{
1736 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3 1776 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1737 if (unicode > 0x1fffff) 1777 if (unicode > 0x1fffff)
1738 return 0; 1778 return 0;
1739 1779
1740 unicode_t hi = unicode >> 8; 1780 unicode_t hi = unicode >> 8;
1741 1781

Diff Legend

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