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.209 by root, Fri Jun 18 21:58:03 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 rxvt_compose_expand_static<FcChar32> exp;
1344 FcChar32 *chrs = exp (unicode);
1345 int nchrs = exp.length (chrs);
1346
1347 // allm chars in sequence must be available
1348 for (int i = 0; i < nchrs; ++i)
1348 if (!XftCharExists (term->dpy, f, unicode)) 1349 if (!XftCharExists (term->dpy, f, chrs [i]))
1349 return false; 1350 return false;
1350 1351
1351 if (!prop || prop->width == rxvt_fontprop::unset) 1352 if (!prop || prop->width == rxvt_fontprop::unset)
1352 return true; 1353 return true;
1353 1354
1354 // check character against base font bounding box 1355 int wcw = max (WCWIDTH (chrs [0]), 1);
1355 FcChar32 ch = unicode; 1356
1357 // we check against all glyph sizes. this is probably wrong,
1358 // due to the way ->draw positions these glyphs.
1359 for (int i = 0; i < nchrs; ++i)
1360 {
1356 XGlyphInfo g; 1361 XGlyphInfo g;
1357 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1362 XftTextExtents32 (term->dpy, f, chrs + i, 1, &g);
1358 1363
1359 int w = g.width - g.x; 1364 int w = g.width - g.x;
1360 int wcw = max (WCWIDTH (unicode), 1);
1361 1365
1362 careful = g.x > 0 || w > prop->width * wcw; 1366 careful = g.x > 0 || w > prop->width * wcw;
1363 1367
1364 if (careful && !OVERLAP_OK (w, wcw, prop)) 1368 if (careful && !OVERLAP_OK (w, wcw, prop))
1365 return false; 1369 return false;
1366 1370
1367 // this weeds out _totally_ broken fonts, or glyphs 1371 // this weeds out _totally_ broken fonts, or glyphs
1368 if (!OVERLAP_OK (g.xOff, wcw, prop)) 1372 if (!OVERLAP_OK (g.xOff, wcw, prop))
1369 return false; 1373 return false;
1374 }
1370 1375
1371 return true; 1376 return true;
1372} 1377}
1373 1378
1374void 1379void
1375rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1380rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1376 const text_t *text, int len, 1381 const text_t *text, int len,
1377 int fg, int bg) 1382 int fg, int bg)
1378{ 1383{
1379 XGlyphInfo extents;
1380 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1384 //XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);//D
1381 XftGlyphSpec *ep = enc; 1385 //XftGlyphSpec *ep = enc;//D
1386 static vector<XftGlyphSpec> enc; enc.resize (0); // static to avoid malloc, still slow
1382 1387
1383 dTermDisplay; 1388 dTermDisplay;
1384 dTermGC; 1389 dTermGC;
1385 1390
1386 int w = term->fwidth * len; 1391 int w = term->fwidth * len;
… …
1397 int y_ = buffered ? 0 : y; 1402 int y_ = buffered ? 0 : y;
1398 1403
1399 while (len) 1404 while (len)
1400 { 1405 {
1401 int cwidth = term->fwidth; 1406 int cwidth = term->fwidth;
1407
1408 rxvt_compose_expand_static<FcChar32> exp;
1402 FcChar32 fc = *text++; len--; 1409 FcChar32 *chrs = exp (*text++); len--;
1410 int nchrs = exp.length (chrs);
1403 1411
1404 while (len && *text == NOCHAR) 1412 while (len && *text == NOCHAR)
1405 text++, len--, cwidth += term->fwidth; 1413 text++, len--, cwidth += term->fwidth;
1406 1414
1407 if (fc != ' ') // skip spaces 1415 if (chrs [0] != ' ') // skip spaces
1416 {
1417 #if 1
1418 FT_UInt glyphs [decltype (exp)::max_size];
1419
1420 for (int i = 0; i < nchrs; ++i)
1421 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1422
1423 for (int i = 0; i < nchrs; ++i)
1408 { 1424 {
1425 XGlyphInfo ep;
1426 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1427 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);
1428 }
1429 #endif
1430
1409 FT_UInt glyph = XftCharIndex (disp, f, fc); 1431 FT_UInt glyph = XftCharIndex (disp, f, chrs [0]);
1432 XGlyphInfo extents0;
1410 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1433 XftGlyphExtents (disp, f, &glyph, 1, &extents0);
1411 1434
1435 int cx = x_ + (cwidth - extents0.xOff >> 1);
1436 int cy = y_ + ascent;
1437
1438 XftGlyphSpec ep;
1412 ep->glyph = glyph; 1439 ep.glyph = glyph;
1413 ep->x = x_ + (cwidth - extents.xOff >> 1); 1440 ep.x = cx + (extents0.xOff ? 0 : extents0.xOff);
1414 ep->y = y_ + ascent; 1441 ep.y = cy;
1415 1442
1416 if (extents.xOff == 0) 1443 enc.push_back (ep);
1417 ep->x = x_ + cwidth;
1418 1444
1419 ep++; 1445 for (int i = 1; ecb_expect_false (i < nchrs); ++i)
1446 {
1447 FT_UInt glyph = XftCharIndex (disp, f, chrs [i]);
1448 XGlyphInfo extents;
1449 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1450
1451 ep.glyph = glyph;
1452 ep.x = cx + (extents.xOff ? 0 : extents0.xOff);
1453
1454 enc.push_back (ep);
1455 }
1420 } 1456 }
1421 1457
1422 x_ += cwidth; 1458 x_ += cwidth;
1423 } 1459 }
1424 1460
1425 if (buffered) 1461 if (buffered)
1426 { 1462 {
1427 if (ep != enc) 1463 if (!enc.empty ())
1428 { 1464 {
1429 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1465 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1430 1466
1431#ifdef HAVE_IMG 1467#ifdef HAVE_IMG
1432 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1468 Picture dst = 0; // the only assignment is done conditionally in the following if condition
… …
1478 } 1514 }
1479 else 1515 else
1480#endif 1516#endif
1481 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h); 1517 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1482 1518
1483 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1519 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1484 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1520 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1485 } 1521 }
1486 else 1522 else
1487 clear_rect (d, x, y, w, h, bg); 1523 clear_rect (d, x, y, w, h, bg);
1488 } 1524 }
1489 else 1525 else
1490 { 1526 {
1491 clear_rect (d, x, y, w, h, bg); 1527 clear_rect (d, x, y, w, h, bg);
1492 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1528 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1493 } 1529 }
1494} 1530}
1495 1531
1496#endif 1532#endif
1497 1533
… …
1693} 1729}
1694 1730
1695int 1731int
1696rxvt_fontset::find_font_idx (unicode_t unicode) 1732rxvt_fontset::find_font_idx (unicode_t unicode)
1697{ 1733{
1698 if (unicode >= 1<<20) 1734 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1735 if (unicode > 0x1fffff)
1699 return 0; 1736 return 0;
1700 1737
1701 unicode_t hi = unicode >> 8; 1738 unicode_t hi = unicode >> 8;
1702 1739
1703 if (hi < fmap.size () 1740 if (hi < fmap.size ())
1704 && fmap[hi] 1741 if (pagemap *pm = fmap[hi])
1705 && (*fmap[hi])[unicode & 0xff] != 0xff) 1742 if ((*pm)[unicode & 0xff] != 0xff)
1706 return (*fmap[hi])[unicode & 0xff]; 1743 return (*pm)[unicode & 0xff];
1707 1744
1708 unsigned int i; 1745 unsigned int i;
1709 1746
1710 for (i = 0; i < fonts.size (); i++) 1747 for (i = 0; i < fonts.size (); i++)
1711 { 1748 {
… …
1735 } 1772 }
1736 1773
1737 next_font: 1774 next_font:
1738 if (i == fonts.size () - 1) 1775 if (i == fonts.size () - 1)
1739 { 1776 {
1777 // compose characters are handled by the default font, unless another font takes over
1778 // we do not go via the fallback list for speed reasons.
1779 if (IS_COMPOSE (unicode))
1780 return 0;
1781
1740 if (fallback->name) 1782 if (fallback->name)
1741 { 1783 {
1742 // search through the fallback list 1784 // search through the fallback list
1743 push_font (new_font (fallback->name, fallback->cs)); 1785 push_font (new_font (fallback->name, fallback->cs));
1744 fallback++; 1786 fallback++;

Diff Legend

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