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.199 by root, Thu Jun 17 00:08:35 2021 UTC vs.
Revision 1.220 by root, Sat Jul 3 04:47:08 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
… …
313 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
314 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
315 return true; 315 return true;
316#endif 316#endif
317 317
318 if (IS_COMPOSE (unicode)) 318 // we do not check for IS_COMPOSE here, as this would
319 return true; 319 // rob other fonts from taking over.
320 320
321 switch (unicode) 321 switch (unicode)
322 { 322 {
323 case ZERO_WIDTH_CHAR: 323 case ZERO_WIDTH_CHAR:
324 case NOCHAR: 324 case NOCHAR:
… …
345 345
346 XSetForeground (disp, gc, term->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
347 347
348 while (len) 348 while (len)
349 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
350#if ENABLE_COMBINING 356#if ENABLE_COMBINING
351 compose_char *cc; 357 compose_char *cc;
352#endif 358#endif
353 const text_t *tp = text;
354 text_t t = *tp;
355
356 while (++text, --len && *text == NOCHAR)
357 ;
358
359 int width = text - tp; 359 int width = text - tp;
360 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
361 361
362#ifdef BUILTIN_GLYPHS 362#ifdef BUILTIN_GLYPHS
363 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
… …
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 text_t chrs[2]; 450 text_t chrs[2];
452 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
453 452
454 *chrs = cc->c1; 453 *chrs = cc->c1;
455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
… …
1138 1137
1139#if XFT 1138#if XFT
1140 1139
1141struct rxvt_font_xft : rxvt_font 1140struct rxvt_font_xft : rxvt_font
1142{ 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 big, due to the 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
1143 rxvt_font_xft () 1153 rxvt_font_xft ()
1144 { 1154 {
1145 f = 0; 1155 f = 0;
1146 } 1156 }
1147 1157
… …
1293 if (glheight < g.height - g.y) glheight = g.height - g.y; 1303 if (glheight < g.height - g.y) glheight = g.height - g.y;
1294 } 1304 }
1295 1305
1296 if (!width) 1306 if (!width)
1297 { 1307 {
1298 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1308 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1299 1309 width = f->max_advance_width;
1300 XftFontClose (disp, f);
1301 f = 0;
1302
1303 success = false;
1304 break; 1310 break;
1305 } 1311 }
1306 1312
1307 if (prop.height == rxvt_fontprop::unset 1313 if (prop.height == rxvt_fontprop::unset
1308 || (height <= prop.height && glheight <= prop.height) 1314 || (height <= prop.height && glheight <= prop.height)
… …
1335 clear (); 1341 clear ();
1336 success = false; 1342 success = false;
1337 } 1343 }
1338#endif 1344#endif
1339 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
1340 return success; 1359 return success;
1341} 1360}
1342 1361
1343bool 1362bool
1344rxvt_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
1345{ 1364{
1346 careful = false; 1365 careful = false;
1347 1366
1367 // handle non-bmp chars when text_t is 16 bit
1368#if ENABLE_COMBINING && !UNICODE_3
1369 if (ecb_expect_false (IS_COMPOSE (unicode)))
1370 if (compose_char *cc = rxvt_composite [unicode])
1371 if (cc->c2 == NOCHAR)
1372 unicode = cc->c1;
1373 else
1374 return false;
1375 else
1376 return false;
1377#endif
1378
1379 FcChar32 chr = unicode;
1380
1348 if (!XftCharExists (term->dpy, f, unicode)) 1381 if (!XftCharExists (term->dpy, f, chr))
1349 return false; 1382 return false;
1350 1383
1351 if (!prop || prop->width == rxvt_fontprop::unset) 1384 if (!prop || prop->width == rxvt_fontprop::unset)
1352 return true; 1385 return true;
1353 1386
1354 // check character against base font bounding box 1387 int wcw = max (WCWIDTH (chr), 1);
1355 FcChar32 ch = unicode; 1388
1356 XGlyphInfo g; 1389 XGlyphInfo g;
1357 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1390 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1391
1392 int cwidth = prop->width * wcw;
1393
1394 // use same adjustments as in ->draw, see there
1395 g.x += g.xOff ? cwidth - g.xOff >> 1 : 0;
1396 g.x += g.xOff ? 0 : cwidth;
1358 1397
1359 int w = g.width - g.x; 1398 int w = g.width - g.x;
1360 int wcw = max (WCWIDTH (unicode), 1);
1361 1399
1362 careful = g.x > 0 || w > prop->width * wcw; 1400 careful = g.x > 0 || w > cwidth;
1363 1401
1364 if (careful && !OVERLAP_OK (w, wcw, prop)) 1402 if (careful && !OVERLAP_OK (w, wcw, prop))
1365 return false; 1403 return false;
1366 1404
1367 // this weeds out _totally_ broken fonts, or glyphs 1405 // this weeds out _totally_ broken fonts, or glyphs
… …
1374void 1412void
1375rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1413rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1376 const text_t *text, int len, 1414 const text_t *text, int len,
1377 int fg, int bg) 1415 int fg, int bg)
1378{ 1416{
1379 XGlyphInfo extents;
1380 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1417 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1381 XftGlyphSpec *ep = enc; 1418 XftGlyphSpec *ep = enc;
1382 1419
1383 dTermDisplay; 1420 dTermDisplay;
1384 dTermGC; 1421 dTermGC;
… …
1397 int y_ = buffered ? 0 : y; 1434 int y_ = buffered ? 0 : y;
1398 1435
1399 while (len) 1436 while (len)
1400 { 1437 {
1401 int cwidth = term->fwidth; 1438 int cwidth = term->fwidth;
1402 FcChar32 fc = *text++; len--; 1439 FcChar32 chr = *text++; len--;
1403 1440
1404 while (len && *text == NOCHAR) 1441 while (len && *text == NOCHAR)
1405 text++, len--, cwidth += term->fwidth; 1442 text++, len--, cwidth += term->fwidth;
1406 1443
1407 if (fc != ' ') // skip spaces 1444 if (chr != ' ') // skip spaces
1445 {
1446 // handle non-bmp chars when text_t is 16 bit
1447 #if ENABLE_COMBINING && !UNICODE_3
1448 if (ecb_expect_false (IS_COMPOSE (chr)))
1449 if (compose_char *cc = rxvt_composite [chr])
1450 if (cc->c2 == NOCHAR)
1451 chr = cc->c1;
1452 #endif
1453
1454 #if 0
1455 FT_UInt glyphs [decltype (exp)::max_size];
1456
1457 for (int i = 0; i < nchrs; ++i)
1458 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1459
1460 for (int i = 0; i < nchrs; ++i)
1408 { 1461 {
1462 XGlyphInfo ep;
1463 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1464 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);
1465 }
1466 #endif
1467
1468 FT_UInt glyph;
1469 int xOff;
1470
1471 #if XFT_CHAR_CACHE
1472 if (ecb_expect_true (IN_RANGE_INC (chr, char_cache_min, char_cache_max)))
1473 {
1474 glyph = glyph_cache [chr - char_cache_min];
1475 xOff = xoff_cache [chr - char_cache_min];
1476 }
1477 else
1478 #endif
1479 {
1409 FT_UInt glyph = XftCharIndex (disp, f, fc); 1480 glyph = XftCharIndex (disp, f, chr);
1481 XGlyphInfo extents;
1410 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1482 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1483 xOff = extents.xOff;
1484 }
1411 1485
1412 ep->glyph = glyph; 1486 ep->glyph = glyph;
1413 ep->x = x_ + (cwidth - extents.xOff >> 1); 1487 ep->x = x_;
1414 ep->y = y_ + ascent; 1488 ep->y = y_ + ascent;
1415 1489
1416 if (extents.xOff == 0) 1490 // the xft font cell might differ from the terminal font cell,
1491 // in which case we use the average between the two.
1492 ep->x += xOff ? cwidth - xOff >> 1 : 0;
1493
1494 // xft/freetype represent combining characters as characters with zero
1495 // width rendered over the previous character with some fonts, while
1496 // in other fonts, they are considered normal characters, while yet
1497 // in other fonts, they are shifted all over the place.
1498 // we handle the first two cases by keying off on xOff being 0
1499 // for zero-width chars. normally, we would add extents.xOff
1500 // of the base character here, but we don't have that, so we use cwidth.
1417 ep->x = x_ + cwidth; 1501 ep->x += xOff ? 0 : cwidth;
1418 1502
1419 ep++; 1503 ++ep;
1420 } 1504 }
1421 1505
1422 x_ += cwidth; 1506 x_ += cwidth;
1423 } 1507 }
1424 1508
… …
1693} 1777}
1694 1778
1695int 1779int
1696rxvt_fontset::find_font_idx (unicode_t unicode) 1780rxvt_fontset::find_font_idx (unicode_t unicode)
1697{ 1781{
1698 if (unicode >= 1<<20) 1782 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1783 if (unicode > 0x1fffff)
1699 return 0; 1784 return 0;
1700 1785
1701 unicode_t hi = unicode >> 8; 1786 unicode_t hi = unicode >> 8;
1702 1787
1703 if (hi < fmap.size () 1788 if (hi < fmap.size ())
1704 && fmap[hi] 1789 if (pagemap *pm = fmap[hi])
1705 && (*fmap[hi])[unicode & 0xff] != 0xff) 1790 if ((*pm)[unicode & 0xff] != 0xff)
1706 return (*fmap[hi])[unicode & 0xff]; 1791 return (*pm)[unicode & 0xff];
1707 1792
1708 unsigned int i; 1793 unsigned int i;
1709 1794
1710 for (i = 0; i < fonts.size (); i++) 1795 for (i = 0; i < fonts.size (); i++)
1711 { 1796 {
… …
1735 } 1820 }
1736 1821
1737 next_font: 1822 next_font:
1738 if (i == fonts.size () - 1) 1823 if (i == fonts.size () - 1)
1739 { 1824 {
1825 // compose characters are handled by the default font, unless another font takes over
1826 // we do not go via the fallback list for speed reasons.
1827 if (IS_COMPOSE (unicode))
1828 return 0;
1829
1740 if (fallback->name) 1830 if (fallback->name)
1741 { 1831 {
1742 // search through the fallback list 1832 // search through the fallback list
1743 push_font (new_font (fallback->name, fallback->cs)); 1833 push_font (new_font (fallback->name, fallback->cs));
1744 fallback++; 1834 fallback++;

Diff Legend

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