… | |
… | |
26 | |
26 | |
27 | #include <cstdlib> |
27 | #include <cstdlib> |
28 | |
28 | |
29 | #include <inttypes.h> |
29 | #include <inttypes.h> |
30 | |
30 | |
|
|
31 | #if XFT |
|
|
32 | # include <fontconfig/fontconfig.h> |
|
|
33 | #endif |
|
|
34 | |
31 | #define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width |
35 | #define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width |
32 | #define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts |
36 | #define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts |
33 | |
37 | |
34 | #define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ |
38 | #define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ |
35 | (prop)->slant >= rxvt_fontprop::italic \ |
39 | (prop)->slant >= rxvt_fontprop::italic \ |
36 | ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
40 | ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
37 | : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
41 | : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
38 | )) |
42 | )) |
39 | |
43 | |
40 | const struct rxvt_fallback_font { |
44 | static const struct rxvt_fallback_font { |
41 | codeset cs; |
45 | codeset cs; |
42 | const char *name; |
46 | const char *name; |
43 | } fallback_fonts[] = { |
47 | } fallback_fonts[] = { |
44 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
48 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
45 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
49 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
… | |
… | |
155 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
159 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
156 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
160 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
157 | 0x304c, 0x672c, // が本 |
161 | 0x304c, 0x672c, // が本 |
158 | }; |
162 | }; |
159 | |
163 | |
160 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
|
|
161 | |
|
|
162 | #define dTermDisplay Display *disp = term->dpy |
164 | #define dTermDisplay Display *disp = term->dpy |
163 | #define dTermGC GC gc = term->gc |
165 | #define dTermGC GC gc = term->gc |
164 | |
166 | |
165 | ///////////////////////////////////////////////////////////////////////////// |
167 | ///////////////////////////////////////////////////////////////////////////// |
166 | |
168 | |
… | |
… | |
448 | |
450 | |
449 | text_t chrs[2]; |
451 | text_t chrs[2]; |
450 | chrs [1] = NOCHAR; |
452 | chrs [1] = NOCHAR; |
451 | |
453 | |
452 | *chrs = cc->c1; |
454 | *chrs = cc->c1; |
453 | rxvt_font *f1 = fs->get (cc->c1); |
455 | rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; |
454 | f1->draw (d, x, y, chrs, width, fg, bg); |
456 | f1->draw (d, x, y, chrs, width, fg, bg); |
455 | |
457 | |
456 | if (cc->c2 != NOCHAR) |
458 | if (cc->c2 != NOCHAR) |
457 | { |
459 | { |
458 | bool careful; |
460 | bool careful; |
459 | |
461 | |
460 | // prefer font of first character, for no good reasons |
462 | // prefer font of first character, for no good reasons |
461 | *chrs = cc->c2; |
463 | *chrs = cc->c2; |
462 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
464 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
463 | ? f1 |
465 | ? f1 |
464 | : fs->get (cc->c2); |
466 | : (*fs)[fs->find_font_idx (cc->c2)]; |
465 | |
467 | |
466 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
468 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
467 | } |
469 | } |
468 | } |
470 | } |
469 | #endif |
471 | #endif |
… | |
… | |
482 | |
484 | |
483 | x += fwidth; |
485 | x += fwidth; |
484 | } |
486 | } |
485 | } |
487 | } |
486 | |
488 | |
|
|
489 | struct rxvt_font_overflow : rxvt_font { |
|
|
490 | struct rxvt_fontset *fs; |
|
|
491 | |
|
|
492 | rxvt_font_overflow (rxvt_fontset *fs) |
|
|
493 | : rxvt_font () |
|
|
494 | { |
|
|
495 | this->fs = fs; |
|
|
496 | } |
|
|
497 | |
|
|
498 | rxvt_fontprop properties () |
|
|
499 | { |
|
|
500 | rxvt_fontprop p; |
|
|
501 | |
|
|
502 | p.width = p.height = 1; |
|
|
503 | p.ascent = rxvt_fontprop::unset; |
|
|
504 | p.weight = rxvt_fontprop::medium; |
|
|
505 | p.slant = rxvt_fontprop::roman; |
|
|
506 | |
|
|
507 | return p; |
|
|
508 | } |
|
|
509 | |
|
|
510 | bool load (const rxvt_fontprop &prop, bool force_prop) |
|
|
511 | { |
|
|
512 | width = 1; height = 1; |
|
|
513 | ascent = 1; descent = 0; |
|
|
514 | |
|
|
515 | set_name (strdup ("built-in rendition overflow font")); |
|
|
516 | |
|
|
517 | return true; |
|
|
518 | } |
|
|
519 | |
|
|
520 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
|
|
521 | { |
|
|
522 | return false; |
|
|
523 | } |
|
|
524 | |
|
|
525 | void draw (rxvt_drawable &d, int x, int y, |
|
|
526 | const text_t *text, int len, |
|
|
527 | int fg, int bg) |
|
|
528 | { |
|
|
529 | while (len--) |
|
|
530 | { |
|
|
531 | int fid = fs->find_font_idx (*text); |
|
|
532 | (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); |
|
|
533 | ++text; |
|
|
534 | x += term->fwidth; |
|
|
535 | } |
|
|
536 | } |
|
|
537 | }; |
|
|
538 | |
487 | ///////////////////////////////////////////////////////////////////////////// |
539 | ///////////////////////////////////////////////////////////////////////////// |
488 | |
540 | |
489 | struct rxvt_font_x11 : rxvt_font { |
541 | struct rxvt_font_x11 : rxvt_font { |
490 | rxvt_font_x11 () { f = 0; } |
542 | rxvt_font_x11 () { f = 0; } |
491 | |
543 | |
… | |
… | |
499 | |
551 | |
500 | void draw (rxvt_drawable &d, int x, int y, |
552 | void draw (rxvt_drawable &d, int x, int y, |
501 | const text_t *text, int len, |
553 | const text_t *text, int len, |
502 | int fg, int bg); |
554 | int fg, int bg); |
503 | |
555 | |
504 | bool slow; // wether this is a proportional font or has other funny characteristics |
556 | bool slow; // whether this is a proportional font or has other funny characteristics |
505 | XFontStruct *f; |
557 | XFontStruct *f; |
506 | bool enc2b, encm; |
558 | bool enc2b, encm; |
507 | |
559 | |
508 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
560 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
509 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
561 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
… | |
… | |
738 | free (fname); |
790 | free (fname); |
739 | if (replace_field (&fname, list[i], 11, '0', "0")) |
791 | if (replace_field (&fname, list[i], 11, '0', "0")) |
740 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
792 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
741 | } |
793 | } |
742 | |
794 | |
743 | if (!set_properties (p, fname)) |
795 | if (!set_properties (p, fname) |
|
|
796 | // also weed out too large fonts |
|
|
797 | || (prop.height != rxvt_fontprop::unset |
|
|
798 | && p.height > prop.height)) |
|
|
799 | { |
|
|
800 | free (fname); |
744 | continue; |
801 | continue; |
745 | |
802 | } |
746 | if (prop.height != rxvt_fontprop::unset |
|
|
747 | && p.height > prop.height) // weed out too large fonts |
|
|
748 | continue; |
|
|
749 | |
803 | |
750 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
804 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
751 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
805 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
752 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
806 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
753 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
807 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
… | |
… | |
810 | free (registry); |
864 | free (registry); |
811 | free (encoding); |
865 | free (encoding); |
812 | |
866 | |
813 | if (cs == CS_UNKNOWN) |
867 | if (cs == CS_UNKNOWN) |
814 | { |
868 | { |
815 | const char *charset = get_property (f, XA_FONT, 0); |
869 | char *value = get_property (f, XA_FONT, 0); |
|
|
870 | const char *charset = value; |
816 | |
871 | |
817 | if (!charset) |
872 | if (!charset) |
818 | charset = name; |
873 | charset = name; |
819 | |
874 | |
820 | int count = 13; |
875 | int count = 13; |
… | |
… | |
823 | break; |
878 | break; |
824 | |
879 | |
825 | cs = codeset_from_name (charset); |
880 | cs = codeset_from_name (charset); |
826 | if (cs == CS_UNKNOWN) |
881 | if (cs == CS_UNKNOWN) |
827 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
882 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
|
|
883 | |
|
|
884 | free (value); |
828 | } |
885 | } |
829 | |
886 | |
830 | if (cs == CS_UNKNOWN) |
887 | if (cs == CS_UNKNOWN) |
831 | { |
888 | { |
832 | clear (); |
889 | clear (); |
… | |
… | |
864 | } |
921 | } |
865 | #endif |
922 | #endif |
866 | |
923 | |
867 | width = 1; |
924 | width = 1; |
868 | |
925 | |
869 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
926 | for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) |
870 | { |
927 | { |
871 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
928 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
872 | continue; |
929 | continue; |
873 | |
930 | |
874 | // ignore characters we wouldn't use anyways |
931 | // ignore characters we wouldn't use anyways |
… | |
… | |
915 | uint32_t ch = FROM_UNICODE (cs, unicode); |
972 | uint32_t ch = FROM_UNICODE (cs, unicode); |
916 | |
973 | |
917 | if (ch == NOCHAR) |
974 | if (ch == NOCHAR) |
918 | return false; |
975 | return false; |
919 | |
976 | |
920 | /* check wether the character exists in _this_ font. horrible. */ |
977 | /* check whether the character exists in _this_ font. horrible. */ |
921 | XCharStruct *xcs; |
978 | XCharStruct *xcs; |
922 | |
979 | |
923 | if (encm) |
980 | if (encm) |
924 | { |
981 | { |
925 | unsigned char byte1 = ch >> 8; |
982 | unsigned char byte1 = ch >> 8; |
… | |
… | |
955 | return false; |
1012 | return false; |
956 | |
1013 | |
957 | if (!prop || prop->width == rxvt_fontprop::unset) |
1014 | if (!prop || prop->width == rxvt_fontprop::unset) |
958 | return true; |
1015 | return true; |
959 | |
1016 | |
960 | // check wether character overlaps previous/next character |
1017 | // check whether character overlaps previous/next character |
961 | int w = xcs->rbearing - xcs->lbearing; |
1018 | int w = xcs->rbearing - xcs->lbearing; |
962 | int wcw = max (WCWIDTH (unicode), 1); |
1019 | int wcw = max (WCWIDTH (unicode), 1); |
963 | |
1020 | |
964 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
1021 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
965 | |
1022 | |
… | |
… | |
1182 | |
1239 | |
1183 | XftUnlockFace (f); |
1240 | XftUnlockFace (f); |
1184 | |
1241 | |
1185 | int glheight = height; |
1242 | int glheight = height; |
1186 | |
1243 | |
1187 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1244 | for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) |
1188 | { |
1245 | { |
1189 | FcChar16 ch = *t; |
1246 | FcChar16 ch = *t; |
1190 | |
1247 | |
1191 | if (cs != CS_UNICODE |
1248 | if (cs != CS_UNICODE |
1192 | && ch > 0x100 |
1249 | && ch > 0x100 |
… | |
… | |
1353 | && (bg == Color_transparent || bg == Color_bg |
1410 | && (bg == Color_transparent || bg == Color_bg |
1354 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1411 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1355 | { |
1412 | { |
1356 | int src_x = x, src_y = y; |
1413 | int src_x = x, src_y = y; |
1357 | |
1414 | |
1358 | if (term->bgPixmap.is_parentOrigin ()) |
1415 | if (term->bgPixmap.flags & bgPixmap_t::isTransparent) |
1359 | { |
1416 | { |
1360 | src_x += term->window_vt_x; |
1417 | src_x += term->window_vt_x; |
1361 | src_y += term->window_vt_y; |
1418 | src_y += term->window_vt_y; |
1362 | } |
1419 | } |
1363 | |
1420 | |
… | |
… | |
1432 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1489 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1433 | = rxvt_fontprop::unset; |
1490 | = rxvt_fontprop::unset; |
1434 | force_prop = false; |
1491 | force_prop = false; |
1435 | |
1492 | |
1436 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1493 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1437 | FONT_UNREF (*i); |
1494 | (*i)->unref (); |
1438 | |
1495 | |
1439 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1496 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1440 | delete *p; |
1497 | delete *p; |
1441 | |
1498 | |
1442 | free (fontdesc); fontdesc = 0; |
1499 | free (fontdesc); fontdesc = 0; |
… | |
… | |
1444 | fonts.clear (); |
1501 | fonts.clear (); |
1445 | |
1502 | |
1446 | fallback = fallback_fonts; |
1503 | fallback = fallback_fonts; |
1447 | } |
1504 | } |
1448 | |
1505 | |
|
|
1506 | void |
|
|
1507 | rxvt_fontset::prepare_font (rxvt_font *font, codeset cs) |
|
|
1508 | { |
|
|
1509 | font->set_term (term); |
|
|
1510 | |
|
|
1511 | font->cs = cs; |
|
|
1512 | font->loaded = false; |
|
|
1513 | } |
|
|
1514 | |
1449 | rxvt_font * |
1515 | rxvt_font * |
1450 | rxvt_fontset::new_font (const char *name, codeset cs) |
1516 | rxvt_fontset::new_font (const char *name, codeset cs) |
1451 | { |
1517 | { |
1452 | rxvt_font *f; |
1518 | rxvt_font *f; |
1453 | |
1519 | |
… | |
… | |
1469 | f = new rxvt_font_x11; |
1535 | f = new rxvt_font_x11; |
1470 | } |
1536 | } |
1471 | else |
1537 | else |
1472 | f = new rxvt_font_x11; |
1538 | f = new rxvt_font_x11; |
1473 | |
1539 | |
1474 | f->set_term (term); |
|
|
1475 | f->set_name (strdup (name)); |
1540 | f->set_name (strdup (name)); |
1476 | |
1541 | prepare_font (f, cs); |
1477 | f->cs = cs; |
|
|
1478 | f->loaded = false; |
|
|
1479 | |
1542 | |
1480 | return f; |
1543 | return f; |
1481 | } |
1544 | } |
1482 | |
1545 | |
1483 | ///////////////////////////////////////////////////////////////////////////// |
1546 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1547 | |
|
|
1548 | void |
|
|
1549 | rxvt_fontset::push_font (rxvt_font *font) |
|
|
1550 | { |
|
|
1551 | // the fontCount index is reserved for the overflow font, it is only |
|
|
1552 | // necessary when we get fontCount or more fonts, as they cannot be |
|
|
1553 | // represented in the rendition. |
|
|
1554 | if (fonts.size () == fontCount) |
|
|
1555 | { |
|
|
1556 | rxvt_font *f = new rxvt_font_overflow (this); |
|
|
1557 | |
|
|
1558 | prepare_font (f, CS_UNICODE); |
|
|
1559 | fonts.push_back (f); |
|
|
1560 | } |
|
|
1561 | |
|
|
1562 | fonts.push_back (font); |
|
|
1563 | } |
1484 | |
1564 | |
1485 | void |
1565 | void |
1486 | rxvt_fontset::add_fonts (const char *desc) |
1566 | rxvt_fontset::add_fonts (const char *desc) |
1487 | { |
1567 | { |
1488 | if (desc) |
1568 | if (desc) |
… | |
… | |
1529 | if (end - desc < 511) |
1609 | if (end - desc < 511) |
1530 | { |
1610 | { |
1531 | memcpy (buf, desc, end - desc); |
1611 | memcpy (buf, desc, end - desc); |
1532 | buf[end - desc] = 0; |
1612 | buf[end - desc] = 0; |
1533 | |
1613 | |
1534 | fonts.push_back (new_font (buf, cs)); |
1614 | push_font (new_font (buf, cs)); |
1535 | } |
1615 | } |
1536 | else |
1616 | else |
1537 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1617 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1538 | |
1618 | |
1539 | desc = end + 1; |
1619 | desc = end + 1; |
… | |
… | |
1567 | { |
1647 | { |
1568 | clear (); |
1648 | clear (); |
1569 | |
1649 | |
1570 | fontdesc = strdup (desc); |
1650 | fontdesc = strdup (desc); |
1571 | |
1651 | |
1572 | fonts.push_back (new_font (0, CS_UNICODE)); |
1652 | push_font (new_font (0, CS_UNICODE)); |
1573 | realize_font (0); |
1653 | realize_font (0); |
1574 | |
1654 | |
1575 | add_fonts (desc); |
1655 | add_fonts (desc); |
1576 | |
1656 | |
1577 | return true; |
1657 | return true; |
… | |
… | |
1586 | |
1666 | |
1587 | return -1; |
1667 | return -1; |
1588 | } |
1668 | } |
1589 | |
1669 | |
1590 | int |
1670 | int |
1591 | rxvt_fontset::find_font_idx (unicode_t unicode, bool &careful) |
1671 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1592 | { |
1672 | { |
1593 | if (unicode >= 1<<20) |
1673 | if (unicode >= 1<<20) |
1594 | return 0; |
1674 | return 0; |
1595 | |
1675 | |
1596 | unicode_t hi = unicode >> 8; |
1676 | unicode_t hi = unicode >> 8; |
1597 | |
1677 | |
1598 | if (hi < fmap.size () && fmap[hi]) |
1678 | if (hi < fmap.size () |
1599 | { |
1679 | && fmap[hi] |
|
|
1680 | && (*fmap[hi])[unicode & 0xff] != 0xff) |
1600 | unsigned char m = (*fmap[hi])[unicode & 0xff]; |
1681 | return (*fmap[hi])[unicode & 0xff]; |
1601 | |
|
|
1602 | if (m != 0xff) |
|
|
1603 | { |
|
|
1604 | careful = m & 128; |
|
|
1605 | return m & 127; |
|
|
1606 | } |
|
|
1607 | } |
|
|
1608 | |
1682 | |
1609 | unsigned int i; |
1683 | unsigned int i; |
1610 | |
1684 | |
1611 | for (i = 0; i < fonts.size (); i++) |
1685 | for (i = 0; i < fonts.size (); i++) |
1612 | { |
1686 | { |
… | |
… | |
1625 | } |
1699 | } |
1626 | |
1700 | |
1627 | if (f->cs == CS_UNKNOWN) |
1701 | if (f->cs == CS_UNKNOWN) |
1628 | goto next_font; |
1702 | goto next_font; |
1629 | |
1703 | |
|
|
1704 | bool careful; |
1630 | if (f->has_char (unicode, &prop, careful)) |
1705 | if (f->has_char (unicode, &prop, careful)) |
|
|
1706 | { |
|
|
1707 | i = (i << 1) | careful; |
|
|
1708 | |
1631 | goto found; |
1709 | goto found; |
|
|
1710 | } |
1632 | |
1711 | |
1633 | next_font: |
1712 | next_font: |
1634 | if (i == fonts.size () - 1) |
1713 | if (i == fonts.size () - 1) |
1635 | { |
1714 | { |
1636 | if (fallback->name) |
1715 | if (fallback->name) |
1637 | { |
1716 | { |
1638 | // search through the fallback list |
1717 | // search through the fallback list |
1639 | fonts.push_back (new_font (fallback->name, fallback->cs)); |
1718 | push_font (new_font (fallback->name, fallback->cs)); |
1640 | fallback++; |
1719 | fallback++; |
1641 | } |
1720 | } |
1642 | else |
1721 | else |
1643 | { |
1722 | { |
1644 | // try to find a new font. |
1723 | // try to find a new font. |
… | |
… | |
1677 | if (find_font (font) < 0) |
1756 | if (find_font (font) < 0) |
1678 | { |
1757 | { |
1679 | char fontname[4096]; |
1758 | char fontname[4096]; |
1680 | snprintf (fontname, sizeof (fontname), "xft:%s", font); |
1759 | snprintf (fontname, sizeof (fontname), "xft:%s", font); |
1681 | |
1760 | |
1682 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1761 | push_font (new_font (fontname, CS_UNICODE)); |
1683 | } |
1762 | } |
1684 | |
1763 | |
1685 | free (font); |
1764 | free (font); |
1686 | } |
1765 | } |
1687 | #endif |
1766 | #endif |
… | |
… | |
1689 | } |
1768 | } |
1690 | } |
1769 | } |
1691 | |
1770 | |
1692 | /* we must return SOME font */ |
1771 | /* we must return SOME font */ |
1693 | i = 0; |
1772 | i = 0; |
1694 | careful = false; |
|
|
1695 | |
1773 | |
1696 | found: |
1774 | found: |
1697 | // found a font, cache it |
1775 | // found a font, cache it |
1698 | if (i < 127) |
1776 | if (i < 255) |
1699 | { |
1777 | { |
1700 | while (hi >= fmap.size ()) |
1778 | while (hi >= fmap.size ()) |
1701 | fmap.push_back (0); |
1779 | fmap.push_back (0); |
1702 | |
1780 | |
1703 | if (!fmap[hi]) |
1781 | if (!fmap[hi]) |
1704 | { |
1782 | { |
1705 | fmap[hi] = (pagemap *)new pagemap; |
1783 | fmap[hi] = (pagemap *)new pagemap; |
1706 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1784 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1707 | } |
1785 | } |
1708 | |
1786 | |
1709 | (*fmap[hi])[unicode & 0xff] = i | (careful ? 128 : 0); |
1787 | (*fmap[hi])[unicode & 0xff] = i; |
1710 | } |
1788 | } |
1711 | |
1789 | |
1712 | return i; |
1790 | return i; |
1713 | } |
1791 | } |
1714 | |
1792 | |
1715 | int |
|
|
1716 | rxvt_fontset::find_font (unicode_t unicode) |
|
|
1717 | { |
|
|
1718 | bool careful; |
|
|
1719 | int id = find_font_idx (unicode, careful); |
|
|
1720 | |
|
|
1721 | return min<int> (fontCount, id) | (careful ? Careful : 0); |
|
|
1722 | } |
|
|
1723 | |
|
|