1 | /*----------------------------------------------------------------------* |
1 | /*----------------------------------------------------------------------* |
2 | * File: rxvtfont.C |
2 | * File: rxvtfont.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * Copyright (c) 2003-2006 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 3 of the License, or |
10 | * (at your option) any later version. |
10 | * (at your option) any later version. |
11 | * |
11 | * |
12 | * This program is distributed in the hope that it will be useful, |
12 | * This program is distributed in the hope that it will be useful, |
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
… | |
… | |
22 | #include "../config.h" |
22 | #include "../config.h" |
23 | #include "rxvt.h" |
23 | #include "rxvt.h" |
24 | #include "rxvtutil.h" |
24 | #include "rxvtutil.h" |
25 | #include "rxvtfont.h" |
25 | #include "rxvtfont.h" |
26 | |
26 | |
27 | #include <cstdlib> |
27 | #include <stdlib.h> |
28 | |
28 | |
29 | #include <inttypes.h> |
29 | #include <inttypes.h> |
|
|
30 | |
|
|
31 | #if XFT |
|
|
32 | # include <fontconfig/fontconfig.h> |
|
|
33 | #endif |
30 | |
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" }, |
… | |
… | |
128 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
132 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
129 | { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, |
133 | { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, |
130 | # endif |
134 | # endif |
131 | #endif |
135 | #endif |
132 | |
136 | |
133 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
|
|
134 | //{ 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. |
135 | #if XFT |
138 | #if XFT |
136 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
139 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
137 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
140 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
138 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
141 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
… | |
… | |
155 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
158 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
156 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
159 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
157 | 0x304c, 0x672c, // が本 |
160 | 0x304c, 0x672c, // が本 |
158 | }; |
161 | }; |
159 | |
162 | |
160 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
|
|
161 | |
|
|
162 | #define dTermDisplay Display *disp = term->dpy |
163 | #define dTermDisplay Display *disp = term->dpy |
163 | #define dTermGC GC gc = term->gc |
164 | #define dTermGC GC gc = term->gc |
164 | |
165 | |
165 | ///////////////////////////////////////////////////////////////////////////// |
166 | ///////////////////////////////////////////////////////////////////////////// |
166 | |
167 | |
… | |
… | |
216 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
217 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
217 | { |
218 | { |
218 | } |
219 | } |
219 | |
220 | |
220 | void |
221 | void |
221 | rxvt_font::set_name (char *name) |
222 | rxvt_font::set_name (char *name_) |
222 | { |
223 | { |
223 | if (this->name == name) |
224 | if (name == name_) |
224 | return; |
225 | return; |
225 | |
226 | |
226 | if (this->name) free (this->name); // let the compiler optimize |
227 | if (name) free (name); // let the compiler optimize |
227 | this->name = name; |
228 | name = name_; |
228 | } |
229 | } |
229 | |
230 | |
230 | void |
231 | void |
231 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
232 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
232 | { |
233 | { |
… | |
… | |
238 | else if (color >= 0) |
239 | else if (color >= 0) |
239 | { |
240 | { |
240 | #if XFT |
241 | #if XFT |
241 | Picture dst; |
242 | Picture dst; |
242 | |
243 | |
243 | # ifdef HAVE_BG_PIXMAP |
244 | # ifdef HAVE_IMG |
244 | if (term->bgPixmap.pixmap |
245 | if (term->bg_img |
245 | && !term->pix_colors[color].is_opaque () |
246 | && !term->pix_colors[color].is_opaque () |
246 | && ((dst = XftDrawPicture (d)))) |
247 | && ((dst = XftDrawPicture (d)))) |
247 | { |
248 | { |
248 | XClearArea (disp, d, x, y, w, h, false); |
249 | XClearArea (disp, d, x, y, w, h, false); |
249 | |
250 | |
… | |
… | |
448 | |
449 | |
449 | text_t chrs[2]; |
450 | text_t chrs[2]; |
450 | chrs [1] = NOCHAR; |
451 | chrs [1] = NOCHAR; |
451 | |
452 | |
452 | *chrs = cc->c1; |
453 | *chrs = cc->c1; |
453 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
454 | rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; |
454 | f1->draw (d, x, y, chrs, width, fg, bg); |
455 | f1->draw (d, x, y, chrs, width, fg, bg); |
455 | |
456 | |
456 | if (cc->c2 != NOCHAR) |
457 | if (cc->c2 != NOCHAR) |
457 | { |
458 | { |
458 | bool careful; |
459 | bool careful; |
459 | |
460 | |
460 | // prefer font of first character, for no good reasons |
461 | // prefer font of first character, for no good reasons |
461 | *chrs = cc->c2; |
462 | *chrs = cc->c2; |
462 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
463 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
463 | ? f1 |
464 | ? f1 |
464 | : (*fs)[fs->find_font (cc->c2)]; |
465 | : (*fs)[fs->find_font_idx (cc->c2)]; |
465 | |
466 | |
466 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
467 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
467 | } |
468 | } |
468 | } |
469 | } |
469 | #endif |
470 | #endif |
… | |
… | |
473 | case '\t': |
474 | case '\t': |
474 | case ZERO_WIDTH_CHAR: |
475 | case ZERO_WIDTH_CHAR: |
475 | case NOCHAR: |
476 | case NOCHAR: |
476 | break; |
477 | break; |
477 | |
478 | |
|
|
479 | /* |
|
|
480 | * If the base font does not support variation selectors, treat them as ZWC. |
|
|
481 | * a point could be made to do this for all wcwidth == 0 characters, but I |
|
|
482 | * decided against that until more data is available. |
|
|
483 | */ |
|
|
484 | case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07: |
|
|
485 | case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f: |
|
|
486 | break; |
|
|
487 | |
478 | default: |
488 | default: |
479 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
489 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
480 | fwidth - 4, term->fheight - 4); |
490 | fwidth - 4, term->fheight - 4); |
481 | } |
491 | } |
482 | |
492 | |
483 | x += fwidth; |
493 | x += fwidth; |
484 | } |
494 | } |
485 | } |
495 | } |
486 | |
496 | |
|
|
497 | struct rxvt_font_overflow : rxvt_font { |
|
|
498 | struct rxvt_fontset *fs; |
|
|
499 | |
|
|
500 | rxvt_font_overflow (rxvt_fontset *fs) |
|
|
501 | : rxvt_font () |
|
|
502 | { |
|
|
503 | this->fs = fs; |
|
|
504 | } |
|
|
505 | |
|
|
506 | rxvt_fontprop properties () |
|
|
507 | { |
|
|
508 | rxvt_fontprop p; |
|
|
509 | |
|
|
510 | p.width = p.height = 1; |
|
|
511 | p.ascent = rxvt_fontprop::unset; |
|
|
512 | p.weight = rxvt_fontprop::medium; |
|
|
513 | p.slant = rxvt_fontprop::roman; |
|
|
514 | |
|
|
515 | return p; |
|
|
516 | } |
|
|
517 | |
|
|
518 | bool load (const rxvt_fontprop &prop, bool force_prop) |
|
|
519 | { |
|
|
520 | width = 1; height = 1; |
|
|
521 | ascent = 1; descent = 0; |
|
|
522 | |
|
|
523 | set_name (strdup ("built-in rendition overflow font")); |
|
|
524 | |
|
|
525 | return true; |
|
|
526 | } |
|
|
527 | |
|
|
528 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
|
|
529 | { |
|
|
530 | return false; |
|
|
531 | } |
|
|
532 | |
|
|
533 | void draw (rxvt_drawable &d, int x, int y, |
|
|
534 | const text_t *text, int len, |
|
|
535 | int fg, int bg) |
|
|
536 | { |
|
|
537 | while (len) |
|
|
538 | { |
|
|
539 | int fid = fs->find_font_idx (*text); |
|
|
540 | int w = 1; |
|
|
541 | while (w < len && text[w] == NOCHAR) |
|
|
542 | w++; |
|
|
543 | (*fs)[fid]->draw (d, x, y, text, w, fg, bg); |
|
|
544 | text += w; |
|
|
545 | len -= w; |
|
|
546 | x += term->fwidth * w; |
|
|
547 | } |
|
|
548 | } |
|
|
549 | }; |
|
|
550 | |
487 | ///////////////////////////////////////////////////////////////////////////// |
551 | ///////////////////////////////////////////////////////////////////////////// |
488 | |
552 | |
489 | struct rxvt_font_x11 : rxvt_font { |
553 | struct rxvt_font_x11 : rxvt_font { |
490 | rxvt_font_x11 () { f = 0; } |
554 | rxvt_font_x11 () { f = 0; } |
491 | |
555 | |
… | |
… | |
499 | |
563 | |
500 | void draw (rxvt_drawable &d, int x, int y, |
564 | void draw (rxvt_drawable &d, int x, int y, |
501 | const text_t *text, int len, |
565 | const text_t *text, int len, |
502 | int fg, int bg); |
566 | int fg, int bg); |
503 | |
567 | |
504 | bool slow; // wether this is a proportional font or has other funny characteristics |
568 | bool slow; // whether this is a proportional font or has other funny characteristics |
505 | XFontStruct *f; |
569 | XFontStruct *f; |
506 | bool enc2b, encm; |
570 | bool enc2b, encm; |
507 | |
571 | |
508 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
572 | 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); |
573 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
… | |
… | |
666 | f = XLoadQueryFont (disp, name); |
730 | f = XLoadQueryFont (disp, name); |
667 | |
731 | |
668 | if (!f) |
732 | if (!f) |
669 | return false; |
733 | return false; |
670 | |
734 | |
671 | char *new_name = get_property (f, XA_FONT, name); |
735 | char *new_name = get_property (f, XA_FONT, 0); |
672 | |
736 | |
673 | if (new_name) |
737 | if (new_name) |
674 | set_name (new_name); |
738 | set_name (new_name); |
675 | else |
739 | else |
676 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
740 | rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name); |
677 | |
741 | |
678 | XFreeFont (disp, f); |
742 | XFreeFont (disp, f); |
679 | f = 0; |
743 | f = 0; |
680 | } |
744 | } |
681 | |
745 | |
… | |
… | |
738 | free (fname); |
802 | free (fname); |
739 | if (replace_field (&fname, list[i], 11, '0', "0")) |
803 | if (replace_field (&fname, list[i], 11, '0', "0")) |
740 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
804 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
741 | } |
805 | } |
742 | |
806 | |
743 | if (!set_properties (p, fname)) |
807 | if (!set_properties (p, fname) |
|
|
808 | // also weed out too large fonts |
|
|
809 | || (prop.height != rxvt_fontprop::unset |
|
|
810 | && p.height > prop.height)) |
|
|
811 | { |
|
|
812 | free (fname); |
744 | continue; |
813 | continue; |
745 | |
814 | } |
746 | if (prop.height != rxvt_fontprop::unset |
|
|
747 | && p.height > prop.height) // weed out too large fonts |
|
|
748 | continue; |
|
|
749 | |
815 | |
750 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
816 | 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); |
817 | 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); |
818 | 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); |
819 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
… | |
… | |
759 | XFreeFontNames (list); |
825 | XFreeFontNames (list); |
760 | |
826 | |
761 | // this loop only iterates when the guessed font-size is too small |
827 | // this loop only iterates when the guessed font-size is too small |
762 | for (;;) |
828 | for (;;) |
763 | { |
829 | { |
764 | font_weight *best = fonts + count - 1; |
830 | font_weight *best = fonts; |
765 | |
831 | |
766 | for (font_weight *w = best; w-- > fonts; ) |
832 | for (font_weight *w = fonts + 1; w < fonts + count; w++) |
767 | if (w->diff <= best->diff) |
833 | if (w->diff < best->diff) |
768 | best = w; |
834 | best = w; |
769 | |
835 | |
770 | if (!best->name |
836 | if (!best->name |
771 | || !(f = XLoadQueryFont (disp, best->name))) |
837 | || !(f = XLoadQueryFont (disp, best->name))) |
772 | break; |
838 | break; |
… | |
… | |
792 | return false; |
858 | return false; |
793 | |
859 | |
794 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
860 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
795 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
861 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
796 | |
862 | |
|
|
863 | cs = CS_UNKNOWN; |
|
|
864 | |
797 | if (registry && encoding) |
865 | if (registry && encoding) |
798 | { |
866 | { |
799 | char charset[64]; |
867 | char charset[64]; |
800 | snprintf (charset, 64, "%s-%s", registry, encoding); |
868 | snprintf (charset, 64, "%s-%s", registry, encoding); |
801 | |
869 | |
802 | cs = codeset_from_name (charset); |
870 | cs = codeset_from_name (charset); |
803 | } |
871 | |
804 | else |
872 | if (cs == CS_UNKNOWN) |
|
|
873 | rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset); |
805 | { |
874 | } |
|
|
875 | |
|
|
876 | free (registry); |
|
|
877 | free (encoding); |
|
|
878 | |
|
|
879 | if (cs == CS_UNKNOWN) |
|
|
880 | { |
806 | const char *charset = get_property (f, XA_FONT, 0); |
881 | char *value = get_property (f, XA_FONT, 0); |
|
|
882 | const char *charset = value; |
807 | |
883 | |
808 | if (!charset) |
884 | if (!charset) |
809 | charset = name; |
885 | charset = name; |
810 | |
886 | |
811 | int count = 13; |
887 | int count = 13; |
812 | while (*charset) |
888 | while (*charset) |
813 | if (*charset++ == '-' && !--count) |
889 | if (*charset++ == '-' && !--count) |
814 | break; |
890 | break; |
815 | |
891 | |
816 | cs = codeset_from_name (charset); |
892 | cs = codeset_from_name (charset); |
|
|
893 | if (cs == CS_UNKNOWN) |
|
|
894 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
|
|
895 | |
|
|
896 | free (value); |
|
|
897 | } |
|
|
898 | |
|
|
899 | if (cs == CS_UNKNOWN) |
817 | } |
900 | { |
818 | |
901 | clear (); |
819 | free (registry); |
902 | return false; |
820 | free (encoding); |
903 | } |
821 | |
904 | |
822 | if (cs == CS_UNICODE) |
905 | if (cs == CS_UNICODE) |
823 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
906 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
824 | |
907 | |
825 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
908 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
… | |
… | |
850 | } |
933 | } |
851 | #endif |
934 | #endif |
852 | |
935 | |
853 | width = 1; |
936 | width = 1; |
854 | |
937 | |
855 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
938 | for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++) |
856 | { |
939 | { |
857 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
940 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
858 | continue; |
941 | continue; |
859 | |
942 | |
860 | // ignore characters we wouldn't use anyways |
943 | // ignore characters we wouldn't use anyways |
861 | bool careful; |
944 | bool careful; |
862 | if (!has_char (*t, &prop, careful)) |
945 | if (!has_char (*t, &prop, careful)) |
863 | continue; |
946 | continue; |
864 | |
947 | |
865 | XChar2b ch = { *t >> 8, *t }; |
948 | // the casts are needed in C++11 (see 8.5.1) |
|
|
949 | XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t }; |
866 | |
950 | |
867 | XCharStruct g; |
951 | XCharStruct g; |
868 | int dir_ret, asc_ret, des_ret; |
952 | int dir_ret, asc_ret, des_ret; |
869 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
953 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
870 | |
954 | |
… | |
… | |
872 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
956 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
873 | |
957 | |
874 | if (width < g.width) width = g.width; |
958 | if (width < g.width) width = g.width; |
875 | } |
959 | } |
876 | |
960 | |
877 | if (cs == CS_UNKNOWN) |
961 | #if 0 // do it per-character |
|
|
962 | if (prop && width > prop->width) |
878 | { |
963 | { |
879 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
|
|
880 | |
|
|
881 | clear (); |
964 | clear (); |
882 | return false; |
965 | return false; |
883 | } |
966 | } |
884 | |
|
|
885 | #if 0 // do it per-character |
|
|
886 | if (prop && width > prop->width) |
|
|
887 | { |
|
|
888 | clear (); |
|
|
889 | return false; |
|
|
890 | } |
|
|
891 | #endif |
967 | #endif |
892 | |
968 | |
893 | return true; |
969 | return true; |
894 | } |
970 | } |
895 | |
971 | |
… | |
… | |
904 | } |
980 | } |
905 | |
981 | |
906 | bool |
982 | bool |
907 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
983 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
908 | { |
984 | { |
|
|
985 | careful = false; |
|
|
986 | |
909 | uint32_t ch = FROM_UNICODE (cs, unicode); |
987 | uint32_t ch = FROM_UNICODE (cs, unicode); |
910 | |
988 | |
911 | if (ch == NOCHAR) |
989 | if (ch == NOCHAR) |
912 | return false; |
990 | return false; |
913 | |
991 | |
914 | /* check wether the character exists in _this_ font. horrible. */ |
992 | /* check whether the character exists in _this_ font. horrible. */ |
915 | XCharStruct *xcs; |
993 | XCharStruct *xcs; |
916 | |
994 | |
917 | if (encm) |
995 | if (encm) |
918 | { |
996 | { |
919 | unsigned char byte1 = ch >> 8; |
997 | unsigned char byte1 = ch >> 8; |
… | |
… | |
949 | return false; |
1027 | return false; |
950 | |
1028 | |
951 | if (!prop || prop->width == rxvt_fontprop::unset) |
1029 | if (!prop || prop->width == rxvt_fontprop::unset) |
952 | return true; |
1030 | return true; |
953 | |
1031 | |
954 | // check wether character overlaps previous/next character |
1032 | // check whether character overlaps previous/next character |
955 | int w = xcs->rbearing - xcs->lbearing; |
1033 | int w = xcs->rbearing - xcs->lbearing; |
956 | int wcw = max (WCWIDTH (unicode), 1); |
1034 | int wcw = max (WCWIDTH (unicode), 1); |
957 | |
1035 | |
958 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
1036 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
959 | |
1037 | |
… | |
… | |
976 | dTermDisplay; |
1054 | dTermDisplay; |
977 | dTermGC; |
1055 | dTermGC; |
978 | |
1056 | |
979 | bool slow = this->slow |
1057 | bool slow = this->slow |
980 | || width != term->fwidth |
1058 | || width != term->fwidth |
981 | || height != term->fheight; |
1059 | || height != term->fheight |
|
|
1060 | || ascent != f->ascent; |
982 | |
1061 | |
983 | int base = ascent; // sorry, incorrect: term->fbase; |
1062 | int base = ascent; // sorry, incorrect: term->fbase; |
984 | |
1063 | |
985 | XGCValues v; |
1064 | XGCValues v; |
986 | v.foreground = term->pix_colors[fg]; |
1065 | v.foreground = term->pix_colors[fg]; |
… | |
… | |
1133 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1212 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1134 | |
1213 | |
1135 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1214 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1136 | // clip width, we can't do better, or can we? |
1215 | // clip width, we can't do better, or can we? |
1137 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1216 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1138 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); |
1217 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); |
1139 | #endif |
1218 | #endif |
1140 | |
1219 | |
1141 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1220 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1142 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1221 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1143 | |
1222 | |
… | |
… | |
1155 | int ftheight = 0; |
1234 | int ftheight = 0; |
1156 | bool success = true; |
1235 | bool success = true; |
1157 | |
1236 | |
1158 | for (;;) |
1237 | for (;;) |
1159 | { |
1238 | { |
|
|
1239 | p = FcPatternDuplicate (match); |
1160 | f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); |
1240 | f = XftFontOpenPattern (disp, p); |
1161 | |
1241 | |
1162 | if (!f) |
1242 | if (!f) |
1163 | { |
1243 | { |
|
|
1244 | FcPatternDestroy (p); |
1164 | success = false; |
1245 | success = false; |
1165 | break; |
1246 | break; |
1166 | } |
1247 | } |
1167 | |
1248 | |
1168 | FT_Face face = XftLockFace (f); |
1249 | FT_Face face = XftLockFace (f); |
… | |
… | |
1176 | |
1257 | |
1177 | XftUnlockFace (f); |
1258 | XftUnlockFace (f); |
1178 | |
1259 | |
1179 | int glheight = height; |
1260 | int glheight = height; |
1180 | |
1261 | |
1181 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1262 | for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++) |
1182 | { |
1263 | { |
1183 | FcChar16 ch = *t; |
1264 | FcChar16 ch = *t; |
1184 | |
1265 | |
1185 | if (cs != CS_UNICODE |
1266 | if (cs != CS_UNICODE |
1186 | && ch > 0x100 |
1267 | && ch > 0x100 |
… | |
… | |
1287 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1368 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1288 | const text_t *text, int len, |
1369 | const text_t *text, int len, |
1289 | int fg, int bg) |
1370 | int fg, int bg) |
1290 | { |
1371 | { |
1291 | XGlyphInfo extents; |
1372 | XGlyphInfo extents; |
1292 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1373 | XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); |
1293 | XftGlyphSpec *ep = enc; |
1374 | XftGlyphSpec *ep = enc; |
1294 | |
1375 | |
1295 | dTermDisplay; |
1376 | dTermDisplay; |
1296 | dTermGC; |
1377 | dTermGC; |
1297 | |
1378 | |
1298 | int w = term->fwidth * len; |
1379 | int w = term->fwidth * len; |
1299 | int h = term->fheight; |
1380 | int h = term->fheight; |
1300 | |
1381 | |
1301 | /* |
|
|
1302 | * Maybe make buffering into a resource flag? Compile time option doesn't seems like a |
|
|
1303 | * good idea from the perspective of packaging for wide variety of user configs. |
|
|
1304 | */ |
|
|
1305 | bool buffered = bg >= Color_transparent; |
1382 | bool buffered = bg >= Color_transparent |
1306 | #ifdef FORCE_UNBUFFERED_XFT |
1383 | && term->option (Opt_buffered); |
1307 | buffered = false; |
|
|
1308 | #endif |
|
|
1309 | |
1384 | |
1310 | // cut trailing spaces |
1385 | // cut trailing spaces |
1311 | while (len && text [len - 1] == ' ') |
1386 | while (len && text [len - 1] == ' ') |
1312 | len--; |
1387 | len--; |
1313 | |
1388 | |
… | |
… | |
1344 | { |
1419 | { |
1345 | if (ep != enc) |
1420 | if (ep != enc) |
1346 | { |
1421 | { |
1347 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1422 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1348 | |
1423 | |
1349 | #ifdef HAVE_BG_PIXMAP |
1424 | #ifdef HAVE_IMG |
1350 | Picture dst = 0; |
1425 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
1351 | |
1426 | |
1352 | if (term->bgPixmap.pixmap |
1427 | if (term->bg_img |
1353 | && (bg == Color_transparent || bg == Color_bg |
1428 | && (bg == Color_transparent || bg == Color_bg |
1354 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1429 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1355 | { |
1430 | { |
1356 | int src_x = x, src_y = y; |
1431 | int src_x = x, src_y = y; |
1357 | |
1432 | |
1358 | if (term->bgPixmap.is_parentOrigin ()) |
1433 | if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT) |
1359 | { |
1434 | { |
1360 | src_x += term->window_vt_x; |
1435 | src_x += term->window_vt_x; |
1361 | src_y += term->window_vt_y; |
1436 | src_y += term->window_vt_y; |
1362 | } |
1437 | } |
1363 | |
1438 | |
1364 | if (term->bgPixmap.pmap_width >= src_x + w |
1439 | if (term->bg_img->w >= src_x + w |
1365 | && term->bgPixmap.pmap_height >= src_y + h) |
1440 | && term->bg_img->h >= src_y + h) |
1366 | { |
1441 | { |
1367 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1442 | XCopyArea (disp, term->bg_img->pm, d2, gc, |
1368 | src_x, src_y, w, h, 0, 0); |
1443 | src_x, src_y, w, h, 0, 0); |
1369 | } |
1444 | } |
1370 | else |
1445 | else |
1371 | { |
1446 | { |
1372 | XGCValues gcv; |
1447 | XGCValues gcv; |
1373 | |
1448 | |
1374 | gcv.fill_style = FillTiled; |
1449 | gcv.fill_style = FillTiled; |
1375 | gcv.tile = term->bgPixmap.pixmap; |
1450 | gcv.tile = term->bg_img->pm; |
1376 | gcv.ts_x_origin = -src_x; |
1451 | gcv.ts_x_origin = -src_x; |
1377 | gcv.ts_y_origin = -src_y; |
1452 | gcv.ts_y_origin = -src_y; |
1378 | |
1453 | |
1379 | XChangeGC (disp, gc, |
1454 | XChangeGC (disp, gc, |
1380 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1455 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
… | |
… | |
1388 | |
1463 | |
1389 | if (dst) |
1464 | if (dst) |
1390 | { |
1465 | { |
1391 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
1466 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
1392 | |
1467 | |
|
|
1468 | // dst can only be set when bg >= 0 |
1393 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
1469 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
1394 | } |
1470 | } |
1395 | } |
1471 | } |
1396 | else |
1472 | else |
1397 | #endif |
1473 | #endif |
1398 | clear_rect (d2, 0, 0, w, h, bg); |
1474 | XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h); |
1399 | |
1475 | |
1400 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1476 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1401 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1477 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1402 | } |
1478 | } |
1403 | else |
1479 | else |
… | |
… | |
1431 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1507 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1432 | = rxvt_fontprop::unset; |
1508 | = rxvt_fontprop::unset; |
1433 | force_prop = false; |
1509 | force_prop = false; |
1434 | |
1510 | |
1435 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1511 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1436 | FONT_UNREF (*i); |
1512 | (*i)->unref (); |
1437 | |
1513 | |
1438 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1514 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1439 | delete *p; |
1515 | delete *p; |
1440 | |
1516 | |
1441 | free (fontdesc); fontdesc = 0; |
1517 | free (fontdesc); fontdesc = 0; |
… | |
… | |
1443 | fonts.clear (); |
1519 | fonts.clear (); |
1444 | |
1520 | |
1445 | fallback = fallback_fonts; |
1521 | fallback = fallback_fonts; |
1446 | } |
1522 | } |
1447 | |
1523 | |
|
|
1524 | void |
|
|
1525 | rxvt_fontset::prepare_font (rxvt_font *font, codeset cs) |
|
|
1526 | { |
|
|
1527 | font->set_term (term); |
|
|
1528 | |
|
|
1529 | font->cs = cs; |
|
|
1530 | font->loaded = false; |
|
|
1531 | } |
|
|
1532 | |
1448 | rxvt_font * |
1533 | rxvt_font * |
1449 | rxvt_fontset::new_font (const char *name, codeset cs) |
1534 | rxvt_fontset::new_font (const char *name, codeset cs) |
1450 | { |
1535 | { |
1451 | rxvt_font *f; |
1536 | rxvt_font *f; |
1452 | |
1537 | |
… | |
… | |
1468 | f = new rxvt_font_x11; |
1553 | f = new rxvt_font_x11; |
1469 | } |
1554 | } |
1470 | else |
1555 | else |
1471 | f = new rxvt_font_x11; |
1556 | f = new rxvt_font_x11; |
1472 | |
1557 | |
1473 | f->set_term (term); |
|
|
1474 | f->set_name (strdup (name)); |
1558 | f->set_name (strdup (name)); |
1475 | |
1559 | prepare_font (f, cs); |
1476 | f->cs = cs; |
|
|
1477 | f->loaded = false; |
|
|
1478 | |
1560 | |
1479 | return f; |
1561 | return f; |
1480 | } |
1562 | } |
1481 | |
1563 | |
1482 | ///////////////////////////////////////////////////////////////////////////// |
1564 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1565 | |
|
|
1566 | void |
|
|
1567 | rxvt_fontset::push_font (rxvt_font *font) |
|
|
1568 | { |
|
|
1569 | // the fontCount index is reserved for the overflow font, it is only |
|
|
1570 | // necessary when we get fontCount or more fonts, as they cannot be |
|
|
1571 | // represented in the rendition. |
|
|
1572 | if (fonts.size () == fontCount) |
|
|
1573 | { |
|
|
1574 | rxvt_font *f = new rxvt_font_overflow (this); |
|
|
1575 | |
|
|
1576 | prepare_font (f, CS_UNICODE); |
|
|
1577 | fonts.push_back (f); |
|
|
1578 | } |
|
|
1579 | |
|
|
1580 | fonts.push_back (font); |
|
|
1581 | } |
1483 | |
1582 | |
1484 | void |
1583 | void |
1485 | rxvt_fontset::add_fonts (const char *desc) |
1584 | rxvt_fontset::add_fonts (const char *desc) |
1486 | { |
1585 | { |
1487 | if (desc) |
1586 | if (desc) |
… | |
… | |
1516 | cs = codeset_from_name (spec + sizeof ("codeset=") - 1); |
1615 | cs = codeset_from_name (spec + sizeof ("codeset=") - 1); |
1517 | else |
1616 | else |
1518 | rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); |
1617 | rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); |
1519 | |
1618 | |
1520 | desc++; |
1619 | desc++; |
1521 | while (*desc <= ' ') desc++; |
1620 | while (*desc <= ' ' && *desc) desc++; |
1522 | } |
1621 | } |
1523 | |
1622 | |
1524 | end = strchr (desc, ','); |
1623 | end = strchr (desc, ','); |
1525 | if (!end) |
1624 | if (!end) |
1526 | end = desc + strlen (desc); |
1625 | end = desc + strlen (desc); |
… | |
… | |
1528 | if (end - desc < 511) |
1627 | if (end - desc < 511) |
1529 | { |
1628 | { |
1530 | memcpy (buf, desc, end - desc); |
1629 | memcpy (buf, desc, end - desc); |
1531 | buf[end - desc] = 0; |
1630 | buf[end - desc] = 0; |
1532 | |
1631 | |
1533 | fonts.push_back (new_font (buf, cs)); |
1632 | push_font (new_font (buf, cs)); |
1534 | } |
1633 | } |
1535 | else |
1634 | else |
1536 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1635 | rxvt_warn ("fontset element too long (>511 bytes), ignored.\n"); |
1537 | |
1636 | |
1538 | desc = end + 1; |
1637 | desc = end + 1; |
1539 | } |
1638 | } |
1540 | while (*end); |
1639 | while (*end); |
1541 | } |
1640 | } |
… | |
… | |
1566 | { |
1665 | { |
1567 | clear (); |
1666 | clear (); |
1568 | |
1667 | |
1569 | fontdesc = strdup (desc); |
1668 | fontdesc = strdup (desc); |
1570 | |
1669 | |
1571 | fonts.push_back (new_font (0, CS_UNICODE)); |
1670 | push_font (new_font (0, CS_UNICODE)); |
1572 | realize_font (0); |
1671 | realize_font (0); |
1573 | |
1672 | |
1574 | add_fonts (desc); |
1673 | add_fonts (desc); |
1575 | |
1674 | |
1576 | return true; |
1675 | return true; |
… | |
… | |
1585 | |
1684 | |
1586 | return -1; |
1685 | return -1; |
1587 | } |
1686 | } |
1588 | |
1687 | |
1589 | int |
1688 | int |
1590 | rxvt_fontset::find_font (unicode_t unicode) |
1689 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1591 | { |
1690 | { |
1592 | if (unicode >= 1<<20) |
1691 | if (unicode >= 1<<20) |
1593 | return 0; |
1692 | return 0; |
1594 | |
1693 | |
1595 | unicode_t hi = unicode >> 8; |
1694 | unicode_t hi = unicode >> 8; |
… | |
… | |
1621 | goto next_font; |
1720 | goto next_font; |
1622 | |
1721 | |
1623 | bool careful; |
1722 | bool careful; |
1624 | if (f->has_char (unicode, &prop, careful)) |
1723 | if (f->has_char (unicode, &prop, careful)) |
1625 | { |
1724 | { |
1626 | if (careful) |
1725 | i = (i << 1) | careful; |
1627 | i |= 128; |
|
|
1628 | |
1726 | |
1629 | goto found; |
1727 | goto found; |
1630 | } |
1728 | } |
1631 | |
1729 | |
1632 | next_font: |
1730 | next_font: |
1633 | if (i == fonts.size () - 1) |
1731 | if (i == fonts.size () - 1) |
1634 | { |
1732 | { |
1635 | if (fallback->name) |
1733 | if (fallback->name) |
1636 | { |
1734 | { |
1637 | // search through the fallback list |
1735 | // search through the fallback list |
1638 | fonts.push_back (new_font (fallback->name, fallback->cs)); |
1736 | push_font (new_font (fallback->name, fallback->cs)); |
1639 | fallback++; |
1737 | fallback++; |
1640 | } |
1738 | } |
1641 | else |
1739 | else |
1642 | { |
1740 | { |
1643 | // try to find a new font. |
1741 | // try to find a new font. |
… | |
… | |
1645 | // way to configure this and xft is easier to hack in, |
1743 | // way to configure this and xft is easier to hack in, |
1646 | // while x11 has more framework in place already. |
1744 | // while x11 has more framework in place already. |
1647 | // TODO: this is a real resource hog, xft takes ages(?) |
1745 | // TODO: this is a real resource hog, xft takes ages(?) |
1648 | #if XFT && USE_SLOW_LOOKUP |
1746 | #if XFT && USE_SLOW_LOOKUP |
1649 | // grab the first xft font that seems suitable |
1747 | // grab the first xft font that seems suitable |
|
|
1748 | // TOOD: should go first for cellchar (spacing 110) then mono, then else |
1650 | FcPattern *p = FcPatternCreate (); |
1749 | FcPattern *p = FcPatternCreate (); |
1651 | |
1750 | |
1652 | FcCharSet *s = FcCharSetCreate (); |
1751 | FcCharSet *s = FcCharSetCreate (); |
1653 | FcCharSetAddChar (s, unicode); |
1752 | FcCharSetAddChar (s, unicode); |
1654 | FcPatternAddCharSet (p, FC_CHARSET, s); |
1753 | FcPatternAddCharSet (p, FC_CHARSET, s); |
… | |
… | |
1674 | FcPatternDestroy (match); |
1773 | FcPatternDestroy (match); |
1675 | |
1774 | |
1676 | if (find_font (font) < 0) |
1775 | if (find_font (font) < 0) |
1677 | { |
1776 | { |
1678 | char fontname[4096]; |
1777 | char fontname[4096]; |
1679 | sprintf (fontname, "xft:%-.4090s", font); |
1778 | snprintf (fontname, sizeof (fontname), "xft:%s", font); |
1680 | |
1779 | |
1681 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1780 | push_font (new_font (fontname, CS_UNICODE)); |
1682 | } |
1781 | } |
1683 | |
1782 | |
1684 | free (font); |
1783 | free (font); |
1685 | } |
1784 | } |
1686 | #endif |
1785 | #endif |
… | |
… | |
1698 | while (hi >= fmap.size ()) |
1797 | while (hi >= fmap.size ()) |
1699 | fmap.push_back (0); |
1798 | fmap.push_back (0); |
1700 | |
1799 | |
1701 | if (!fmap[hi]) |
1800 | if (!fmap[hi]) |
1702 | { |
1801 | { |
1703 | fmap[hi] = (pagemap *)new pagemap; |
1802 | fmap[hi] = new pagemap; |
1704 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1803 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1705 | } |
1804 | } |
1706 | |
1805 | |
1707 | (*fmap[hi])[unicode & 0xff] = i; |
1806 | (*fmap[hi])[unicode & 0xff] = i; |
1708 | } |
1807 | } |
1709 | |
1808 | |
1710 | return i; |
1809 | return i; |
1711 | } |
1810 | } |
1712 | |
1811 | |
1713 | |
|
|
1714 | |
|
|