1 | /*----------------------------------------------------------------------* |
1 | /*----------------------------------------------------------------------* |
2 | * File: rxvtfont.C |
2 | * File: rxvtfont.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> |
4 | * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> |
5 | * - original version. |
5 | * - original version. |
6 | * |
6 | * |
7 | * This program is free software; you can redistribute it and/or modify |
7 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by |
8 | * it under the terms of the GNU General Public License as published by |
9 | * the Free Software Foundation; either version 2 of the License, or |
9 | * the Free Software Foundation; either version 2 of the License, or |
… | |
… | |
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 | |
… | |
… | |
239 | { |
241 | { |
240 | #if XFT |
242 | #if XFT |
241 | Picture dst; |
243 | Picture dst; |
242 | |
244 | |
243 | # ifdef HAVE_BG_PIXMAP |
245 | # ifdef HAVE_BG_PIXMAP |
244 | if (term->bgPixmap.pixmap |
246 | if (term->bg_pixmap |
245 | && !term->pix_colors[color].is_opaque () |
247 | && !term->pix_colors[color].is_opaque () |
246 | && ((dst = XftDrawPicture (d)))) |
248 | && ((dst = XftDrawPicture (d)))) |
247 | { |
249 | { |
248 | XClearArea (disp, d, x, y, w, h, false); |
250 | XClearArea (disp, d, x, y, w, h, false); |
249 | |
251 | |
… | |
… | |
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)[fs->find_font (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)[fs->find_font (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 | int w = 1; |
|
|
533 | while (w < len && text[w] == NOCHAR) |
|
|
534 | w++; |
|
|
535 | (*fs)[fid]->draw (d, x, y, text, w, fg, bg); |
|
|
536 | text += w; |
|
|
537 | len -= w; |
|
|
538 | x += term->fwidth * w; |
|
|
539 | } |
|
|
540 | } |
|
|
541 | }; |
|
|
542 | |
487 | ///////////////////////////////////////////////////////////////////////////// |
543 | ///////////////////////////////////////////////////////////////////////////// |
488 | |
544 | |
489 | struct rxvt_font_x11 : rxvt_font { |
545 | struct rxvt_font_x11 : rxvt_font { |
490 | rxvt_font_x11 () { f = 0; } |
546 | rxvt_font_x11 () { f = 0; } |
491 | |
547 | |
… | |
… | |
666 | f = XLoadQueryFont (disp, name); |
722 | f = XLoadQueryFont (disp, name); |
667 | |
723 | |
668 | if (!f) |
724 | if (!f) |
669 | return false; |
725 | return false; |
670 | |
726 | |
671 | char *new_name = get_property (f, XA_FONT, name); |
727 | char *new_name = get_property (f, XA_FONT, 0); |
672 | |
728 | |
673 | if (new_name) |
729 | if (new_name) |
674 | set_name (new_name); |
730 | set_name (new_name); |
675 | else |
731 | else |
676 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
732 | rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name); |
677 | |
733 | |
678 | XFreeFont (disp, f); |
734 | XFreeFont (disp, f); |
679 | f = 0; |
735 | f = 0; |
680 | } |
736 | } |
681 | |
737 | |
… | |
… | |
738 | free (fname); |
794 | free (fname); |
739 | if (replace_field (&fname, list[i], 11, '0', "0")) |
795 | if (replace_field (&fname, list[i], 11, '0', "0")) |
740 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
796 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
741 | } |
797 | } |
742 | |
798 | |
743 | if (!set_properties (p, fname)) |
799 | if (!set_properties (p, fname) |
|
|
800 | // also weed out too large fonts |
|
|
801 | || (prop.height != rxvt_fontprop::unset |
|
|
802 | && p.height > prop.height)) |
|
|
803 | { |
|
|
804 | free (fname); |
744 | continue; |
805 | continue; |
745 | |
806 | } |
746 | if (prop.height != rxvt_fontprop::unset |
|
|
747 | && p.height > prop.height) // weed out too large fonts |
|
|
748 | continue; |
|
|
749 | |
807 | |
750 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
808 | 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); |
809 | 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); |
810 | 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); |
811 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
… | |
… | |
810 | free (registry); |
868 | free (registry); |
811 | free (encoding); |
869 | free (encoding); |
812 | |
870 | |
813 | if (cs == CS_UNKNOWN) |
871 | if (cs == CS_UNKNOWN) |
814 | { |
872 | { |
815 | const char *charset = get_property (f, XA_FONT, 0); |
873 | char *value = get_property (f, XA_FONT, 0); |
|
|
874 | const char *charset = value; |
816 | |
875 | |
817 | if (!charset) |
876 | if (!charset) |
818 | charset = name; |
877 | charset = name; |
819 | |
878 | |
820 | int count = 13; |
879 | int count = 13; |
… | |
… | |
823 | break; |
882 | break; |
824 | |
883 | |
825 | cs = codeset_from_name (charset); |
884 | cs = codeset_from_name (charset); |
826 | if (cs == CS_UNKNOWN) |
885 | if (cs == CS_UNKNOWN) |
827 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
886 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
|
|
887 | |
|
|
888 | free (value); |
828 | } |
889 | } |
829 | |
890 | |
830 | if (cs == CS_UNKNOWN) |
891 | if (cs == CS_UNKNOWN) |
831 | { |
892 | { |
832 | clear (); |
893 | clear (); |
… | |
… | |
864 | } |
925 | } |
865 | #endif |
926 | #endif |
866 | |
927 | |
867 | width = 1; |
928 | width = 1; |
868 | |
929 | |
869 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
930 | for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; ) |
870 | { |
931 | { |
871 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
932 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
872 | continue; |
933 | continue; |
873 | |
934 | |
874 | // ignore characters we wouldn't use anyways |
935 | // ignore characters we wouldn't use anyways |
… | |
… | |
910 | } |
971 | } |
911 | |
972 | |
912 | bool |
973 | bool |
913 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
974 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
914 | { |
975 | { |
|
|
976 | careful = false; |
|
|
977 | |
915 | uint32_t ch = FROM_UNICODE (cs, unicode); |
978 | uint32_t ch = FROM_UNICODE (cs, unicode); |
916 | |
979 | |
917 | if (ch == NOCHAR) |
980 | if (ch == NOCHAR) |
918 | return false; |
981 | return false; |
919 | |
982 | |
… | |
… | |
1161 | int ftheight = 0; |
1224 | int ftheight = 0; |
1162 | bool success = true; |
1225 | bool success = true; |
1163 | |
1226 | |
1164 | for (;;) |
1227 | for (;;) |
1165 | { |
1228 | { |
|
|
1229 | p = FcPatternDuplicate (match); |
1166 | f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); |
1230 | f = XftFontOpenPattern (disp, p); |
1167 | |
1231 | |
1168 | if (!f) |
1232 | if (!f) |
1169 | { |
1233 | { |
|
|
1234 | FcPatternDestroy (p); |
1170 | success = false; |
1235 | success = false; |
1171 | break; |
1236 | break; |
1172 | } |
1237 | } |
1173 | |
1238 | |
1174 | FT_Face face = XftLockFace (f); |
1239 | FT_Face face = XftLockFace (f); |
… | |
… | |
1182 | |
1247 | |
1183 | XftUnlockFace (f); |
1248 | XftUnlockFace (f); |
1184 | |
1249 | |
1185 | int glheight = height; |
1250 | int glheight = height; |
1186 | |
1251 | |
1187 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1252 | for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; ) |
1188 | { |
1253 | { |
1189 | FcChar16 ch = *t; |
1254 | FcChar16 ch = *t; |
1190 | |
1255 | |
1191 | if (cs != CS_UNICODE |
1256 | if (cs != CS_UNICODE |
1192 | && ch > 0x100 |
1257 | && ch > 0x100 |
… | |
… | |
1347 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1412 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1348 | |
1413 | |
1349 | #ifdef HAVE_BG_PIXMAP |
1414 | #ifdef HAVE_BG_PIXMAP |
1350 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
1415 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
1351 | |
1416 | |
1352 | if (term->bgPixmap.pixmap |
1417 | if (term->bg_pixmap |
1353 | && (bg == Color_transparent || bg == Color_bg |
1418 | && (bg == Color_transparent || bg == Color_bg |
1354 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1419 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1355 | { |
1420 | { |
1356 | int src_x = x, src_y = y; |
1421 | int src_x = x, src_y = y; |
1357 | |
1422 | |
1358 | if (term->bgPixmap.is_parentOrigin ()) |
1423 | if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT) |
1359 | { |
1424 | { |
1360 | src_x += term->window_vt_x; |
1425 | src_x += term->window_vt_x; |
1361 | src_y += term->window_vt_y; |
1426 | src_y += term->window_vt_y; |
1362 | } |
1427 | } |
1363 | |
1428 | |
1364 | if (term->bgPixmap.pmap_width >= src_x + w |
1429 | if (term->bg_pmap_width >= src_x + w |
1365 | && term->bgPixmap.pmap_height >= src_y + h) |
1430 | && term->bg_pmap_height >= src_y + h) |
1366 | { |
1431 | { |
1367 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1432 | XCopyArea (disp, term->bg_pixmap, d2, gc, |
1368 | src_x, src_y, w, h, 0, 0); |
1433 | src_x, src_y, w, h, 0, 0); |
1369 | } |
1434 | } |
1370 | else |
1435 | else |
1371 | { |
1436 | { |
1372 | XGCValues gcv; |
1437 | XGCValues gcv; |
1373 | |
1438 | |
1374 | gcv.fill_style = FillTiled; |
1439 | gcv.fill_style = FillTiled; |
1375 | gcv.tile = term->bgPixmap.pixmap; |
1440 | gcv.tile = term->bg_pixmap; |
1376 | gcv.ts_x_origin = -src_x; |
1441 | gcv.ts_x_origin = -src_x; |
1377 | gcv.ts_y_origin = -src_y; |
1442 | gcv.ts_y_origin = -src_y; |
1378 | |
1443 | |
1379 | XChangeGC (disp, gc, |
1444 | XChangeGC (disp, gc, |
1380 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1445 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
… | |
… | |
1432 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1497 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1433 | = rxvt_fontprop::unset; |
1498 | = rxvt_fontprop::unset; |
1434 | force_prop = false; |
1499 | force_prop = false; |
1435 | |
1500 | |
1436 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1501 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1437 | FONT_UNREF (*i); |
1502 | (*i)->unref (); |
1438 | |
1503 | |
1439 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1504 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1440 | delete *p; |
1505 | delete *p; |
1441 | |
1506 | |
1442 | free (fontdesc); fontdesc = 0; |
1507 | free (fontdesc); fontdesc = 0; |
… | |
… | |
1444 | fonts.clear (); |
1509 | fonts.clear (); |
1445 | |
1510 | |
1446 | fallback = fallback_fonts; |
1511 | fallback = fallback_fonts; |
1447 | } |
1512 | } |
1448 | |
1513 | |
|
|
1514 | void |
|
|
1515 | rxvt_fontset::prepare_font (rxvt_font *font, codeset cs) |
|
|
1516 | { |
|
|
1517 | font->set_term (term); |
|
|
1518 | |
|
|
1519 | font->cs = cs; |
|
|
1520 | font->loaded = false; |
|
|
1521 | } |
|
|
1522 | |
1449 | rxvt_font * |
1523 | rxvt_font * |
1450 | rxvt_fontset::new_font (const char *name, codeset cs) |
1524 | rxvt_fontset::new_font (const char *name, codeset cs) |
1451 | { |
1525 | { |
1452 | rxvt_font *f; |
1526 | rxvt_font *f; |
1453 | |
1527 | |
… | |
… | |
1469 | f = new rxvt_font_x11; |
1543 | f = new rxvt_font_x11; |
1470 | } |
1544 | } |
1471 | else |
1545 | else |
1472 | f = new rxvt_font_x11; |
1546 | f = new rxvt_font_x11; |
1473 | |
1547 | |
1474 | f->set_term (term); |
|
|
1475 | f->set_name (strdup (name)); |
1548 | f->set_name (strdup (name)); |
1476 | |
1549 | prepare_font (f, cs); |
1477 | f->cs = cs; |
|
|
1478 | f->loaded = false; |
|
|
1479 | |
1550 | |
1480 | return f; |
1551 | return f; |
1481 | } |
1552 | } |
1482 | |
1553 | |
1483 | ///////////////////////////////////////////////////////////////////////////// |
1554 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1555 | |
|
|
1556 | void |
|
|
1557 | rxvt_fontset::push_font (rxvt_font *font) |
|
|
1558 | { |
|
|
1559 | // the fontCount index is reserved for the overflow font, it is only |
|
|
1560 | // necessary when we get fontCount or more fonts, as they cannot be |
|
|
1561 | // represented in the rendition. |
|
|
1562 | if (fonts.size () == fontCount) |
|
|
1563 | { |
|
|
1564 | rxvt_font *f = new rxvt_font_overflow (this); |
|
|
1565 | |
|
|
1566 | prepare_font (f, CS_UNICODE); |
|
|
1567 | fonts.push_back (f); |
|
|
1568 | } |
|
|
1569 | |
|
|
1570 | fonts.push_back (font); |
|
|
1571 | } |
1484 | |
1572 | |
1485 | void |
1573 | void |
1486 | rxvt_fontset::add_fonts (const char *desc) |
1574 | rxvt_fontset::add_fonts (const char *desc) |
1487 | { |
1575 | { |
1488 | if (desc) |
1576 | if (desc) |
… | |
… | |
1529 | if (end - desc < 511) |
1617 | if (end - desc < 511) |
1530 | { |
1618 | { |
1531 | memcpy (buf, desc, end - desc); |
1619 | memcpy (buf, desc, end - desc); |
1532 | buf[end - desc] = 0; |
1620 | buf[end - desc] = 0; |
1533 | |
1621 | |
1534 | fonts.push_back (new_font (buf, cs)); |
1622 | push_font (new_font (buf, cs)); |
1535 | } |
1623 | } |
1536 | else |
1624 | else |
1537 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1625 | rxvt_warn ("fontset element too long (>511 bytes), ignored.\n"); |
1538 | |
1626 | |
1539 | desc = end + 1; |
1627 | desc = end + 1; |
1540 | } |
1628 | } |
1541 | while (*end); |
1629 | while (*end); |
1542 | } |
1630 | } |
… | |
… | |
1567 | { |
1655 | { |
1568 | clear (); |
1656 | clear (); |
1569 | |
1657 | |
1570 | fontdesc = strdup (desc); |
1658 | fontdesc = strdup (desc); |
1571 | |
1659 | |
1572 | fonts.push_back (new_font (0, CS_UNICODE)); |
1660 | push_font (new_font (0, CS_UNICODE)); |
1573 | realize_font (0); |
1661 | realize_font (0); |
1574 | |
1662 | |
1575 | add_fonts (desc); |
1663 | add_fonts (desc); |
1576 | |
1664 | |
1577 | return true; |
1665 | return true; |
… | |
… | |
1586 | |
1674 | |
1587 | return -1; |
1675 | return -1; |
1588 | } |
1676 | } |
1589 | |
1677 | |
1590 | int |
1678 | int |
1591 | rxvt_fontset::find_font (unicode_t unicode) |
1679 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1592 | { |
1680 | { |
1593 | if (unicode >= 1<<20) |
1681 | if (unicode >= 1<<20) |
1594 | return 0; |
1682 | return 0; |
1595 | |
1683 | |
1596 | unicode_t hi = unicode >> 8; |
1684 | unicode_t hi = unicode >> 8; |
… | |
… | |
1622 | goto next_font; |
1710 | goto next_font; |
1623 | |
1711 | |
1624 | bool careful; |
1712 | bool careful; |
1625 | if (f->has_char (unicode, &prop, careful)) |
1713 | if (f->has_char (unicode, &prop, careful)) |
1626 | { |
1714 | { |
1627 | if (careful) |
1715 | i = (i << 1) | careful; |
1628 | i |= 128; |
|
|
1629 | |
1716 | |
1630 | goto found; |
1717 | goto found; |
1631 | } |
1718 | } |
1632 | |
1719 | |
1633 | next_font: |
1720 | next_font: |
1634 | if (i == fonts.size () - 1) |
1721 | if (i == fonts.size () - 1) |
1635 | { |
1722 | { |
1636 | if (fallback->name) |
1723 | if (fallback->name) |
1637 | { |
1724 | { |
1638 | // search through the fallback list |
1725 | // search through the fallback list |
1639 | fonts.push_back (new_font (fallback->name, fallback->cs)); |
1726 | push_font (new_font (fallback->name, fallback->cs)); |
1640 | fallback++; |
1727 | fallback++; |
1641 | } |
1728 | } |
1642 | else |
1729 | else |
1643 | { |
1730 | { |
1644 | // try to find a new font. |
1731 | // try to find a new font. |
… | |
… | |
1677 | if (find_font (font) < 0) |
1764 | if (find_font (font) < 0) |
1678 | { |
1765 | { |
1679 | char fontname[4096]; |
1766 | char fontname[4096]; |
1680 | snprintf (fontname, sizeof (fontname), "xft:%s", font); |
1767 | snprintf (fontname, sizeof (fontname), "xft:%s", font); |
1681 | |
1768 | |
1682 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1769 | push_font (new_font (fontname, CS_UNICODE)); |
1683 | } |
1770 | } |
1684 | |
1771 | |
1685 | free (font); |
1772 | free (font); |
1686 | } |
1773 | } |
1687 | #endif |
1774 | #endif |