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.200 by root, Thu Jun 17 00:49:20 2021 UTC vs.
Revision 1.215 by root, Sat Jun 19 10:01:16 2021 UTC

… …
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_)
… …
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:
… …
442#else 442#else
443 if (0) 443 if (0)
444 ; 444 ;
445#endif 445#endif
446#if ENABLE_COMBINING 446#if ENABLE_COMBINING
447 else if (IS_COMPOSE (t) && 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 {
… …
1163 1139
1164struct rxvt_font_xft : rxvt_font 1140struct rxvt_font_xft : rxvt_font
1165{ 1141{
1166 rxvt_font_xft () 1142 rxvt_font_xft ()
1167 { 1143 {
1168 can_compose = true;
1169 f = 0; 1144 f = 0;
1170 } 1145 }
1171 1146
1172 void clear (); 1147 void clear ();
1173 1148
… …
1317 if (glheight < g.height - g.y) glheight = g.height - g.y; 1292 if (glheight < g.height - g.y) glheight = g.height - g.y;
1318 } 1293 }
1319 1294
1320 if (!width) 1295 if (!width)
1321 { 1296 {
1322 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);
1323 1298 width = f->max_advance_width;
1324 XftFontClose (disp, f);
1325 f = 0;
1326
1327 success = false;
1328 break; 1299 break;
1329 } 1300 }
1330 1301
1331 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1332 || (height <= prop.height && glheight <= prop.height) 1303 || (height <= prop.height && glheight <= prop.height)
… …
1367bool 1338bool
1368rxvt_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
1369{ 1340{
1370 careful = false; 1341 careful = false;
1371 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
1372 if (!XftCharExists (term->dpy, f, unicode)) 1357 if (!XftCharExists (term->dpy, f, chr))
1373 return false; 1358 return false;
1374 1359
1375 if (!prop || prop->width == rxvt_fontprop::unset) 1360 if (!prop || prop->width == rxvt_fontprop::unset)
1376 return true; 1361 return true;
1377 1362
1378 // check character against base font bounding box 1363 int wcw = max (WCWIDTH (chr), 1);
1379 FcChar32 ch = unicode; 1364
1380 XGlyphInfo g; 1365 XGlyphInfo g;
1381 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1366 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1382 1367
1383 int w = g.width - g.x; 1368 int w = g.width - g.x;
1384 int wcw = max (WCWIDTH (unicode), 1);
1385 1369
1386 careful = g.x > 0 || w > prop->width * wcw; 1370 careful = g.x > 0 || w > prop->width * wcw;
1387 1371
1388 if (careful && !OVERLAP_OK (w, wcw, prop)) 1372 if (careful && !OVERLAP_OK (w, wcw, prop))
1389 return false; 1373 return false;
… …
1398void 1382void
1399rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1383rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1400 const text_t *text, int len, 1384 const text_t *text, int len,
1401 int fg, int bg) 1385 int fg, int bg)
1402{ 1386{
1403 XGlyphInfo extents;
1404 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1387 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1405 XftGlyphSpec *ep = enc; 1388 XftGlyphSpec *ep = enc;
1406 1389
1407 dTermDisplay; 1390 dTermDisplay;
1408 dTermGC; 1391 dTermGC;
… …
1421 int y_ = buffered ? 0 : y; 1404 int y_ = buffered ? 0 : y;
1422 1405
1423 while (len) 1406 while (len)
1424 { 1407 {
1425 int cwidth = term->fwidth; 1408 int cwidth = term->fwidth;
1426 FcChar32 fc = *text++; len--; 1409 FcChar32 chr = *text++; len--;
1427 1410
1428 while (len && *text == NOCHAR) 1411 while (len && *text == NOCHAR)
1429 text++, len--, cwidth += term->fwidth; 1412 text++, len--, cwidth += term->fwidth;
1430 1413
1431 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)
1432 { 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
1433 FT_UInt glyph = XftCharIndex (disp, f, fc); 1438 FT_UInt glyph = XftCharIndex (disp, f, chr);
1439 XGlyphInfo extents;
1434 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1440 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1435 1441
1442 int xOff = extents.xOff ? extents.xOff : cwidth;
1443
1436 ep->glyph = glyph; 1444 ep->glyph = glyph;
1437 ep->x = x_ + (cwidth - extents.xOff >> 1); 1445 ep->x = x_;
1438 ep->y = y_ + ascent; 1446 ep->y = y_ + ascent;
1439 1447
1440 if (extents.xOff == 0) 1448 // the xft font cell might differ from the terminal font cell,
1441 ep->x = x_ + cwidth; 1449 // in which case we use the average between the two.
1450 ep->x += extents.xOff ? cwidth - extents.xOff >> 1 : 0;
1442 1451
1452 // xft/freetype represent combining characters as characters with zero
1453 // width rendered over the previous character with some fonts, while
1454 // in other fonts, they are considered normal characters, while yet
1455 // in other fonts, they are shifted all over the place.
1456 // we handle the first two cases by keying off on xOff being 0
1457 // for zero-width chars. normally, we would add extents.xOff
1458 // of the base character here, but we don't have that, so we use cwidth.
1459 ep->x += extents.xOff ? 0 : cwidth;
1460
1443 ep++; 1461 ++ep;
1444 } 1462 }
1445 1463
1446 x_ += cwidth; 1464 x_ += cwidth;
1447 } 1465 }
1448 1466
… …
1717} 1735}
1718 1736
1719int 1737int
1720rxvt_fontset::find_font_idx (unicode_t unicode) 1738rxvt_fontset::find_font_idx (unicode_t unicode)
1721{ 1739{
1722 if (unicode >= 1<<20) 1740 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1741 if (unicode > 0x1fffff)
1723 return 0; 1742 return 0;
1724 1743
1725 unicode_t hi = unicode >> 8; 1744 unicode_t hi = unicode >> 8;
1726 1745
1727 if (hi < fmap.size () 1746 if (hi < fmap.size ())
1728 && fmap[hi] 1747 if (pagemap *pm = fmap[hi])
1729 && (*fmap[hi])[unicode & 0xff] != 0xff) 1748 if ((*pm)[unicode & 0xff] != 0xff)
1730 return (*fmap[hi])[unicode & 0xff]; 1749 return (*pm)[unicode & 0xff];
1731 1750
1732 unsigned int i; 1751 unsigned int i;
1733 1752
1734 for (i = 0; i < fonts.size (); i++) 1753 for (i = 0; i < fonts.size (); i++)
1735 { 1754 {
… …
1759 } 1778 }
1760 1779
1761 next_font: 1780 next_font:
1762 if (i == fonts.size () - 1) 1781 if (i == fonts.size () - 1)
1763 { 1782 {
1783 // compose characters are handled by the default font, unless another font takes over
1784 // we do not go via the fallback list for speed reasons.
1785 if (IS_COMPOSE (unicode))
1786 return 0;
1787
1764 if (fallback->name) 1788 if (fallback->name)
1765 { 1789 {
1766 // search through the fallback list 1790 // search through the fallback list
1767 push_font (new_font (fallback->name, fallback->cs)); 1791 push_font (new_font (fallback->name, fallback->cs));
1768 fallback++; 1792 fallback++;

Diff Legend

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