| … | |
… | |
| 1137 | |
1137 | |
| 1138 | #if XFT |
1138 | #if XFT |
| 1139 | |
1139 | |
| 1140 | struct rxvt_font_xft : rxvt_font |
1140 | struct rxvt_font_xft : rxvt_font |
| 1141 | { |
1141 | { |
|
|
1142 | #if XFT_CHAR_CACHE |
|
|
1143 | // we cache the qascii range xoffsets in the name of speed, |
|
|
1144 | // expecting terminals to deal mostly with these characters |
|
|
1145 | // we also assume the xoff always fits into uint8_t, |
|
|
1146 | // which is questionable, but let's see... |
|
|
1147 | // also, it is uncomfortably bug, due toit he uints. |
|
|
1148 | enum { char_cache_min = 0x20, char_cache_max = 0x7e }; |
|
|
1149 | uint8_t xoff_cache [char_cache_max - char_cache_min + 1]; |
|
|
1150 | FT_UInt glyph_cache [char_cache_max - char_cache_min + 1]; |
|
|
1151 | #endif |
|
|
1152 | |
| 1142 | rxvt_font_xft () |
1153 | rxvt_font_xft () |
| 1143 | { |
1154 | { |
| 1144 | f = 0; |
1155 | f = 0; |
| 1145 | } |
1156 | } |
| 1146 | |
1157 | |
| … | |
… | |
| 1327 | #if 0 // do it per-character |
1338 | #if 0 // do it per-character |
| 1328 | if (prop.width != rxvt_fontprop::unset && width > prop.width) |
1339 | if (prop.width != rxvt_fontprop::unset && width > prop.width) |
| 1329 | { |
1340 | { |
| 1330 | clear (); |
1341 | clear (); |
| 1331 | success = false; |
1342 | success = false; |
|
|
1343 | } |
|
|
1344 | #endif |
|
|
1345 | |
|
|
1346 | #if XFT_CHAR_CACHE |
|
|
1347 | // populate char cache |
|
|
1348 | for (FcChar16 ch = char_cache_min; ch <= char_cache_max; ++ch) |
|
|
1349 | { |
|
|
1350 | FT_UInt glyph = XftCharIndex (disp, f, ch); |
|
|
1351 | glyph_cache [ch - char_cache_min] = glyph; |
|
|
1352 | |
|
|
1353 | XGlyphInfo g; |
|
|
1354 | XftGlyphExtents (disp, f, &glyph, 1, &g); |
|
|
1355 | xoff_cache [ch - char_cache_min] = g.xOff; |
| 1332 | } |
1356 | } |
| 1333 | #endif |
1357 | #endif |
| 1334 | |
1358 | |
| 1335 | return success; |
1359 | return success; |
| 1336 | } |
1360 | } |
| … | |
… | |
| 1433 | XftGlyphExtents (disp, f, glyphs+i, 1, &ep); |
1457 | 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); |
1458 | 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 | } |
1459 | } |
| 1436 | #endif |
1460 | #endif |
| 1437 | |
1461 | |
|
|
1462 | FT_UInt glyph; |
|
|
1463 | int xOff; |
|
|
1464 | |
|
|
1465 | #if XFT_CHAR_CACHE |
|
|
1466 | if (ecb_expect_true (IN_RANGE_INC (chr, char_cache_min, char_cache_max))) |
|
|
1467 | { |
|
|
1468 | glyph = glyph_cache [chr - char_cache_min]; |
|
|
1469 | xOff = xoff_cache [chr - char_cache_min]; |
|
|
1470 | } |
|
|
1471 | else |
|
|
1472 | #endif |
|
|
1473 | { |
| 1438 | FT_UInt glyph = XftCharIndex (disp, f, chr); |
1474 | glyph = XftCharIndex (disp, f, chr); |
| 1439 | XGlyphInfo extents; |
1475 | XGlyphInfo extents; |
| 1440 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1476 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
|
|
1477 | xOff = extents.xOff; |
|
|
1478 | } |
| 1441 | |
1479 | |
| 1442 | ep->glyph = glyph; |
1480 | ep->glyph = glyph; |
| 1443 | ep->x = x_; |
1481 | ep->x = x_; |
| 1444 | ep->y = y_ + ascent; |
1482 | ep->y = y_ + ascent; |
| 1445 | |
1483 | |
| 1446 | // the xft font cell might differ from the terminal font cell, |
1484 | // the xft font cell might differ from the terminal font cell, |
| 1447 | // in which case we use the average between the two. |
1485 | // in which case we use the average between the two. |
| 1448 | ep->x += extents.xOff ? cwidth - extents.xOff >> 1 : 0; |
1486 | ep->x += xOff ? cwidth - xOff >> 1 : 0; |
| 1449 | |
1487 | |
| 1450 | // xft/freetype represent combining characters as characters with zero |
1488 | // xft/freetype represent combining characters as characters with zero |
| 1451 | // width rendered over the previous character with some fonts, while |
1489 | // width rendered over the previous character with some fonts, while |
| 1452 | // in other fonts, they are considered normal characters, while yet |
1490 | // in other fonts, they are considered normal characters, while yet |
| 1453 | // in other fonts, they are shifted all over the place. |
1491 | // in other fonts, they are shifted all over the place. |
| 1454 | // we handle the first two cases by keying off on xOff being 0 |
1492 | // we handle the first two cases by keying off on xOff being 0 |
| 1455 | // for zero-width chars. normally, we would add extents.xOff |
1493 | // 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. |
1494 | // of the base character here, but we don't have that, so we use cwidth. |
| 1457 | ep->x += extents.xOff ? 0 : cwidth; |
1495 | ep->x += xOff ? 0 : cwidth; |
| 1458 | |
1496 | |
| 1459 | ++ep; |
1497 | ++ep; |
| 1460 | } |
1498 | } |
| 1461 | |
1499 | |
| 1462 | x_ += cwidth; |
1500 | x_ += cwidth; |
