… | |
… | |
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 | |
… | |
… | |
212 | } |
212 | } |
213 | |
213 | |
214 | ///////////////////////////////////////////////////////////////////////////// |
214 | ///////////////////////////////////////////////////////////////////////////// |
215 | |
215 | |
216 | rxvt_font::rxvt_font () |
216 | rxvt_font::rxvt_font () |
217 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset), can_compose(false) |
217 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
218 | { |
218 | { |
219 | } |
219 | } |
220 | |
220 | |
221 | void |
221 | void |
222 | rxvt_font::set_name (char *name_) |
222 | rxvt_font::set_name (char *name_) |
… | |
… | |
445 | #endif |
445 | #endif |
446 | #if ENABLE_COMBINING |
446 | #if ENABLE_COMBINING |
447 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
447 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
448 | { |
448 | { |
449 | min_it (width, 2); // we only support wcwidth up to 2 |
449 | min_it (width, 2); // we only support wcwidth up to 2 |
450 | |
|
|
451 | #if NOT_YET |
|
|
452 | vector<text_t> chrs; |
|
|
453 | chrs.reserve (rxvt_composite.expand (t)); |
|
|
454 | rxvt_composite.expand (t, &chrs[0]); |
|
|
455 | |
|
|
456 | while (!chrs.empty ()) |
|
|
457 | { |
|
|
458 | rxvt_font *f1 = fs->find_font_idx (chrs[0]) |
|
|
459 | |
|
|
460 | int i = 0; |
|
|
461 | while (i < chrs.size () - 1 |
|
|
462 | && f1->can_combine |
|
|
463 | && f1->has-char (chrs[i + 1], careful) |
|
|
464 | && !careful |
|
|
465 | ++i; |
|
|
466 | |
|
|
467 | (*fs)[f1]->draw (d, x, y, &chrs[0], width, fg, bg); |
|
|
468 | chrs.erase (&chrs[0], &chrs[i]); |
|
|
469 | } |
|
|
470 | #endif |
|
|
471 | |
|
|
472 | #if 1 |
|
|
473 | text_t chrs[2]; |
450 | text_t chrs[2]; |
474 | chrs [1] = NOCHAR; |
451 | chrs [1] = NOCHAR; |
475 | |
452 | |
476 | *chrs = cc->c1; |
453 | *chrs = cc->c1; |
477 | rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; |
454 | rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; |
… | |
… | |
487 | ? f1 |
464 | ? f1 |
488 | : (*fs)[fs->find_font_idx (cc->c2)]; |
465 | : (*fs)[fs->find_font_idx (cc->c2)]; |
489 | |
466 | |
490 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
467 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
491 | } |
468 | } |
492 | #endif |
|
|
493 | } |
469 | } |
494 | #endif |
470 | #endif |
495 | else |
471 | else |
496 | switch (t) |
472 | switch (t) |
497 | { |
473 | { |
… | |
… | |
1161 | |
1137 | |
1162 | #if XFT |
1138 | #if XFT |
1163 | |
1139 | |
1164 | struct rxvt_font_xft : rxvt_font |
1140 | struct rxvt_font_xft : rxvt_font |
1165 | { |
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 | |
1166 | rxvt_font_xft () |
1153 | rxvt_font_xft () |
1167 | { |
1154 | { |
1168 | can_compose = true; |
|
|
1169 | f = 0; |
1155 | f = 0; |
1170 | } |
1156 | } |
1171 | |
1157 | |
1172 | void clear (); |
1158 | void clear (); |
1173 | |
1159 | |
… | |
… | |
1277 | break; |
1263 | break; |
1278 | } |
1264 | } |
1279 | |
1265 | |
1280 | FT_Face face = XftLockFace (f); |
1266 | FT_Face face = XftLockFace (f); |
1281 | |
1267 | |
|
|
1268 | // fuck me plenty: XftLockFace can actually return 0. try not to crash. |
|
|
1269 | // we also assume blindly that if the first lock succeeeds, then subsequent |
|
|
1270 | // locks will also succeed. |
|
|
1271 | if (!face) |
|
|
1272 | { |
|
|
1273 | XftFontClose (disp, f); |
|
|
1274 | success = false; |
|
|
1275 | break; |
|
|
1276 | } |
|
|
1277 | |
1282 | ascent = (face->size->metrics.ascender + 63) >> 6; |
1278 | ascent = (face->size->metrics.ascender + 63) >> 6; |
1283 | descent = (-face->size->metrics.descender + 63) >> 6; |
1279 | descent = (-face->size->metrics.descender + 63) >> 6; |
1284 | height = max (ascent + descent, (face->size->metrics.height + 63) >> 6); |
1280 | height = max (ascent + descent, (face->size->metrics.height + 63) >> 6); |
1285 | width = 0; |
1281 | width = 0; |
1286 | |
1282 | |
… | |
… | |
1355 | clear (); |
1351 | clear (); |
1356 | success = false; |
1352 | success = false; |
1357 | } |
1353 | } |
1358 | #endif |
1354 | #endif |
1359 | |
1355 | |
|
|
1356 | #if XFT_CHAR_CACHE |
|
|
1357 | // populate char cache |
|
|
1358 | for (FcChar16 ch = char_cache_min; ch <= char_cache_max; ++ch) |
|
|
1359 | { |
|
|
1360 | FT_UInt glyph = XftCharIndex (disp, f, ch); |
|
|
1361 | glyph_cache [ch - char_cache_min] = glyph; |
|
|
1362 | |
|
|
1363 | XGlyphInfo g; |
|
|
1364 | XftGlyphExtents (disp, f, &glyph, 1, &g); |
|
|
1365 | xoff_cache [ch - char_cache_min] = g.xOff; |
|
|
1366 | } |
|
|
1367 | #endif |
|
|
1368 | |
1360 | return success; |
1369 | return success; |
1361 | } |
1370 | } |
1362 | |
1371 | |
1363 | bool |
1372 | bool |
1364 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1373 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1365 | { |
1374 | { |
1366 | careful = false; |
1375 | careful = false; |
1367 | |
1376 | |
|
|
1377 | // handle non-bmp chars when text_t is 16 bit |
1368 | #if ENABLE_COMBINING && !UNICODE_3 |
1378 | #if ENABLE_COMBINING && !UNICODE_3 |
1369 | // handle non-BMP characters when our storage uses 16 bit |
|
|
1370 | if (ecb_expect_false (IS_COMPOSE (unicode))) |
1379 | if (ecb_expect_false (IS_COMPOSE (unicode))) |
1371 | if (compose_char *cc = rxvt_composite[unicode]) |
1380 | if (compose_char *cc = rxvt_composite [unicode]) |
1372 | if (cc->c2 == NOCHAR) |
1381 | if (cc->c2 == NOCHAR) |
1373 | unicode = cc->c1; |
1382 | unicode = cc->c1; |
1374 | #endif |
1383 | else |
1375 | |
1384 | return false; |
1376 | if (!XftCharExists (term->dpy, f, unicode)) |
1385 | else |
1377 | return false; |
1386 | return false; |
|
|
1387 | #endif |
1378 | |
1388 | |
1379 | // some fonts claim they can render private use chars and then |
1389 | FcChar32 chr = unicode; |
1380 | // render them as boxes. |
1390 | |
1381 | if (ecb_expect_false (IS_COMPOSE (unicode))) |
1391 | if (!XftCharExists (term->dpy, f, chr)) |
1382 | return false; |
1392 | return false; |
1383 | |
1393 | |
1384 | if (!prop || prop->width == rxvt_fontprop::unset) |
1394 | if (!prop || prop->width == rxvt_fontprop::unset) |
1385 | return true; |
1395 | return true; |
1386 | |
1396 | |
1387 | // check character against base font bounding box |
1397 | int wcw = max (WCWIDTH (chr), 1); |
1388 | FcChar32 ch = unicode; |
1398 | |
1389 | XGlyphInfo g; |
1399 | XGlyphInfo g; |
1390 | XftTextExtents32 (term->dpy, f, &ch, 1, &g); |
1400 | XftTextExtents32 (term->dpy, f, &chr, 1, &g); |
|
|
1401 | |
|
|
1402 | int cwidth = prop->width * wcw; |
|
|
1403 | |
|
|
1404 | // use same adjustments as in ->draw, see there |
|
|
1405 | g.x += g.xOff ? cwidth - g.xOff >> 1 : 0; |
|
|
1406 | g.x += g.xOff ? 0 : cwidth; |
1391 | |
1407 | |
1392 | int w = g.width - g.x; |
1408 | int w = g.width - g.x; |
1393 | int wcw = max (WCWIDTH (unicode), 1); |
|
|
1394 | |
1409 | |
1395 | careful = g.x > 0 || w > prop->width * wcw; |
1410 | careful = g.x > 0 || w > cwidth; |
1396 | |
1411 | |
1397 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
1412 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
1398 | return false; |
1413 | return false; |
1399 | |
1414 | |
1400 | // this weeds out _totally_ broken fonts, or glyphs |
1415 | // this weeds out _totally_ broken fonts, or glyphs |
… | |
… | |
1407 | void |
1422 | void |
1408 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1423 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1409 | const text_t *text, int len, |
1424 | const text_t *text, int len, |
1410 | int fg, int bg) |
1425 | int fg, int bg) |
1411 | { |
1426 | { |
1412 | XGlyphInfo extents; |
|
|
1413 | XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); |
1427 | XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); |
1414 | XftGlyphSpec *ep = enc; |
1428 | XftGlyphSpec *ep = enc; |
1415 | |
1429 | |
1416 | dTermDisplay; |
1430 | dTermDisplay; |
1417 | dTermGC; |
1431 | dTermGC; |
… | |
… | |
1430 | int y_ = buffered ? 0 : y; |
1444 | int y_ = buffered ? 0 : y; |
1431 | |
1445 | |
1432 | while (len) |
1446 | while (len) |
1433 | { |
1447 | { |
1434 | int cwidth = term->fwidth; |
1448 | int cwidth = term->fwidth; |
1435 | FcChar32 fc = *text++; len--; |
1449 | FcChar32 chr = *text++; len--; |
1436 | |
|
|
1437 | #if ENABLE_COMBINING && !UNICODE_3 |
|
|
1438 | // handle non-BMP characters when our storage uses 16 bit |
|
|
1439 | if (ecb_expect_false (IS_COMPOSE (fc))) |
|
|
1440 | if (compose_char *cc = rxvt_composite[fc]) // should always be true, but better be safe than sorry |
|
|
1441 | fc = cc->c1; // c2 must be NOCHAR, as has_char handles it that way |
|
|
1442 | #endif |
|
|
1443 | |
1450 | |
1444 | while (len && *text == NOCHAR) |
1451 | while (len && *text == NOCHAR) |
1445 | text++, len--, cwidth += term->fwidth; |
1452 | text++, len--, cwidth += term->fwidth; |
1446 | |
1453 | |
1447 | if (fc != ' ') // skip spaces |
1454 | if (chr != ' ') // skip spaces |
|
|
1455 | { |
|
|
1456 | // handle non-bmp chars when text_t is 16 bit |
|
|
1457 | #if ENABLE_COMBINING && !UNICODE_3 |
|
|
1458 | if (ecb_expect_false (IS_COMPOSE (chr))) |
|
|
1459 | if (compose_char *cc = rxvt_composite [chr]) |
|
|
1460 | if (cc->c2 == NOCHAR) |
|
|
1461 | chr = cc->c1; |
|
|
1462 | #endif |
|
|
1463 | |
|
|
1464 | #if 0 |
|
|
1465 | FT_UInt glyphs [decltype (exp)::max_size]; |
|
|
1466 | |
|
|
1467 | for (int i = 0; i < nchrs; ++i) |
|
|
1468 | glyphs [i] = XftCharIndex (disp, f, chrs [i]); |
|
|
1469 | |
|
|
1470 | for (int i = 0; i < nchrs; ++i) |
1448 | { |
1471 | { |
|
|
1472 | XGlyphInfo ep; |
|
|
1473 | XftGlyphExtents (disp, f, glyphs+i, 1, &ep); |
|
|
1474 | 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 | } |
|
|
1476 | #endif |
|
|
1477 | |
|
|
1478 | FT_UInt glyph; |
|
|
1479 | int xOff; |
|
|
1480 | |
|
|
1481 | #if XFT_CHAR_CACHE |
|
|
1482 | if (ecb_expect_true (IN_RANGE_INC (chr, char_cache_min, char_cache_max))) |
|
|
1483 | { |
|
|
1484 | glyph = glyph_cache [chr - char_cache_min]; |
|
|
1485 | xOff = xoff_cache [chr - char_cache_min]; |
|
|
1486 | } |
|
|
1487 | else |
|
|
1488 | #endif |
|
|
1489 | { |
1449 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1490 | glyph = XftCharIndex (disp, f, chr); |
|
|
1491 | XGlyphInfo extents; |
1450 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1492 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
|
|
1493 | xOff = extents.xOff; |
|
|
1494 | } |
1451 | |
1495 | |
1452 | ep->glyph = glyph; |
1496 | ep->glyph = glyph; |
1453 | ep->x = x_ + (cwidth - extents.xOff >> 1); |
1497 | ep->x = x_; |
1454 | ep->y = y_ + ascent; |
1498 | ep->y = y_ + ascent; |
1455 | |
1499 | |
1456 | if (extents.xOff == 0) |
1500 | // the xft font cell might differ from the terminal font cell, |
|
|
1501 | // in which case we use the average between the two. |
|
|
1502 | ep->x += xOff ? cwidth - xOff >> 1 : 0; |
|
|
1503 | |
|
|
1504 | // xft/freetype represent combining characters as characters with zero |
|
|
1505 | // width rendered over the previous character with some fonts, while |
|
|
1506 | // in other fonts, they are considered normal characters, while yet |
|
|
1507 | // in other fonts, they are shifted all over the place. |
|
|
1508 | // we handle the first two cases by keying off on xOff being 0 |
|
|
1509 | // for zero-width chars. normally, we would add extents.xOff |
|
|
1510 | // of the base character here, but we don't have that, so we use cwidth. |
1457 | ep->x = x_ + cwidth; |
1511 | ep->x += xOff ? 0 : cwidth; |
1458 | |
1512 | |
1459 | ep++; |
1513 | ++ep; |
1460 | } |
1514 | } |
1461 | |
1515 | |
1462 | x_ += cwidth; |
1516 | x_ += cwidth; |
1463 | } |
1517 | } |
1464 | |
1518 | |
… | |
… | |
1733 | } |
1787 | } |
1734 | |
1788 | |
1735 | int |
1789 | int |
1736 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1790 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1737 | { |
1791 | { |
1738 | // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3 |
1792 | // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3 |
1739 | if (unicode > 0x1fffff) |
1793 | if (unicode > 0x1fffff) |
1740 | return 0; |
1794 | return 0; |
1741 | |
1795 | |
1742 | unicode_t hi = unicode >> 8; |
1796 | unicode_t hi = unicode >> 8; |
1743 | |
1797 | |