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.198 by root, Wed Jun 16 22:51:55 2021 UTC vs.
Revision 1.212 by root, Sat Jun 19 09:10:51 2021 UTC

… …
262 } 262 }
263} 263}
264 264
265///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
266 266
267struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
268 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
269 270
270 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
271 : rxvt_font () 272 : rxvt_font ()
272 { 273 {
… …
312 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
313 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
314 return true; 315 return true;
315#endif 316#endif
316 317
317 if (IS_COMPOSE (unicode)) 318 // we do not check for IS_COMPOSE here, as this would
318 return true; 319 // rob other fonts from taking over.
319 320
320 switch (unicode) 321 switch (unicode)
321 { 322 {
322 case ZERO_WIDTH_CHAR: 323 case ZERO_WIDTH_CHAR:
323 case NOCHAR: 324 case NOCHAR:
… …
344 345
345 XSetForeground (disp, gc, term->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
346 347
347 while (len) 348 while (len)
348 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
349#if ENABLE_COMBINING 356#if ENABLE_COMBINING
350 compose_char *cc; 357 compose_char *cc;
351#endif 358#endif
352 const text_t *tp = text;
353 text_t t = *tp;
354
355 while (++text, --len && *text == NOCHAR)
356 ;
357
358 int width = text - tp; 359 int width = text - tp;
359 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
360 361
361#ifdef BUILTIN_GLYPHS 362#ifdef BUILTIN_GLYPHS
362 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
… …
444#endif 445#endif
445#if ENABLE_COMBINING 446#if ENABLE_COMBINING
446 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
447 { 448 {
448 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
449
450 text_t chrs[2]; 450 text_t chrs[2];
451 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
452 452
453 *chrs = cc->c1; 453 *chrs = cc->c1;
454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
… …
492 492
493 x += fwidth; 493 x += fwidth;
494 } 494 }
495} 495}
496 496
497struct rxvt_font_overflow : rxvt_font { 497struct rxvt_font_overflow : rxvt_font
498{
498 struct rxvt_fontset *fs; 499 struct rxvt_fontset *fs;
499 500
500 rxvt_font_overflow (rxvt_fontset *fs) 501 rxvt_font_overflow (rxvt_fontset *fs)
501 : rxvt_font () 502 : rxvt_font ()
502 { 503 {
… …
548 } 549 }
549}; 550};
550 551
551///////////////////////////////////////////////////////////////////////////// 552/////////////////////////////////////////////////////////////////////////////
552 553
553struct rxvt_font_x11 : rxvt_font { 554struct rxvt_font_x11 : rxvt_font
555{
554 rxvt_font_x11 () { f = 0; } 556 rxvt_font_x11 () { f = 0; }
555 557
556 void clear (); 558 void clear ();
557 559
558 rxvt_fontprop properties (); 560 rxvt_fontprop properties ();
… …
1133 1135
1134///////////////////////////////////////////////////////////////////////////// 1136/////////////////////////////////////////////////////////////////////////////
1135 1137
1136#if XFT 1138#if XFT
1137 1139
1138struct rxvt_font_xft : rxvt_font { 1140struct rxvt_font_xft : rxvt_font
1141{
1139 rxvt_font_xft () { f = 0; } 1142 rxvt_font_xft ()
1143 {
1144 f = 0;
1145 }
1140 1146
1141 void clear (); 1147 void clear ();
1142 1148
1143 rxvt_fontprop properties (); 1149 rxvt_fontprop properties ();
1144 1150
… …
1286 if (glheight < g.height - g.y) glheight = g.height - g.y; 1292 if (glheight < g.height - g.y) glheight = g.height - g.y;
1287 } 1293 }
1288 1294
1289 if (!width) 1295 if (!width)
1290 { 1296 {
1291 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);
1292 1298 width = f->max_advance_width;
1293 XftFontClose (disp, f);
1294 f = 0;
1295
1296 success = false;
1297 break; 1299 break;
1298 } 1300 }
1299 1301
1300 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1301 || (height <= prop.height && glheight <= prop.height) 1303 || (height <= prop.height && glheight <= prop.height)
… …
1336bool 1338bool
1337rxvt_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
1338{ 1340{
1339 careful = false; 1341 careful = false;
1340 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
1341 if (!XftCharExists (term->dpy, f, unicode)) 1357 if (!XftCharExists (term->dpy, f, chr))
1342 return false; 1358 return false;
1343 1359
1344 if (!prop || prop->width == rxvt_fontprop::unset) 1360 if (!prop || prop->width == rxvt_fontprop::unset)
1345 return true; 1361 return true;
1346 1362
1347 // check character against base font bounding box 1363 int wcw = max (WCWIDTH (chr), 1);
1348 FcChar32 ch = unicode; 1364
1349 XGlyphInfo g; 1365 XGlyphInfo g;
1350 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1366 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1351 1367
1352 int w = g.width - g.x; 1368 int w = g.width - g.x;
1353 int wcw = max (WCWIDTH (unicode), 1);
1354 1369
1355 careful = g.x > 0 || w > prop->width * wcw; 1370 careful = g.x > 0 || w > prop->width * wcw;
1356 1371
1357 if (careful && !OVERLAP_OK (w, wcw, prop)) 1372 if (careful && !OVERLAP_OK (w, wcw, prop))
1358 return false; 1373 return false;
… …
1367void 1382void
1368rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1383rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1369 const text_t *text, int len, 1384 const text_t *text, int len,
1370 int fg, int bg) 1385 int fg, int bg)
1371{ 1386{
1372 XGlyphInfo extents;
1373 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1387 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1374 XftGlyphSpec *ep = enc; 1388 XftGlyphSpec *ep = enc;
1375 1389
1376 dTermDisplay; 1390 dTermDisplay;
1377 dTermGC; 1391 dTermGC;
… …
1390 int y_ = buffered ? 0 : y; 1404 int y_ = buffered ? 0 : y;
1391 1405
1392 while (len) 1406 while (len)
1393 { 1407 {
1394 int cwidth = term->fwidth; 1408 int cwidth = term->fwidth;
1395 FcChar32 fc = *text++; len--; 1409 FcChar32 chr = *text++; len--;
1410
1411 // handle non-bmp chars when text_t is 16 bit
1412 #if ENABLE_COMBINING && !UNICODE_3
1413 if (ecb_expect_false (IS_COMPOSE (chr)))
1414 if (compose_char *cc = rxvt_composite [chr])
1415 if (cc->c2 == NOCHAR)
1416 chr = cc->c1;
1417 #endif
1396 1418
1397 while (len && *text == NOCHAR) 1419 while (len && *text == NOCHAR)
1398 text++, len--, cwidth += term->fwidth; 1420 text++, len--, cwidth += term->fwidth;
1399 1421
1400 if (fc != ' ') // skip spaces 1422 if (chr != ' ') // skip spaces
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)
1401 { 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
1402 FT_UInt glyph = XftCharIndex (disp, f, fc); 1438 FT_UInt glyph = XftCharIndex (disp, f, chr);
1439 XGlyphInfo extents;
1403 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1440 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1404 1441
1405 ep->glyph = glyph; 1442 ep->glyph = glyph;
1406 ep->x = x_ + (cwidth - extents.xOff >> 1); 1443 ep->x = x_;
1407 ep->y = y_ + ascent; 1444 ep->y = y_ + ascent;
1408 1445
1409 if (extents.xOff == 0) 1446 // the xft font cell might differ from the terminal font cell,
1410 ep->x = x_ + cwidth; 1447 // in which case we use the average between the two.
1448 ep->x += cwidth - extents.xOff >> 1;
1411 1449
1450 // xft/freetype represent combining characters as characters with zero
1451 // width rendered over the previous character with some fonts, while
1452 // in other fonts, they are considered normal characters, while yet
1453 // in other fonts, they are shifted all over the place.
1454 // we handle the first two cases by keying off on xOff being 0
1455 // for zero-width chars. normally, we would add extents.xOff
1456 // of the base character here, but we don't have that, so we use cwidth.
1457 ep->x += extents.xOff ? 0 : cwidth;
1458
1412 ep++; 1459 ++ep;
1413 } 1460 }
1414 1461
1415 x_ += cwidth; 1462 x_ += cwidth;
1416 } 1463 }
1417 1464
… …
1686} 1733}
1687 1734
1688int 1735int
1689rxvt_fontset::find_font_idx (unicode_t unicode) 1736rxvt_fontset::find_font_idx (unicode_t unicode)
1690{ 1737{
1691 if (unicode >= 1<<20) 1738 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1739 if (unicode > 0x1fffff)
1692 return 0; 1740 return 0;
1693 1741
1694 unicode_t hi = unicode >> 8; 1742 unicode_t hi = unicode >> 8;
1695 1743
1696 if (hi < fmap.size () 1744 if (hi < fmap.size ())
1697 && fmap[hi] 1745 if (pagemap *pm = fmap[hi])
1698 && (*fmap[hi])[unicode & 0xff] != 0xff) 1746 if ((*pm)[unicode & 0xff] != 0xff)
1699 return (*fmap[hi])[unicode & 0xff]; 1747 return (*pm)[unicode & 0xff];
1700 1748
1701 unsigned int i; 1749 unsigned int i;
1702 1750
1703 for (i = 0; i < fonts.size (); i++) 1751 for (i = 0; i < fonts.size (); i++)
1704 { 1752 {
… …
1728 } 1776 }
1729 1777
1730 next_font: 1778 next_font:
1731 if (i == fonts.size () - 1) 1779 if (i == fonts.size () - 1)
1732 { 1780 {
1781 // compose characters are handled by the default font, unless another font takes over
1782 // we do not go via the fallback list for speed reasons.
1783 if (IS_COMPOSE (unicode))
1784 return 0;
1785
1733 if (fallback->name) 1786 if (fallback->name)
1734 { 1787 {
1735 // search through the fallback list 1788 // search through the fallback list
1736 push_font (new_font (fallback->name, fallback->cs)); 1789 push_font (new_font (fallback->name, fallback->cs));
1737 fallback++; 1790 fallback++;

Diff Legend

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