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.209 by root, Fri Jun 18 21:58:03 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 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)
1341 if (!XftCharExists (term->dpy, f, unicode)) 1349 if (!XftCharExists (term->dpy, f, chrs [i]))
1342 return false; 1350 return false;
1343 1351
1344 if (!prop || prop->width == rxvt_fontprop::unset) 1352 if (!prop || prop->width == rxvt_fontprop::unset)
1345 return true; 1353 return true;
1346 1354
1347 // check character against base font bounding box 1355 int wcw = max (WCWIDTH (chrs [0]), 1);
1348 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 {
1349 XGlyphInfo g; 1361 XGlyphInfo g;
1350 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1362 XftTextExtents32 (term->dpy, f, chrs + i, 1, &g);
1351 1363
1352 int w = g.width - g.x; 1364 int w = g.width - g.x;
1353 int wcw = max (WCWIDTH (unicode), 1);
1354 1365
1355 careful = g.x > 0 || w > prop->width * wcw; 1366 careful = g.x > 0 || w > prop->width * wcw;
1356 1367
1357 if (careful && !OVERLAP_OK (w, wcw, prop)) 1368 if (careful && !OVERLAP_OK (w, wcw, prop))
1358 return false; 1369 return false;
1359 1370
1360 // this weeds out _totally_ broken fonts, or glyphs 1371 // this weeds out _totally_ broken fonts, or glyphs
1361 if (!OVERLAP_OK (g.xOff, wcw, prop)) 1372 if (!OVERLAP_OK (g.xOff, wcw, prop))
1362 return false; 1373 return false;
1374 }
1363 1375
1364 return true; 1376 return true;
1365} 1377}
1366 1378
1367void 1379void
1368rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1380rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1369 const text_t *text, int len, 1381 const text_t *text, int len,
1370 int fg, int bg) 1382 int fg, int bg)
1371{ 1383{
1372 XGlyphInfo extents;
1373 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1384 //XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);//D
1374 XftGlyphSpec *ep = enc; 1385 //XftGlyphSpec *ep = enc;//D
1386 static vector<XftGlyphSpec> enc; enc.resize (0); // static to avoid malloc, still slow
1375 1387
1376 dTermDisplay; 1388 dTermDisplay;
1377 dTermGC; 1389 dTermGC;
1378 1390
1379 int w = term->fwidth * len; 1391 int w = term->fwidth * len;
… …
1390 int y_ = buffered ? 0 : y; 1402 int y_ = buffered ? 0 : y;
1391 1403
1392 while (len) 1404 while (len)
1393 { 1405 {
1394 int cwidth = term->fwidth; 1406 int cwidth = term->fwidth;
1407
1408 rxvt_compose_expand_static<FcChar32> exp;
1395 FcChar32 fc = *text++; len--; 1409 FcChar32 *chrs = exp (*text++); len--;
1410 int nchrs = exp.length (chrs);
1396 1411
1397 while (len && *text == NOCHAR) 1412 while (len && *text == NOCHAR)
1398 text++, len--, cwidth += term->fwidth; 1413 text++, len--, cwidth += term->fwidth;
1399 1414
1400 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)
1401 { 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
1402 FT_UInt glyph = XftCharIndex (disp, f, fc); 1431 FT_UInt glyph = XftCharIndex (disp, f, chrs [0]);
1432 XGlyphInfo extents0;
1403 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1433 XftGlyphExtents (disp, f, &glyph, 1, &extents0);
1404 1434
1435 int cx = x_ + (cwidth - extents0.xOff >> 1);
1436 int cy = y_ + ascent;
1437
1438 XftGlyphSpec ep;
1405 ep->glyph = glyph; 1439 ep.glyph = glyph;
1406 ep->x = x_ + (cwidth - extents.xOff >> 1); 1440 ep.x = cx + (extents0.xOff ? 0 : extents0.xOff);
1407 ep->y = y_ + ascent; 1441 ep.y = cy;
1408 1442
1409 if (extents.xOff == 0) 1443 enc.push_back (ep);
1410 ep->x = x_ + cwidth;
1411 1444
1412 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 }
1413 } 1456 }
1414 1457
1415 x_ += cwidth; 1458 x_ += cwidth;
1416 } 1459 }
1417 1460
1418 if (buffered) 1461 if (buffered)
1419 { 1462 {
1420 if (ep != enc) 1463 if (!enc.empty ())
1421 { 1464 {
1422 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1465 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1423 1466
1424#ifdef HAVE_IMG 1467#ifdef HAVE_IMG
1425 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
… …
1471 } 1514 }
1472 else 1515 else
1473#endif 1516#endif
1474 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);
1475 1518
1476 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1519 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1477 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1520 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1478 } 1521 }
1479 else 1522 else
1480 clear_rect (d, x, y, w, h, bg); 1523 clear_rect (d, x, y, w, h, bg);
1481 } 1524 }
1482 else 1525 else
1483 { 1526 {
1484 clear_rect (d, x, y, w, h, bg); 1527 clear_rect (d, x, y, w, h, bg);
1485 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1528 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1486 } 1529 }
1487} 1530}
1488 1531
1489#endif 1532#endif
1490 1533
… …
1686} 1729}
1687 1730
1688int 1731int
1689rxvt_fontset::find_font_idx (unicode_t unicode) 1732rxvt_fontset::find_font_idx (unicode_t unicode)
1690{ 1733{
1691 if (unicode >= 1<<20) 1734 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1735 if (unicode > 0x1fffff)
1692 return 0; 1736 return 0;
1693 1737
1694 unicode_t hi = unicode >> 8; 1738 unicode_t hi = unicode >> 8;
1695 1739
1696 if (hi < fmap.size () 1740 if (hi < fmap.size ())
1697 && fmap[hi] 1741 if (pagemap *pm = fmap[hi])
1698 && (*fmap[hi])[unicode & 0xff] != 0xff) 1742 if ((*pm)[unicode & 0xff] != 0xff)
1699 return (*fmap[hi])[unicode & 0xff]; 1743 return (*pm)[unicode & 0xff];
1700 1744
1701 unsigned int i; 1745 unsigned int i;
1702 1746
1703 for (i = 0; i < fonts.size (); i++) 1747 for (i = 0; i < fonts.size (); i++)
1704 { 1748 {
… …
1728 } 1772 }
1729 1773
1730 next_font: 1774 next_font:
1731 if (i == fonts.size () - 1) 1775 if (i == fonts.size () - 1)
1732 { 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
1733 if (fallback->name) 1782 if (fallback->name)
1734 { 1783 {
1735 // search through the fallback list 1784 // search through the fallback list
1736 push_font (new_font (fallback->name, fallback->cs)); 1785 push_font (new_font (fallback->name, fallback->cs));
1737 fallback++; 1786 fallback++;

Diff Legend

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