… | |
… | |
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) |
217 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset), can_compose(false) |
218 | { |
218 | { |
219 | } |
219 | } |
220 | |
220 | |
221 | void |
221 | void |
222 | rxvt_font::set_name (char *name_) |
222 | rxvt_font::set_name (char *name_) |
… | |
… | |
262 | } |
262 | } |
263 | } |
263 | } |
264 | |
264 | |
265 | ///////////////////////////////////////////////////////////////////////////// |
265 | ///////////////////////////////////////////////////////////////////////////// |
266 | |
266 | |
267 | struct rxvt_font_default : rxvt_font { |
267 | struct 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) |
… | |
… | |
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 | |
|
|
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 |
450 | text_t chrs[2]; |
473 | text_t chrs[2]; |
451 | chrs [1] = NOCHAR; |
474 | chrs [1] = NOCHAR; |
452 | |
475 | |
453 | *chrs = cc->c1; |
476 | *chrs = cc->c1; |
454 | rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; |
477 | rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; |
… | |
… | |
464 | ? f1 |
487 | ? f1 |
465 | : (*fs)[fs->find_font_idx (cc->c2)]; |
488 | : (*fs)[fs->find_font_idx (cc->c2)]; |
466 | |
489 | |
467 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
490 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
468 | } |
491 | } |
|
|
492 | #endif |
469 | } |
493 | } |
470 | #endif |
494 | #endif |
471 | else |
495 | else |
472 | switch (t) |
496 | switch (t) |
473 | { |
497 | { |
474 | case '\t': |
498 | case '\t': |
475 | case ZERO_WIDTH_CHAR: |
499 | case ZERO_WIDTH_CHAR: |
476 | case NOCHAR: |
500 | case NOCHAR: |
477 | break; |
501 | break; |
478 | |
502 | |
|
|
503 | /* |
|
|
504 | * If the base font does not support variation selectors, treat them as ZWC. |
|
|
505 | * a point could be made to do this for all wcwidth == 0 characters, but I |
|
|
506 | * decided against that until more data is available. |
|
|
507 | */ |
|
|
508 | case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07: |
|
|
509 | case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f: |
|
|
510 | break; |
|
|
511 | |
479 | default: |
512 | default: |
480 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
513 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
481 | fwidth - 4, term->fheight - 4); |
514 | fwidth - 4, term->fheight - 4); |
482 | } |
515 | } |
483 | |
516 | |
484 | x += fwidth; |
517 | x += fwidth; |
485 | } |
518 | } |
486 | } |
519 | } |
487 | |
520 | |
488 | struct rxvt_font_overflow : rxvt_font { |
521 | struct rxvt_font_overflow : rxvt_font |
|
|
522 | { |
489 | struct rxvt_fontset *fs; |
523 | struct rxvt_fontset *fs; |
490 | |
524 | |
491 | rxvt_font_overflow (rxvt_fontset *fs) |
525 | rxvt_font_overflow (rxvt_fontset *fs) |
492 | : rxvt_font () |
526 | : rxvt_font () |
493 | { |
527 | { |
… | |
… | |
539 | } |
573 | } |
540 | }; |
574 | }; |
541 | |
575 | |
542 | ///////////////////////////////////////////////////////////////////////////// |
576 | ///////////////////////////////////////////////////////////////////////////// |
543 | |
577 | |
544 | struct rxvt_font_x11 : rxvt_font { |
578 | struct rxvt_font_x11 : rxvt_font |
|
|
579 | { |
545 | rxvt_font_x11 () { f = 0; } |
580 | rxvt_font_x11 () { f = 0; } |
546 | |
581 | |
547 | void clear (); |
582 | void clear (); |
548 | |
583 | |
549 | rxvt_fontprop properties (); |
584 | rxvt_fontprop properties (); |
… | |
… | |
1124 | |
1159 | |
1125 | ///////////////////////////////////////////////////////////////////////////// |
1160 | ///////////////////////////////////////////////////////////////////////////// |
1126 | |
1161 | |
1127 | #if XFT |
1162 | #if XFT |
1128 | |
1163 | |
1129 | struct rxvt_font_xft : rxvt_font { |
1164 | struct rxvt_font_xft : rxvt_font |
|
|
1165 | { |
1130 | rxvt_font_xft () { f = 0; } |
1166 | rxvt_font_xft () |
|
|
1167 | { |
|
|
1168 | can_compose = true; |
|
|
1169 | f = 0; |
|
|
1170 | } |
1131 | |
1171 | |
1132 | void clear (); |
1172 | void clear (); |
1133 | |
1173 | |
1134 | rxvt_fontprop properties (); |
1174 | rxvt_fontprop properties (); |
1135 | |
1175 | |
… | |
… | |
1277 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
1317 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
1278 | } |
1318 | } |
1279 | |
1319 | |
1280 | if (!width) |
1320 | if (!width) |
1281 | { |
1321 | { |
1282 | rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); |
1322 | rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name); |
1283 | |
1323 | width = f->max_advance_width; |
1284 | XftFontClose (disp, f); |
|
|
1285 | f = 0; |
|
|
1286 | |
|
|
1287 | success = false; |
|
|
1288 | break; |
1324 | break; |
1289 | } |
1325 | } |
1290 | |
1326 | |
1291 | if (prop.height == rxvt_fontprop::unset |
1327 | if (prop.height == rxvt_fontprop::unset |
1292 | || (height <= prop.height && glheight <= prop.height) |
1328 | || (height <= prop.height && glheight <= prop.height) |
… | |
… | |
1327 | bool |
1363 | bool |
1328 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1364 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1329 | { |
1365 | { |
1330 | careful = false; |
1366 | careful = false; |
1331 | |
1367 | |
|
|
1368 | #if ENABLE_COMBINING && !UNICODE_3 |
|
|
1369 | if (ecb_expect_false (IS_COMPOSE (unicode))) |
|
|
1370 | if (compose_char *cc = rxvt_composite[unicode]) |
|
|
1371 | if (cc->c2 == NOCHAR) |
|
|
1372 | unicode = cc->c1; |
|
|
1373 | #endif |
|
|
1374 | |
1332 | if (!XftCharExists (term->dpy, f, unicode)) |
1375 | if (!XftCharExists (term->dpy, f, unicode)) |
1333 | return false; |
1376 | return false; |
1334 | |
1377 | |
1335 | if (!prop || prop->width == rxvt_fontprop::unset) |
1378 | if (!prop || prop->width == rxvt_fontprop::unset) |
1336 | return true; |
1379 | return true; |
… | |
… | |
1382 | |
1425 | |
1383 | while (len) |
1426 | while (len) |
1384 | { |
1427 | { |
1385 | int cwidth = term->fwidth; |
1428 | int cwidth = term->fwidth; |
1386 | FcChar32 fc = *text++; len--; |
1429 | FcChar32 fc = *text++; len--; |
|
|
1430 | |
|
|
1431 | #if ENABLE_COMBINING && !UNICODE_3 |
|
|
1432 | if (ecb_expect_false (IS_COMPOSE (fc))) |
|
|
1433 | if (compose_char *cc = rxvt_composite[fc]) // should always be true, but better be safe than sorry |
|
|
1434 | fc = cc->c1; // c2 must be NOCHAR, as has_char handles it that way |
|
|
1435 | #endif |
1387 | |
1436 | |
1388 | while (len && *text == NOCHAR) |
1437 | while (len && *text == NOCHAR) |
1389 | text++, len--, cwidth += term->fwidth; |
1438 | text++, len--, cwidth += term->fwidth; |
1390 | |
1439 | |
1391 | if (fc != ' ') // skip spaces |
1440 | if (fc != ' ') // skip spaces |
… | |
… | |
1677 | } |
1726 | } |
1678 | |
1727 | |
1679 | int |
1728 | int |
1680 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1729 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1681 | { |
1730 | { |
1682 | if (unicode >= 1<<20) |
1731 | // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3 |
|
|
1732 | if (unicode > 0x1fffff) |
1683 | return 0; |
1733 | return 0; |
1684 | |
1734 | |
1685 | unicode_t hi = unicode >> 8; |
1735 | unicode_t hi = unicode >> 8; |
1686 | |
1736 | |
1687 | if (hi < fmap.size () |
1737 | if (hi < fmap.size ()) |
1688 | && fmap[hi] |
1738 | if (pagemap *pm = fmap[hi]) |
1689 | && (*fmap[hi])[unicode & 0xff] != 0xff) |
1739 | if ((*pm)[unicode & 0xff] != 0xff) |
1690 | return (*fmap[hi])[unicode & 0xff]; |
1740 | return (*pm)[unicode & 0xff]; |
1691 | |
1741 | |
1692 | unsigned int i; |
1742 | unsigned int i; |
1693 | |
1743 | |
1694 | for (i = 0; i < fonts.size (); i++) |
1744 | for (i = 0; i < fonts.size (); i++) |
1695 | { |
1745 | { |
… | |
… | |
1719 | } |
1769 | } |
1720 | |
1770 | |
1721 | next_font: |
1771 | next_font: |
1722 | if (i == fonts.size () - 1) |
1772 | if (i == fonts.size () - 1) |
1723 | { |
1773 | { |
|
|
1774 | // compose characters are handled by the default font, unless another font takes over |
|
|
1775 | // we do not go via the fallback list for speed reasons. |
|
|
1776 | if (IS_COMPOSE (unicode)) |
|
|
1777 | return 0; |
|
|
1778 | |
1724 | if (fallback->name) |
1779 | if (fallback->name) |
1725 | { |
1780 | { |
1726 | // search through the fallback list |
1781 | // search through the fallback list |
1727 | push_font (new_font (fallback->name, fallback->cs)); |
1782 | push_font (new_font (fallback->name, fallback->cs)); |
1728 | fallback++; |
1783 | fallback++; |
… | |
… | |
1734 | // way to configure this and xft is easier to hack in, |
1789 | // way to configure this and xft is easier to hack in, |
1735 | // while x11 has more framework in place already. |
1790 | // while x11 has more framework in place already. |
1736 | // TODO: this is a real resource hog, xft takes ages(?) |
1791 | // TODO: this is a real resource hog, xft takes ages(?) |
1737 | #if XFT && USE_SLOW_LOOKUP |
1792 | #if XFT && USE_SLOW_LOOKUP |
1738 | // grab the first xft font that seems suitable |
1793 | // grab the first xft font that seems suitable |
|
|
1794 | // TOOD: should go first for cellchar (spacing 110) then mono, then else |
1739 | FcPattern *p = FcPatternCreate (); |
1795 | FcPattern *p = FcPatternCreate (); |
1740 | |
1796 | |
1741 | FcCharSet *s = FcCharSetCreate (); |
1797 | FcCharSet *s = FcCharSetCreate (); |
1742 | FcCharSetAddChar (s, unicode); |
1798 | FcCharSetAddChar (s, unicode); |
1743 | FcPatternAddCharSet (p, FC_CHARSET, s); |
1799 | FcPatternAddCharSet (p, FC_CHARSET, s); |