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.214 by root, Sat Jun 19 09:47:41 2021 UTC

… …
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)];
… …
1293 if (glheight < g.height - g.y) glheight = g.height - g.y; 1292 if (glheight < g.height - g.y) glheight = g.height - g.y;
1294 } 1293 }
1295 1294
1296 if (!width) 1295 if (!width)
1297 { 1296 {
1298 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1297 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1299 1298 width = f->max_advance_width;
1300 XftFontClose (disp, f);
1301 f = 0;
1302
1303 success = false;
1304 break; 1299 break;
1305 } 1300 }
1306 1301
1307 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1308 || (height <= prop.height && glheight <= prop.height) 1303 || (height <= prop.height && glheight <= prop.height)
… …
1343bool 1338bool
1344rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1339rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1345{ 1340{
1346 careful = false; 1341 careful = false;
1347 1342
1343 // handle non-bmp chars when text_t is 16 bit
1344#if ENABLE_COMBINING && !UNICODE_3
1345 if (ecb_expect_false (IS_COMPOSE (unicode)))
1346 if (compose_char *cc = rxvt_composite [unicode])
1347 if (cc->c2 == NOCHAR)
1348 unicode = cc->c1;
1349 else
1350 return false;
1351 else
1352 return false;
1353#endif
1354
1355 FcChar32 chr = unicode;
1356
1348 if (!XftCharExists (term->dpy, f, unicode)) 1357 if (!XftCharExists (term->dpy, f, chr))
1349 return false; 1358 return false;
1350 1359
1351 if (!prop || prop->width == rxvt_fontprop::unset) 1360 if (!prop || prop->width == rxvt_fontprop::unset)
1352 return true; 1361 return true;
1353 1362
1354 // check character against base font bounding box 1363 int wcw = max (WCWIDTH (chr), 1);
1355 FcChar32 ch = unicode; 1364
1356 XGlyphInfo g; 1365 XGlyphInfo g;
1357 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1366 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1358 1367
1359 int w = g.width - g.x; 1368 int w = g.width - g.x;
1360 int wcw = max (WCWIDTH (unicode), 1);
1361 1369
1362 careful = g.x > 0 || w > prop->width * wcw; 1370 careful = g.x > 0 || w > prop->width * wcw;
1363 1371
1364 if (careful && !OVERLAP_OK (w, wcw, prop)) 1372 if (careful && !OVERLAP_OK (w, wcw, prop))
1365 return false; 1373 return false;
… …
1374void 1382void
1375rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1383rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1376 const text_t *text, int len, 1384 const text_t *text, int len,
1377 int fg, int bg) 1385 int fg, int bg)
1378{ 1386{
1379 XGlyphInfo extents;
1380 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1387 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1381 XftGlyphSpec *ep = enc; 1388 XftGlyphSpec *ep = enc;
1382 1389
1383 dTermDisplay; 1390 dTermDisplay;
1384 dTermGC; 1391 dTermGC;
… …
1397 int y_ = buffered ? 0 : y; 1404 int y_ = buffered ? 0 : y;
1398 1405
1399 while (len) 1406 while (len)
1400 { 1407 {
1401 int cwidth = term->fwidth; 1408 int cwidth = term->fwidth;
1402 FcChar32 fc = *text++; len--; 1409 FcChar32 chr = *text++; len--;
1403 1410
1404 while (len && *text == NOCHAR) 1411 while (len && *text == NOCHAR)
1405 text++, len--, cwidth += term->fwidth; 1412 text++, len--, cwidth += term->fwidth;
1406 1413
1407 if (fc != ' ') // skip spaces 1414 if (chr != ' ') // skip spaces
1415 {
1416 // handle non-bmp chars when text_t is 16 bit
1417 #if ENABLE_COMBINING && !UNICODE_3
1418 if (ecb_expect_false (IS_COMPOSE (chr)))
1419 if (compose_char *cc = rxvt_composite [chr])
1420 if (cc->c2 == NOCHAR)
1421 chr = cc->c1;
1422 #endif
1423
1424 #if 0
1425 FT_UInt glyphs [decltype (exp)::max_size];
1426
1427 for (int i = 0; i < nchrs; ++i)
1428 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1429
1430 for (int i = 0; i < nchrs; ++i)
1408 { 1431 {
1432 XGlyphInfo ep;
1433 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1434 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);
1435 }
1436 #endif
1437
1409 FT_UInt glyph = XftCharIndex (disp, f, fc); 1438 FT_UInt glyph = XftCharIndex (disp, f, chr);
1439 XGlyphInfo extents;
1410 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1440 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1411 1441
1442 int xOff = extents.xOff ? extents.xOff : cwidth;
1443
1412 ep->glyph = glyph; 1444 ep->glyph = glyph;
1413 ep->x = x_ + (cwidth - extents.xOff >> 1); 1445 ep->x = x_;
1414 ep->y = y_ + ascent; 1446 ep->y = y_ + ascent;
1415 1447
1448 // the xft font cell might differ from the terminal font cell,
1449 // in which case we use the average between the two.
1416 if (extents.xOff == 0) 1450 if (extents.xOff)
1417 ep->x = x_ + cwidth; 1451 ep->x += extents.xOff ? cwidth - extents.xOff >> 1 : 0;
1418 1452
1453 // xft/freetype represent combining characters as characters with zero
1454 // width rendered over the previous character with some fonts, while
1455 // in other fonts, they are considered normal characters, while yet
1456 // in other fonts, they are shifted all over the place.
1457 // we handle the first two cases by keying off on xOff being 0
1458 // for zero-width chars. normally, we would add extents.xOff
1459 // of the base character here, but we don't have that, so we use cwidth.
1460 ep->x += extents.xOff ? 0 : cwidth;
1461
1419 ep++; 1462 ++ep;
1420 } 1463 }
1421 1464
1422 x_ += cwidth; 1465 x_ += cwidth;
1423 } 1466 }
1424 1467
… …
1693} 1736}
1694 1737
1695int 1738int
1696rxvt_fontset::find_font_idx (unicode_t unicode) 1739rxvt_fontset::find_font_idx (unicode_t unicode)
1697{ 1740{
1698 if (unicode >= 1<<20) 1741 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1742 if (unicode > 0x1fffff)
1699 return 0; 1743 return 0;
1700 1744
1701 unicode_t hi = unicode >> 8; 1745 unicode_t hi = unicode >> 8;
1702 1746
1703 if (hi < fmap.size () 1747 if (hi < fmap.size ())
1704 && fmap[hi] 1748 if (pagemap *pm = fmap[hi])
1705 && (*fmap[hi])[unicode & 0xff] != 0xff) 1749 if ((*pm)[unicode & 0xff] != 0xff)
1706 return (*fmap[hi])[unicode & 0xff]; 1750 return (*pm)[unicode & 0xff];
1707 1751
1708 unsigned int i; 1752 unsigned int i;
1709 1753
1710 for (i = 0; i < fonts.size (); i++) 1754 for (i = 0; i < fonts.size (); i++)
1711 { 1755 {
… …
1735 } 1779 }
1736 1780
1737 next_font: 1781 next_font:
1738 if (i == fonts.size () - 1) 1782 if (i == fonts.size () - 1)
1739 { 1783 {
1784 // compose characters are handled by the default font, unless another font takes over
1785 // we do not go via the fallback list for speed reasons.
1786 if (IS_COMPOSE (unicode))
1787 return 0;
1788
1740 if (fallback->name) 1789 if (fallback->name)
1741 { 1790 {
1742 // search through the fallback list 1791 // search through the fallback list
1743 push_font (new_font (fallback->name, fallback->cs)); 1792 push_font (new_font (fallback->name, fallback->cs));
1744 fallback++; 1793 fallback++;

Diff Legend

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