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.217 by root, Wed Jun 23 12:37:32 2021 UTC vs.
Revision 1.223 by sf-exg, Sat Aug 19 17:44:35 2023 UTC

… …
517 } 517 }
518 518
519 bool load (const rxvt_fontprop &prop, bool force_prop) 519 bool load (const rxvt_fontprop &prop, bool force_prop)
520 { 520 {
521 width = 1; height = 1; 521 width = 1; height = 1;
522 ascent = 1; descent = 0; 522 ascent = 1;
523 descent = (*fs)[2]->descent;
523 524
524 set_name (strdup ("built-in rendition overflow font")); 525 set_name (strdup ("built-in rendition overflow font"));
525 526
526 return true; 527 return true;
527 } 528 }
… …
1137 1138
1138#if XFT 1139#if XFT
1139 1140
1140struct rxvt_font_xft : rxvt_font 1141struct rxvt_font_xft : rxvt_font
1141{ 1142{
1143#if XFT_CHAR_CACHE
1144 // we cache the qascii range xoffsets in the name of speed,
1145 // expecting terminals to deal mostly with these characters
1146 // we also assume the xoff always fits into uint8_t,
1147 // which is questionable, but let's see...
1148 // also, it is uncomfortably big, due to the uints.
1149 enum { char_cache_min = 0x20, char_cache_max = 0x7e };
1150 uint8_t xoff_cache [char_cache_max - char_cache_min + 1];
1151 FT_UInt glyph_cache [char_cache_max - char_cache_min + 1];
1152#endif
1153
1142 rxvt_font_xft () 1154 rxvt_font_xft ()
1143 { 1155 {
1144 f = 0; 1156 f = 0;
1145 } 1157 }
1146 1158
… …
1252 break; 1264 break;
1253 } 1265 }
1254 1266
1255 FT_Face face = XftLockFace (f); 1267 FT_Face face = XftLockFace (f);
1256 1268
1269 // fuck me plenty: XftLockFace can actually return 0. try not to crash.
1270 // we also assume blindly that if the first lock succeeds, then subsequent
1271 // locks will also succeed.
1272 if (!face)
1273 {
1274 XftFontClose (disp, f);
1275 success = false;
1276 break;
1277 }
1278
1257 ascent = (face->size->metrics.ascender + 63) >> 6; 1279 ascent = (face->size->metrics.ascender + 63) >> 6;
1258 descent = (-face->size->metrics.descender + 63) >> 6; 1280 descent = (-face->size->metrics.descender + 63) >> 6;
1259 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6); 1281 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
1260 width = 0; 1282 width = 0;
1261 1283
… …
1327#if 0 // do it per-character 1349#if 0 // do it per-character
1328 if (prop.width != rxvt_fontprop::unset && width > prop.width) 1350 if (prop.width != rxvt_fontprop::unset && width > prop.width)
1329 { 1351 {
1330 clear (); 1352 clear ();
1331 success = false; 1353 success = false;
1354 }
1355#endif
1356
1357#if XFT_CHAR_CACHE
1358 // populate char cache
1359 for (FcChar16 ch = char_cache_min; ch <= char_cache_max; ++ch)
1360 {
1361 FT_UInt glyph = XftCharIndex (disp, f, ch);
1362 glyph_cache [ch - char_cache_min] = glyph;
1363
1364 XGlyphInfo g;
1365 XftGlyphExtents (disp, f, &glyph, 1, &g);
1366 xoff_cache [ch - char_cache_min] = g.xOff;
1332 } 1367 }
1333#endif 1368#endif
1334 1369
1335 return success; 1370 return success;
1336} 1371}
… …
1363 int wcw = max (WCWIDTH (chr), 1); 1398 int wcw = max (WCWIDTH (chr), 1);
1364 1399
1365 XGlyphInfo g; 1400 XGlyphInfo g;
1366 XftTextExtents32 (term->dpy, f, &chr, 1, &g); 1401 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1367 1402
1403 int cwidth = prop->width * wcw;
1404
1405 // use same adjustments as in ->draw, see there
1406 g.x += g.xOff ? cwidth - g.xOff >> 1 : 0;
1407 g.x += g.xOff ? 0 : cwidth;
1408
1368 int w = g.width - g.x; 1409 int w = g.width - g.x;
1369 1410
1370 careful = g.x > 0 || w > prop->width * wcw; 1411 careful = g.x > 0 || w > cwidth;
1371 1412
1372 if (careful && !OVERLAP_OK (w, wcw, prop)) 1413 if (careful && !OVERLAP_OK (w, wcw, prop))
1373 return false; 1414 return false;
1374 1415
1375 // this weeds out _totally_ broken fonts, or glyphs 1416 // this weeds out _totally_ broken fonts, or glyphs
… …
1433 XftGlyphExtents (disp, f, glyphs+i, 1, &ep); 1474 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); 1475 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 } 1476 }
1436 #endif 1477 #endif
1437 1478
1479 FT_UInt glyph;
1480 int xOff;
1481
1482 #if XFT_CHAR_CACHE
1483 if (ecb_expect_true (IN_RANGE_INC (chr, char_cache_min, char_cache_max)))
1484 {
1485 glyph = glyph_cache [chr - char_cache_min];
1486 xOff = xoff_cache [chr - char_cache_min];
1487 }
1488 else
1489 #endif
1490 {
1438 FT_UInt glyph = XftCharIndex (disp, f, chr); 1491 glyph = XftCharIndex (disp, f, chr);
1439 XGlyphInfo extents; 1492 XGlyphInfo extents;
1440 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1493 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1494 xOff = extents.xOff;
1495 }
1441 1496
1442 ep->glyph = glyph; 1497 ep->glyph = glyph;
1443 ep->x = x_; 1498 ep->x = x_;
1444 ep->y = y_ + ascent; 1499 ep->y = y_ + ascent;
1445 1500
1446 // the xft font cell might differ from the terminal font cell, 1501 // the xft font cell might differ from the terminal font cell,
1447 // in which case we use the average between the two. 1502 // in which case we use the average between the two.
1448 ep->x += extents.xOff ? cwidth - extents.xOff >> 1 : 0; 1503 ep->x += xOff ? cwidth - xOff >> 1 : 0;
1449 1504
1450 // xft/freetype represent combining characters as characters with zero 1505 // xft/freetype represent combining characters as characters with zero
1451 // width rendered over the previous character with some fonts, while 1506 // width rendered over the previous character with some fonts, while
1452 // in other fonts, they are considered normal characters, while yet 1507 // in other fonts, they are considered normal characters, while yet
1453 // in other fonts, they are shifted all over the place. 1508 // in other fonts, they are shifted all over the place.
1454 // we handle the first two cases by keying off on xOff being 0 1509 // we handle the first two cases by keying off on xOff being 0
1455 // for zero-width chars. normally, we would add extents.xOff 1510 // 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. 1511 // of the base character here, but we don't have that, so we use cwidth.
1457 ep->x += extents.xOff ? 0 : cwidth; 1512 ep->x += xOff ? 0 : cwidth;
1458 1513
1459 ++ep; 1514 ++ep;
1460 } 1515 }
1461 1516
1462 x_ += cwidth; 1517 x_ += cwidth;

Diff Legend

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