… | |
… | |
134 | # endif |
134 | # endif |
135 | #endif |
135 | #endif |
136 | |
136 | |
137 | //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. |
137 | //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. |
138 | #if XFT |
138 | #if XFT |
139 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
139 | { CS_UNICODE, "xft:DejaVu Sans Mono:antialias=false:autohint=true" }, |
140 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
140 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
141 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
141 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
142 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, |
142 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, |
143 | |
143 | |
144 | // FreeMono is usually uglier than x fonts, so try after the others |
144 | // FreeMono is usually uglier than x fonts, so try after the others |
145 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
145 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
146 | #endif |
146 | #endif |
147 | |
147 | |
… | |
… | |
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 big, due to the 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 | } |
… | |
… | |
1363 | int wcw = max (WCWIDTH (chr), 1); |
1387 | int wcw = max (WCWIDTH (chr), 1); |
1364 | |
1388 | |
1365 | XGlyphInfo g; |
1389 | XGlyphInfo g; |
1366 | XftTextExtents32 (term->dpy, f, &chr, 1, &g); |
1390 | XftTextExtents32 (term->dpy, f, &chr, 1, &g); |
1367 | |
1391 | |
|
|
1392 | int cwidth = prop->width * wcw; |
|
|
1393 | |
|
|
1394 | // use same adjustments as in ->draw, see there |
|
|
1395 | g.x += g.xOff ? cwidth - g.xOff >> 1 : 0; |
|
|
1396 | g.x += g.xOff ? 0 : cwidth; |
|
|
1397 | |
1368 | int w = g.width - g.x; |
1398 | int w = g.width - g.x; |
1369 | |
1399 | |
1370 | careful = g.x > 0 || w > prop->width * wcw; |
1400 | careful = g.x > 0 || w > cwidth; |
1371 | |
1401 | |
1372 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
1402 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
1373 | return false; |
1403 | return false; |
1374 | |
1404 | |
1375 | // this weeds out _totally_ broken fonts, or glyphs |
1405 | // this weeds out _totally_ broken fonts, or glyphs |
… | |
… | |
1406 | while (len) |
1436 | while (len) |
1407 | { |
1437 | { |
1408 | int cwidth = term->fwidth; |
1438 | int cwidth = term->fwidth; |
1409 | FcChar32 chr = *text++; len--; |
1439 | FcChar32 chr = *text++; len--; |
1410 | |
1440 | |
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 |
|
|
1418 | |
|
|
1419 | while (len && *text == NOCHAR) |
1441 | while (len && *text == NOCHAR) |
1420 | text++, len--, cwidth += term->fwidth; |
1442 | text++, len--, cwidth += term->fwidth; |
1421 | |
1443 | |
1422 | if (chr != ' ') // skip spaces |
1444 | if (chr != ' ') // skip spaces |
1423 | { |
1445 | { |
|
|
1446 | // handle non-bmp chars when text_t is 16 bit |
|
|
1447 | #if ENABLE_COMBINING && !UNICODE_3 |
|
|
1448 | if (ecb_expect_false (IS_COMPOSE (chr))) |
|
|
1449 | if (compose_char *cc = rxvt_composite [chr]) |
|
|
1450 | if (cc->c2 == NOCHAR) |
|
|
1451 | chr = cc->c1; |
|
|
1452 | #endif |
|
|
1453 | |
1424 | #if 0 |
1454 | #if 0 |
1425 | FT_UInt glyphs [decltype (exp)::max_size]; |
1455 | FT_UInt glyphs [decltype (exp)::max_size]; |
1426 | |
1456 | |
1427 | for (int i = 0; i < nchrs; ++i) |
1457 | for (int i = 0; i < nchrs; ++i) |
1428 | glyphs [i] = XftCharIndex (disp, f, chrs [i]); |
1458 | glyphs [i] = XftCharIndex (disp, f, chrs [i]); |
… | |
… | |
1433 | XftGlyphExtents (disp, f, glyphs+i, 1, &ep); |
1463 | 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); |
1464 | 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 | } |
1465 | } |
1436 | #endif |
1466 | #endif |
1437 | |
1467 | |
|
|
1468 | FT_UInt glyph; |
|
|
1469 | int xOff; |
|
|
1470 | |
|
|
1471 | #if XFT_CHAR_CACHE |
|
|
1472 | if (ecb_expect_true (IN_RANGE_INC (chr, char_cache_min, char_cache_max))) |
|
|
1473 | { |
|
|
1474 | glyph = glyph_cache [chr - char_cache_min]; |
|
|
1475 | xOff = xoff_cache [chr - char_cache_min]; |
|
|
1476 | } |
|
|
1477 | else |
|
|
1478 | #endif |
|
|
1479 | { |
1438 | FT_UInt glyph = XftCharIndex (disp, f, chr); |
1480 | glyph = XftCharIndex (disp, f, chr); |
1439 | XGlyphInfo extents; |
1481 | XGlyphInfo extents; |
1440 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1482 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
|
|
1483 | xOff = extents.xOff; |
|
|
1484 | } |
1441 | |
1485 | |
1442 | ep->glyph = glyph; |
1486 | ep->glyph = glyph; |
1443 | ep->x = x_; |
1487 | ep->x = x_; |
1444 | ep->y = y_ + ascent; |
1488 | ep->y = y_ + ascent; |
1445 | |
1489 | |
1446 | // the xft font cell might differ from the terminal font cell, |
1490 | // the xft font cell might differ from the terminal font cell, |
1447 | // in which case we use the average between the two. |
1491 | // in which case we use the average between the two. |
1448 | ep->x += cwidth - extents.xOff >> 1; |
1492 | ep->x += xOff ? cwidth - xOff >> 1 : 0; |
1449 | |
1493 | |
1450 | // xft/freetype represent combining characters as characters with zero |
1494 | // xft/freetype represent combining characters as characters with zero |
1451 | // width rendered over the previous character with some fonts, while |
1495 | // width rendered over the previous character with some fonts, while |
1452 | // in other fonts, they are considered normal characters, while yet |
1496 | // in other fonts, they are considered normal characters, while yet |
1453 | // in other fonts, they are shifted all over the place. |
1497 | // in other fonts, they are shifted all over the place. |
1454 | // we handle the first two cases by keying off on xOff being 0 |
1498 | // we handle the first two cases by keying off on xOff being 0 |
1455 | // for zero-width chars. normally, we would add extents.xOff |
1499 | // 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. |
1500 | // of the base character here, but we don't have that, so we use cwidth. |
1457 | ep->x += extents.xOff ? 0 : cwidth; |
1501 | ep->x += xOff ? 0 : cwidth; |
1458 | |
1502 | |
1459 | ++ep; |
1503 | ++ep; |
1460 | } |
1504 | } |
1461 | |
1505 | |
1462 | x_ += cwidth; |
1506 | x_ += cwidth; |