… | |
… | |
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" }, |
… | |
… | |
79 | |
83 | |
80 | // japanese |
84 | // japanese |
81 | #if ENCODING_JP || ENCODING_JP_EXT |
85 | #if ENCODING_JP || ENCODING_JP_EXT |
82 | # if XFT |
86 | # if XFT |
83 | // prefer xft for complex scripts |
87 | // prefer xft for complex scripts |
|
|
88 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
84 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
89 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
85 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
|
|
86 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
90 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
87 | { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, |
91 | { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, |
88 | # endif |
92 | # endif |
89 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
93 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
90 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
94 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
… | |
… | |
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 | |
… | |
… | |
216 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
218 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
217 | { |
219 | { |
218 | } |
220 | } |
219 | |
221 | |
220 | void |
222 | void |
221 | rxvt_font::set_name (char *name) |
223 | rxvt_font::set_name (char *name_) |
222 | { |
224 | { |
223 | if (this->name == name) |
225 | if (name == name_) |
224 | return; |
226 | return; |
225 | |
227 | |
226 | if (this->name) free (this->name); // let the compiler optimize |
228 | if (name) free (name); // let the compiler optimize |
227 | this->name = name; |
229 | name = name_; |
228 | } |
230 | } |
229 | |
231 | |
230 | void |
232 | void |
231 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
233 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
232 | { |
234 | { |
… | |
… | |
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 | (*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); |
… | |
… | |
666 | f = XLoadQueryFont (disp, name); |
718 | f = XLoadQueryFont (disp, name); |
667 | |
719 | |
668 | if (!f) |
720 | if (!f) |
669 | return false; |
721 | return false; |
670 | |
722 | |
671 | char *new_name = get_property (f, XA_FONT, name); |
723 | char *new_name = get_property (f, XA_FONT, 0); |
672 | |
724 | |
673 | if (new_name) |
725 | if (new_name) |
674 | set_name (new_name); |
726 | set_name (new_name); |
675 | else |
727 | else |
676 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
728 | rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name); |
677 | |
729 | |
678 | XFreeFont (disp, f); |
730 | XFreeFont (disp, f); |
679 | f = 0; |
731 | f = 0; |
680 | } |
732 | } |
681 | |
733 | |
… | |
… | |
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); |
… | |
… | |
792 | return false; |
846 | return false; |
793 | |
847 | |
794 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
848 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
795 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
849 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
796 | |
850 | |
|
|
851 | cs = CS_UNKNOWN; |
|
|
852 | |
797 | if (registry && encoding) |
853 | if (registry && encoding) |
798 | { |
854 | { |
799 | char charset[64]; |
855 | char charset[64]; |
800 | snprintf (charset, 64, "%s-%s", registry, encoding); |
856 | snprintf (charset, 64, "%s-%s", registry, encoding); |
801 | |
857 | |
802 | cs = codeset_from_name (charset); |
858 | cs = codeset_from_name (charset); |
803 | } |
859 | |
804 | else |
860 | if (cs == CS_UNKNOWN) |
|
|
861 | rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset); |
805 | { |
862 | } |
|
|
863 | |
|
|
864 | free (registry); |
|
|
865 | free (encoding); |
|
|
866 | |
|
|
867 | if (cs == CS_UNKNOWN) |
|
|
868 | { |
806 | const char *charset = get_property (f, XA_FONT, 0); |
869 | char *value = get_property (f, XA_FONT, 0); |
|
|
870 | const char *charset = value; |
807 | |
871 | |
808 | if (!charset) |
872 | if (!charset) |
809 | charset = name; |
873 | charset = name; |
810 | |
874 | |
811 | int count = 13; |
875 | int count = 13; |
812 | while (*charset) |
876 | while (*charset) |
813 | if (*charset++ == '-' && !--count) |
877 | if (*charset++ == '-' && !--count) |
814 | break; |
878 | break; |
815 | |
879 | |
816 | cs = codeset_from_name (charset); |
880 | cs = codeset_from_name (charset); |
|
|
881 | if (cs == CS_UNKNOWN) |
|
|
882 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
|
|
883 | |
|
|
884 | free (value); |
|
|
885 | } |
|
|
886 | |
|
|
887 | if (cs == CS_UNKNOWN) |
817 | } |
888 | { |
818 | |
889 | clear (); |
819 | free (registry); |
890 | return false; |
820 | free (encoding); |
891 | } |
821 | |
892 | |
822 | if (cs == CS_UNICODE) |
893 | if (cs == CS_UNICODE) |
823 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
894 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
824 | |
895 | |
825 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
896 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
… | |
… | |
850 | } |
921 | } |
851 | #endif |
922 | #endif |
852 | |
923 | |
853 | width = 1; |
924 | width = 1; |
854 | |
925 | |
855 | 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; ) |
856 | { |
927 | { |
857 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
928 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
858 | continue; |
929 | continue; |
859 | |
930 | |
860 | // ignore characters we wouldn't use anyways |
931 | // ignore characters we wouldn't use anyways |
… | |
… | |
872 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
943 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
873 | |
944 | |
874 | if (width < g.width) width = g.width; |
945 | if (width < g.width) width = g.width; |
875 | } |
946 | } |
876 | |
947 | |
877 | if (cs == CS_UNKNOWN) |
948 | #if 0 // do it per-character |
|
|
949 | if (prop && width > prop->width) |
878 | { |
950 | { |
879 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
|
|
880 | |
|
|
881 | clear (); |
951 | clear (); |
882 | return false; |
952 | return false; |
883 | } |
953 | } |
884 | |
|
|
885 | #if 0 // do it per-character |
|
|
886 | if (prop && width > prop->width) |
|
|
887 | { |
|
|
888 | clear (); |
|
|
889 | return false; |
|
|
890 | } |
|
|
891 | #endif |
954 | #endif |
892 | |
955 | |
893 | return true; |
956 | return true; |
894 | } |
957 | } |
895 | |
958 | |
… | |
… | |
909 | uint32_t ch = FROM_UNICODE (cs, unicode); |
972 | uint32_t ch = FROM_UNICODE (cs, unicode); |
910 | |
973 | |
911 | if (ch == NOCHAR) |
974 | if (ch == NOCHAR) |
912 | return false; |
975 | return false; |
913 | |
976 | |
914 | /* check wether the character exists in _this_ font. horrible. */ |
977 | /* check whether the character exists in _this_ font. horrible. */ |
915 | XCharStruct *xcs; |
978 | XCharStruct *xcs; |
916 | |
979 | |
917 | if (encm) |
980 | if (encm) |
918 | { |
981 | { |
919 | unsigned char byte1 = ch >> 8; |
982 | unsigned char byte1 = ch >> 8; |
… | |
… | |
949 | return false; |
1012 | return false; |
950 | |
1013 | |
951 | if (!prop || prop->width == rxvt_fontprop::unset) |
1014 | if (!prop || prop->width == rxvt_fontprop::unset) |
952 | return true; |
1015 | return true; |
953 | |
1016 | |
954 | // check wether character overlaps previous/next character |
1017 | // check whether character overlaps previous/next character |
955 | int w = xcs->rbearing - xcs->lbearing; |
1018 | int w = xcs->rbearing - xcs->lbearing; |
956 | int wcw = max (WCWIDTH (unicode), 1); |
1019 | int wcw = max (WCWIDTH (unicode), 1); |
957 | |
1020 | |
958 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
1021 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
959 | |
1022 | |
… | |
… | |
1133 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1196 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1134 | |
1197 | |
1135 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1198 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1136 | // clip width, we can't do better, or can we? |
1199 | // clip width, we can't do better, or can we? |
1137 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1200 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1138 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); |
1201 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); |
1139 | #endif |
1202 | #endif |
1140 | |
1203 | |
1141 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1204 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1142 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1205 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1143 | |
1206 | |
… | |
… | |
1155 | int ftheight = 0; |
1218 | int ftheight = 0; |
1156 | bool success = true; |
1219 | bool success = true; |
1157 | |
1220 | |
1158 | for (;;) |
1221 | for (;;) |
1159 | { |
1222 | { |
|
|
1223 | p = FcPatternDuplicate (match); |
1160 | f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); |
1224 | f = XftFontOpenPattern (disp, p); |
1161 | |
1225 | |
1162 | if (!f) |
1226 | if (!f) |
1163 | { |
1227 | { |
|
|
1228 | FcPatternDestroy (p); |
1164 | success = false; |
1229 | success = false; |
1165 | break; |
1230 | break; |
1166 | } |
1231 | } |
1167 | |
1232 | |
1168 | FT_Face face = XftLockFace (f); |
1233 | FT_Face face = XftLockFace (f); |
… | |
… | |
1176 | |
1241 | |
1177 | XftUnlockFace (f); |
1242 | XftUnlockFace (f); |
1178 | |
1243 | |
1179 | int glheight = height; |
1244 | int glheight = height; |
1180 | |
1245 | |
1181 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1246 | for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) |
1182 | { |
1247 | { |
1183 | FcChar16 ch = *t; |
1248 | FcChar16 ch = *t; |
1184 | |
1249 | |
1185 | if (cs != CS_UNICODE |
1250 | if (cs != CS_UNICODE |
1186 | && ch > 0x100 |
1251 | && ch > 0x100 |
… | |
… | |
1287 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1352 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1288 | const text_t *text, int len, |
1353 | const text_t *text, int len, |
1289 | int fg, int bg) |
1354 | int fg, int bg) |
1290 | { |
1355 | { |
1291 | XGlyphInfo extents; |
1356 | XGlyphInfo extents; |
1292 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1357 | XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); |
1293 | XftGlyphSpec *ep = enc; |
1358 | XftGlyphSpec *ep = enc; |
1294 | |
1359 | |
1295 | dTermDisplay; |
1360 | dTermDisplay; |
1296 | dTermGC; |
1361 | dTermGC; |
1297 | |
1362 | |
1298 | int w = term->fwidth * len; |
1363 | int w = term->fwidth * len; |
1299 | int h = term->fheight; |
1364 | int h = term->fheight; |
1300 | |
1365 | |
1301 | bool buffered = bg >= Color_transparent |
1366 | bool buffered = bg >= Color_transparent |
1302 | && term->option (Opt_buffered); |
1367 | && term->option (Opt_buffered); |
1303 | |
1368 | |
1304 | // cut trailing spaces |
1369 | // cut trailing spaces |
1305 | while (len && text [len - 1] == ' ') |
1370 | while (len && text [len - 1] == ' ') |
1306 | len--; |
1371 | len--; |
1307 | |
1372 | |
… | |
… | |
1341 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1406 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1342 | |
1407 | |
1343 | #ifdef HAVE_BG_PIXMAP |
1408 | #ifdef HAVE_BG_PIXMAP |
1344 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
1409 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
1345 | |
1410 | |
1346 | if (term->bgPixmap.pixmap |
1411 | if (term->bg_pixmap |
1347 | && (bg == Color_transparent || bg == Color_bg |
1412 | && (bg == Color_transparent || bg == Color_bg |
1348 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1413 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1349 | { |
1414 | { |
1350 | int src_x = x, src_y = y; |
1415 | int src_x = x, src_y = y; |
1351 | |
1416 | |
1352 | if (term->bgPixmap.is_parentOrigin ()) |
1417 | if (term->bg_flags & rxvt_term::isTransparent) |
1353 | { |
1418 | { |
1354 | src_x += term->window_vt_x; |
1419 | src_x += term->window_vt_x; |
1355 | src_y += term->window_vt_y; |
1420 | src_y += term->window_vt_y; |
1356 | } |
1421 | } |
1357 | |
1422 | |
1358 | if (term->bgPixmap.pmap_width >= src_x + w |
1423 | if (term->bg_pmap_width >= src_x + w |
1359 | && term->bgPixmap.pmap_height >= src_y + h) |
1424 | && term->bg_pmap_height >= src_y + h) |
1360 | { |
1425 | { |
1361 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1426 | XCopyArea (disp, term->bg_pixmap, d2, gc, |
1362 | src_x, src_y, w, h, 0, 0); |
1427 | src_x, src_y, w, h, 0, 0); |
1363 | } |
1428 | } |
1364 | else |
1429 | else |
1365 | { |
1430 | { |
1366 | XGCValues gcv; |
1431 | XGCValues gcv; |
1367 | |
1432 | |
1368 | gcv.fill_style = FillTiled; |
1433 | gcv.fill_style = FillTiled; |
1369 | gcv.tile = term->bgPixmap.pixmap; |
1434 | gcv.tile = term->bg_pixmap; |
1370 | gcv.ts_x_origin = -src_x; |
1435 | gcv.ts_x_origin = -src_x; |
1371 | gcv.ts_y_origin = -src_y; |
1436 | gcv.ts_y_origin = -src_y; |
1372 | |
1437 | |
1373 | XChangeGC (disp, gc, |
1438 | XChangeGC (disp, gc, |
1374 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1439 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
… | |
… | |
1426 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1491 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1427 | = rxvt_fontprop::unset; |
1492 | = rxvt_fontprop::unset; |
1428 | force_prop = false; |
1493 | force_prop = false; |
1429 | |
1494 | |
1430 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1495 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1431 | FONT_UNREF (*i); |
1496 | (*i)->unref (); |
1432 | |
1497 | |
1433 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1498 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1434 | delete *p; |
1499 | delete *p; |
1435 | |
1500 | |
1436 | free (fontdesc); fontdesc = 0; |
1501 | free (fontdesc); fontdesc = 0; |
… | |
… | |
1438 | fonts.clear (); |
1503 | fonts.clear (); |
1439 | |
1504 | |
1440 | fallback = fallback_fonts; |
1505 | fallback = fallback_fonts; |
1441 | } |
1506 | } |
1442 | |
1507 | |
|
|
1508 | void |
|
|
1509 | rxvt_fontset::prepare_font (rxvt_font *font, codeset cs) |
|
|
1510 | { |
|
|
1511 | font->set_term (term); |
|
|
1512 | |
|
|
1513 | font->cs = cs; |
|
|
1514 | font->loaded = false; |
|
|
1515 | } |
|
|
1516 | |
1443 | rxvt_font * |
1517 | rxvt_font * |
1444 | rxvt_fontset::new_font (const char *name, codeset cs) |
1518 | rxvt_fontset::new_font (const char *name, codeset cs) |
1445 | { |
1519 | { |
1446 | rxvt_font *f; |
1520 | rxvt_font *f; |
1447 | |
1521 | |
… | |
… | |
1463 | f = new rxvt_font_x11; |
1537 | f = new rxvt_font_x11; |
1464 | } |
1538 | } |
1465 | else |
1539 | else |
1466 | f = new rxvt_font_x11; |
1540 | f = new rxvt_font_x11; |
1467 | |
1541 | |
1468 | f->set_term (term); |
|
|
1469 | f->set_name (strdup (name)); |
1542 | f->set_name (strdup (name)); |
1470 | |
1543 | prepare_font (f, cs); |
1471 | f->cs = cs; |
|
|
1472 | f->loaded = false; |
|
|
1473 | |
1544 | |
1474 | return f; |
1545 | return f; |
1475 | } |
1546 | } |
1476 | |
1547 | |
1477 | ///////////////////////////////////////////////////////////////////////////// |
1548 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1549 | |
|
|
1550 | void |
|
|
1551 | rxvt_fontset::push_font (rxvt_font *font) |
|
|
1552 | { |
|
|
1553 | // the fontCount index is reserved for the overflow font, it is only |
|
|
1554 | // necessary when we get fontCount or more fonts, as they cannot be |
|
|
1555 | // represented in the rendition. |
|
|
1556 | if (fonts.size () == fontCount) |
|
|
1557 | { |
|
|
1558 | rxvt_font *f = new rxvt_font_overflow (this); |
|
|
1559 | |
|
|
1560 | prepare_font (f, CS_UNICODE); |
|
|
1561 | fonts.push_back (f); |
|
|
1562 | } |
|
|
1563 | |
|
|
1564 | fonts.push_back (font); |
|
|
1565 | } |
1478 | |
1566 | |
1479 | void |
1567 | void |
1480 | rxvt_fontset::add_fonts (const char *desc) |
1568 | rxvt_fontset::add_fonts (const char *desc) |
1481 | { |
1569 | { |
1482 | if (desc) |
1570 | if (desc) |
… | |
… | |
1523 | if (end - desc < 511) |
1611 | if (end - desc < 511) |
1524 | { |
1612 | { |
1525 | memcpy (buf, desc, end - desc); |
1613 | memcpy (buf, desc, end - desc); |
1526 | buf[end - desc] = 0; |
1614 | buf[end - desc] = 0; |
1527 | |
1615 | |
1528 | fonts.push_back (new_font (buf, cs)); |
1616 | push_font (new_font (buf, cs)); |
1529 | } |
1617 | } |
1530 | else |
1618 | else |
1531 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1619 | rxvt_warn ("fontset element too long (>511 bytes), ignored.\n"); |
1532 | |
1620 | |
1533 | desc = end + 1; |
1621 | desc = end + 1; |
1534 | } |
1622 | } |
1535 | while (*end); |
1623 | while (*end); |
1536 | } |
1624 | } |
… | |
… | |
1561 | { |
1649 | { |
1562 | clear (); |
1650 | clear (); |
1563 | |
1651 | |
1564 | fontdesc = strdup (desc); |
1652 | fontdesc = strdup (desc); |
1565 | |
1653 | |
1566 | fonts.push_back (new_font (0, CS_UNICODE)); |
1654 | push_font (new_font (0, CS_UNICODE)); |
1567 | realize_font (0); |
1655 | realize_font (0); |
1568 | |
1656 | |
1569 | add_fonts (desc); |
1657 | add_fonts (desc); |
1570 | |
1658 | |
1571 | return true; |
1659 | return true; |
… | |
… | |
1580 | |
1668 | |
1581 | return -1; |
1669 | return -1; |
1582 | } |
1670 | } |
1583 | |
1671 | |
1584 | int |
1672 | int |
1585 | rxvt_fontset::find_font (unicode_t unicode) |
1673 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1586 | { |
1674 | { |
1587 | if (unicode >= 1<<20) |
1675 | if (unicode >= 1<<20) |
1588 | return 0; |
1676 | return 0; |
1589 | |
1677 | |
1590 | unicode_t hi = unicode >> 8; |
1678 | unicode_t hi = unicode >> 8; |
… | |
… | |
1616 | goto next_font; |
1704 | goto next_font; |
1617 | |
1705 | |
1618 | bool careful; |
1706 | bool careful; |
1619 | if (f->has_char (unicode, &prop, careful)) |
1707 | if (f->has_char (unicode, &prop, careful)) |
1620 | { |
1708 | { |
1621 | if (careful) |
1709 | i = (i << 1) | careful; |
1622 | i |= 128; |
|
|
1623 | |
1710 | |
1624 | goto found; |
1711 | goto found; |
1625 | } |
1712 | } |
1626 | |
1713 | |
1627 | next_font: |
1714 | next_font: |
1628 | if (i == fonts.size () - 1) |
1715 | if (i == fonts.size () - 1) |
1629 | { |
1716 | { |
1630 | if (fallback->name) |
1717 | if (fallback->name) |
1631 | { |
1718 | { |
1632 | // search through the fallback list |
1719 | // search through the fallback list |
1633 | fonts.push_back (new_font (fallback->name, fallback->cs)); |
1720 | push_font (new_font (fallback->name, fallback->cs)); |
1634 | fallback++; |
1721 | fallback++; |
1635 | } |
1722 | } |
1636 | else |
1723 | else |
1637 | { |
1724 | { |
1638 | // try to find a new font. |
1725 | // try to find a new font. |
… | |
… | |
1669 | FcPatternDestroy (match); |
1756 | FcPatternDestroy (match); |
1670 | |
1757 | |
1671 | if (find_font (font) < 0) |
1758 | if (find_font (font) < 0) |
1672 | { |
1759 | { |
1673 | char fontname[4096]; |
1760 | char fontname[4096]; |
1674 | sprintf (fontname, "xft:%-.4090s", font); |
1761 | snprintf (fontname, sizeof (fontname), "xft:%s", font); |
1675 | |
1762 | |
1676 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1763 | push_font (new_font (fontname, CS_UNICODE)); |
1677 | } |
1764 | } |
1678 | |
1765 | |
1679 | free (font); |
1766 | free (font); |
1680 | } |
1767 | } |
1681 | #endif |
1768 | #endif |
… | |
… | |
1703 | } |
1790 | } |
1704 | |
1791 | |
1705 | return i; |
1792 | return i; |
1706 | } |
1793 | } |
1707 | |
1794 | |
1708 | |
|
|
1709 | |
|
|