1 | /*--------------------------------*-C-*---------------------------------* |
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 |
… | |
… | |
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
20 | *---------------------------------------------------------------------*/ |
20 | *---------------------------------------------------------------------*/ |
21 | |
21 | |
22 | #include "../config.h" |
22 | #include "../config.h" |
23 | #include "rxvt.h" |
23 | #include "rxvt.h" |
24 | #include "rxvtlib.h" |
|
|
25 | #include "rxvtutil.h" |
24 | #include "rxvtutil.h" |
26 | #include "rxvtfont.h" |
25 | #include "rxvtfont.h" |
27 | |
26 | |
28 | #include <cstdlib> |
27 | #include <stdlib.h> |
29 | #include <wchar.h> |
28 | |
30 | #include <inttypes.h> |
29 | #include <inttypes.h> |
|
|
30 | |
|
|
31 | #if XFT |
|
|
32 | # include <fontconfig/fontconfig.h> |
|
|
33 | #endif |
31 | |
34 | |
32 | #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 |
33 | #define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts |
36 | #define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts |
34 | |
37 | |
35 | #define OVERLAP_OK(w,prop) (w) > ( \ |
38 | #define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ |
36 | prop->slant >= rxvt_fontprop::italic \ |
39 | (prop)->slant >= rxvt_fontprop::italic \ |
37 | ? (prop->width * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
40 | ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
38 | : (prop->width * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
41 | : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
39 | ) |
42 | )) |
40 | |
43 | |
41 | const struct rxvt_fallback_font { |
44 | static const struct rxvt_fallback_font { |
42 | codeset cs; |
45 | codeset cs; |
43 | const char *name; |
46 | const char *name; |
44 | } fallback_fonts[] = { |
47 | } fallback_fonts[] = { |
45 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
48 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
46 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
49 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
47 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
50 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
48 | |
51 | |
49 | #if ENCODING_EU |
52 | #if ENCODING_EU |
50 | // cyrillic |
53 | // cyrillic |
51 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
54 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
52 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
55 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
53 | |
56 | |
54 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
57 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
55 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
58 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
56 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
59 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
57 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
60 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
58 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
61 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
… | |
… | |
64 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
67 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
65 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
68 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
66 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
69 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
67 | |
70 | |
68 | # if XFT |
71 | # if XFT |
69 | { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, |
72 | { CS_KOI8_U, "xft::lang=ru" }, |
70 | |
73 | |
71 | { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, |
74 | { CS_ISO8859_5, "xft::lang=ru" }, |
72 | { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, |
75 | { CS_ISO8859_6, "xft::lang=ar" }, |
73 | { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, |
76 | { CS_ISO8859_7, "xft::lang=el" }, |
74 | { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, |
77 | { CS_ISO8859_8, "xft::lang=he" }, |
75 | { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, |
78 | { CS_ISO8859_9, "xft::lang=tr" }, |
76 | { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, |
79 | { CS_ISO8859_10, "xft::lang=se" }, |
77 | { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, |
80 | { CS_ISO8859_11, "xft::lang=th" }, |
78 | # endif |
81 | # endif |
79 | #endif |
82 | #endif |
80 | |
83 | |
81 | // japanese |
84 | // japanese |
82 | #if ENCODING_JP || ENCODING_JP_EXT |
85 | #if ENCODING_JP || ENCODING_JP_EXT |
83 | # if XFT |
86 | # if XFT |
84 | // prefer xft for complex scripts |
87 | // prefer xft for complex scripts |
|
|
88 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
85 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
89 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
86 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
|
|
87 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
90 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
88 | { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, |
91 | { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, |
89 | # endif |
92 | # endif |
90 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
93 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
91 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
94 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
92 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
95 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
93 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
96 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
… | |
… | |
97 | |
100 | |
98 | #if ENCODING_ZH || ENCODING_ZH_EXT |
101 | #if ENCODING_ZH || ENCODING_ZH_EXT |
99 | # if XFT |
102 | # if XFT |
100 | { CS_GBK_0, "xft:AR PL KaitiM GB" }, |
103 | { CS_GBK_0, "xft:AR PL KaitiM GB" }, |
101 | { CS_GBK_0, "xft:AR PL SungtiL GB" }, |
104 | { CS_GBK_0, "xft:AR PL SungtiL GB" }, |
102 | { CS_GBK_0, "xft::spacing=100:lang=zh" }, |
105 | { CS_GBK_0, "xft::lang=zh" }, |
103 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
106 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
104 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
107 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
105 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
108 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
106 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
109 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
107 | { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, |
110 | { CS_GB2312_1980_0, "xft::lang=zh" }, |
108 | # endif |
111 | # endif |
109 | { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, |
112 | { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, |
110 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
113 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
111 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
114 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
112 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
115 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
… | |
… | |
125 | #if ENCODING_KR |
128 | #if ENCODING_KR |
126 | { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
129 | { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
127 | { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
130 | { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
128 | # if XFT |
131 | # if XFT |
129 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
132 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
130 | { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, |
133 | { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, |
131 | # endif |
134 | # endif |
132 | #endif |
135 | #endif |
133 | |
136 | |
134 | // generic font fallback |
137 | //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. |
135 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
|
|
136 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
|
|
137 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
|
|
138 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
|
|
139 | #if XFT |
138 | #if XFT |
140 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
139 | { CS_UNICODE, "xft:DejaVu Sans Mono:antialias=false:autohint=true" }, |
141 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
140 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
142 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
141 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
143 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, |
142 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, |
144 | |
143 | |
145 | // FreeMono is usually uglier than x fonts, so try last only. |
144 | // FreeMono is usually uglier than x fonts, so try after the others |
146 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
145 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
147 | #endif |
146 | #endif |
148 | |
147 | |
|
|
148 | // generic font fallback, put this last, as many iso10646 fonts have extents |
|
|
149 | // specified for all glyphs in the range they cover, but most are simply empty |
|
|
150 | //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
|
|
151 | //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
149 | { CS_UNKNOWN, 0 } |
152 | { CS_UNKNOWN, 0 } |
150 | }; |
153 | }; |
151 | |
154 | |
152 | // these characters are used to guess the font height and width |
155 | // these characters are used to guess the font height and width |
153 | // pango uses a similar algorithm and doesn't trust the font either. |
156 | // pango uses a similar algorithm and doesn't trust the font either. |
… | |
… | |
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->display->display |
163 | #define dTermDisplay Display *disp = term->dpy |
163 | #define dTermGC GC gc = term->gc |
164 | #define dTermGC GC gc = term->gc |
164 | |
|
|
165 | ///////////////////////////////////////////////////////////////////////////// |
|
|
166 | |
|
|
167 | #if XFT |
|
|
168 | rxvt_drawable::~rxvt_drawable () |
|
|
169 | { |
|
|
170 | if (xftdrawable) |
|
|
171 | XftDrawDestroy (xftdrawable); |
|
|
172 | } |
|
|
173 | |
|
|
174 | rxvt_drawable::operator XftDraw *() |
|
|
175 | { |
|
|
176 | if (!xftdrawable) |
|
|
177 | xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); |
|
|
178 | |
|
|
179 | return xftdrawable; |
|
|
180 | } |
|
|
181 | #endif |
|
|
182 | |
165 | |
183 | ///////////////////////////////////////////////////////////////////////////// |
166 | ///////////////////////////////////////////////////////////////////////////// |
184 | |
167 | |
185 | static const char * |
168 | static const char * |
186 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
169 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
… | |
… | |
228 | return res; |
211 | return res; |
229 | } |
212 | } |
230 | |
213 | |
231 | ///////////////////////////////////////////////////////////////////////////// |
214 | ///////////////////////////////////////////////////////////////////////////// |
232 | |
215 | |
|
|
216 | rxvt_font::rxvt_font () |
|
|
217 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
|
|
218 | { |
|
|
219 | } |
|
|
220 | |
233 | void |
221 | void |
234 | rxvt_font::set_name (char *name) |
222 | rxvt_font::set_name (char *name_) |
235 | { |
223 | { |
236 | if (this->name == name) |
224 | if (name == name_) |
237 | return; |
225 | return; |
238 | |
226 | |
239 | if (this->name) free (this->name); // let the compiler optimize |
227 | if (name) free (name); // let the compiler optimize |
240 | this->name = name; |
228 | name = name_; |
241 | } |
229 | } |
242 | |
230 | |
243 | void |
231 | void |
244 | 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 |
245 | { |
233 | { |
246 | dTermDisplay; |
234 | dTermDisplay; |
247 | dTermGC; |
235 | dTermGC; |
248 | |
236 | |
249 | if (color == Color_bg) |
237 | if (color == Color_bg || color == Color_transparent) |
250 | XClearArea (disp, d, x, y, w, h, FALSE); |
238 | XClearArea (disp, d, x, y, w, h, false); |
251 | else if (color >= 0) |
239 | else if (color >= 0) |
252 | { |
240 | { |
253 | #if XFT |
241 | #if XFT |
|
|
242 | Picture dst; |
|
|
243 | |
|
|
244 | # ifdef HAVE_IMG |
|
|
245 | if (term->bg_img |
|
|
246 | && !term->pix_colors[color].is_opaque () |
|
|
247 | && ((dst = XftDrawPicture (d)))) |
|
|
248 | { |
|
|
249 | XClearArea (disp, d, x, y, w, h, false); |
|
|
250 | |
|
|
251 | Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); |
|
|
252 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); |
|
|
253 | } |
|
|
254 | else |
|
|
255 | # endif |
254 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
256 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
|
|
257 | |
255 | #else |
258 | #else |
256 | XSetForeground (disp, gc, term->pix_colors[color]); |
259 | XSetForeground (disp, gc, term->pix_colors[color]); |
257 | XFillRectangle (disp, d, gc, x, y, w, h); |
260 | XFillRectangle (disp, d, gc, x, y, w, h); |
258 | #endif |
261 | #endif |
259 | } |
262 | } |
260 | } |
263 | } |
261 | |
264 | |
262 | #include "table/linedraw.h" |
265 | ///////////////////////////////////////////////////////////////////////////// |
263 | |
266 | |
264 | struct rxvt_font_default : rxvt_font { |
267 | struct rxvt_font_default : rxvt_font |
|
|
268 | { |
265 | struct rxvt_fontset *fs; |
269 | struct rxvt_fontset *fs; |
266 | |
270 | |
267 | rxvt_font_default (rxvt_fontset *fs) |
271 | rxvt_font_default (rxvt_fontset *fs) |
268 | : rxvt_font () |
272 | : rxvt_font () |
269 | { |
273 | { |
… | |
… | |
280 | p.slant = rxvt_fontprop::roman; |
284 | p.slant = rxvt_fontprop::roman; |
281 | |
285 | |
282 | return p; |
286 | return p; |
283 | } |
287 | } |
284 | |
288 | |
285 | bool load (const rxvt_fontprop &prop) |
289 | bool load (const rxvt_fontprop &prop, bool force_prop) |
286 | { |
290 | { |
287 | width = 1; height = 1; |
291 | width = 1; height = 1; |
288 | ascent = 1; descent = 0; |
292 | ascent = 1; descent = 0; |
289 | |
293 | |
290 | set_name (strdup ("built-in support font")); |
294 | set_name (strdup ("built-in support font")); |
… | |
… | |
303 | return false; |
307 | return false; |
304 | |
308 | |
305 | if (unicode <= 0x009f) |
309 | if (unicode <= 0x009f) |
306 | return true; |
310 | return true; |
307 | |
311 | |
|
|
312 | #ifdef BUILTIN_GLYPHS |
308 | if (unicode >= 0x2500 && unicode <= 0x259f && |
313 | if (unicode >= 0x2500 && unicode <= 0x259f && |
309 | !term->option (Opt_skipBuiltinGlyphs)) |
314 | !term->option (Opt_skipBuiltinGlyphs)) |
310 | return true; |
315 | return true; |
|
|
316 | #endif |
311 | |
317 | |
312 | if (IS_COMPOSE (unicode)) |
318 | // we do not check for IS_COMPOSE here, as this would |
313 | return true; |
319 | // rob other fonts from taking over. |
314 | |
320 | |
315 | switch (unicode) |
321 | switch (unicode) |
316 | { |
322 | { |
317 | case ZERO_WIDTH_CHAR: |
323 | case ZERO_WIDTH_CHAR: |
318 | case NOCHAR: |
324 | case NOCHAR: |
… | |
… | |
339 | |
345 | |
340 | XSetForeground (disp, gc, term->pix_colors[fg]); |
346 | XSetForeground (disp, gc, term->pix_colors[fg]); |
341 | |
347 | |
342 | while (len) |
348 | while (len) |
343 | { |
349 | { |
|
|
350 | const text_t *tp = text; |
|
|
351 | text_t t = *tp; |
|
|
352 | |
|
|
353 | while (++text, --len && *text == NOCHAR) |
|
|
354 | ; |
|
|
355 | |
344 | #if ENABLE_COMBINING |
356 | #if ENABLE_COMBINING |
345 | compose_char *cc; |
357 | compose_char *cc; |
346 | #endif |
358 | #endif |
347 | const text_t *tp = text; |
|
|
348 | text_t t = *tp; |
|
|
349 | |
|
|
350 | while (++text, --len && *text == NOCHAR) |
|
|
351 | ; |
|
|
352 | |
|
|
353 | int width = text - tp; |
359 | int width = text - tp; |
354 | int fwidth = term->fwidth * width; |
360 | int fwidth = term->fwidth * width; |
355 | |
361 | |
|
|
362 | #ifdef BUILTIN_GLYPHS |
356 | if (0x2500 <= t && t <= 0x259f) |
363 | if (0x2500 <= t && t <= 0x259f) |
357 | { |
364 | { |
|
|
365 | # include "table/linedraw.h" |
358 | uint16_t offs = linedraw_offs[t - 0x2500]; |
366 | uint16_t offs = linedraw_offs[t - 0x2500]; |
359 | uint32_t *a = linedraw_command + (offs >> 4); |
367 | uint32_t *a = linedraw_command + (offs >> 4); |
360 | uint32_t *b = a + (offs & 15); |
368 | uint32_t *b = a + (offs & 15); |
361 | |
369 | |
362 | int W = fwidth; |
370 | int W = fwidth; |
… | |
… | |
400 | |
408 | |
401 | case 1: // rectangle, possibly stippled |
409 | case 1: // rectangle, possibly stippled |
402 | if (a) |
410 | if (a) |
403 | { |
411 | { |
404 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
412 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
405 | |
413 | |
406 | gcv.fill_style = FillStippled; |
414 | gcv.fill_style = FillStippled; |
407 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
415 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
408 | gcv.ts_x_origin = x; |
416 | gcv.ts_x_origin = x; |
409 | gcv.ts_y_origin = y; |
417 | gcv.ts_y_origin = y; |
410 | |
418 | |
… | |
… | |
429 | (a - 1) * 90*64, (b - 1) * 90*64); |
437 | (a - 1) * 90*64, (b - 1) * 90*64); |
430 | break; |
438 | break; |
431 | } |
439 | } |
432 | } |
440 | } |
433 | } |
441 | } |
|
|
442 | #else |
|
|
443 | if (0) |
|
|
444 | ; |
|
|
445 | #endif |
434 | #if ENABLE_COMBINING |
446 | #if ENABLE_COMBINING |
435 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
447 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
436 | { |
448 | { |
|
|
449 | min_it (width, 2); // we only support wcwidth up to 2 |
437 | text_t chrs[2]; |
450 | text_t chrs[2]; |
438 | width = min (2, width); |
|
|
439 | chrs [1] = NOCHAR; |
451 | chrs [1] = NOCHAR; |
440 | |
452 | |
441 | *chrs = cc->c1; |
453 | *chrs = cc->c1; |
442 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
454 | rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; |
443 | f1->draw (d, x, y, chrs, width, fg, bg); |
455 | f1->draw (d, x, y, chrs, width, fg, bg); |
444 | |
456 | |
445 | if (cc->c2 != NOCHAR) |
457 | if (cc->c2 != NOCHAR) |
446 | { |
458 | { |
447 | bool careful; |
459 | bool careful; |
448 | |
460 | |
449 | // prefer font of first character, for no good reasons |
461 | // prefer font of first character, for no good reasons |
450 | *chrs = cc->c2; |
462 | *chrs = cc->c2; |
451 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
463 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
452 | ? f1 |
464 | ? f1 |
453 | : (*fs)[fs->find_font (cc->c2)]; |
465 | : (*fs)[fs->find_font_idx (cc->c2)]; |
454 | |
466 | |
455 | f2->draw (d, x, y, chrs, width, fg, -1); |
467 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
456 | } |
468 | } |
457 | } |
469 | } |
458 | #endif |
470 | #endif |
459 | else |
471 | else |
460 | switch (t) |
472 | switch (t) |
… | |
… | |
462 | case '\t': |
474 | case '\t': |
463 | case ZERO_WIDTH_CHAR: |
475 | case ZERO_WIDTH_CHAR: |
464 | case NOCHAR: |
476 | case NOCHAR: |
465 | break; |
477 | break; |
466 | |
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 | |
467 | default: |
488 | default: |
468 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
489 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
469 | fwidth - 4, term->fheight - 4); |
490 | fwidth - 4, term->fheight - 4); |
470 | } |
491 | } |
471 | |
492 | |
472 | x += fwidth; |
493 | x += fwidth; |
473 | } |
494 | } |
474 | } |
495 | } |
475 | |
496 | |
|
|
497 | struct rxvt_font_overflow : rxvt_font |
|
|
498 | { |
|
|
499 | struct rxvt_fontset *fs; |
|
|
500 | |
|
|
501 | rxvt_font_overflow (rxvt_fontset *fs) |
|
|
502 | : rxvt_font () |
|
|
503 | { |
|
|
504 | this->fs = fs; |
|
|
505 | } |
|
|
506 | |
|
|
507 | rxvt_fontprop properties () |
|
|
508 | { |
|
|
509 | rxvt_fontprop p; |
|
|
510 | |
|
|
511 | p.width = p.height = 1; |
|
|
512 | p.ascent = rxvt_fontprop::unset; |
|
|
513 | p.weight = rxvt_fontprop::medium; |
|
|
514 | p.slant = rxvt_fontprop::roman; |
|
|
515 | |
|
|
516 | return p; |
|
|
517 | } |
|
|
518 | |
|
|
519 | bool load (const rxvt_fontprop &prop, bool force_prop) |
|
|
520 | { |
|
|
521 | width = 1; height = 1; |
|
|
522 | ascent = 1; descent = 0; |
|
|
523 | |
|
|
524 | set_name (strdup ("built-in rendition overflow font")); |
|
|
525 | |
|
|
526 | return true; |
|
|
527 | } |
|
|
528 | |
|
|
529 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
|
|
530 | { |
|
|
531 | return false; |
|
|
532 | } |
|
|
533 | |
|
|
534 | void draw (rxvt_drawable &d, int x, int y, |
|
|
535 | const text_t *text, int len, |
|
|
536 | int fg, int bg) |
|
|
537 | { |
|
|
538 | while (len) |
|
|
539 | { |
|
|
540 | int fid = fs->find_font_idx (*text); |
|
|
541 | int w = 1; |
|
|
542 | while (w < len && text[w] == NOCHAR) |
|
|
543 | w++; |
|
|
544 | (*fs)[fid]->draw (d, x, y, text, w, fg, bg); |
|
|
545 | text += w; |
|
|
546 | len -= w; |
|
|
547 | x += term->fwidth * w; |
|
|
548 | } |
|
|
549 | } |
|
|
550 | }; |
|
|
551 | |
476 | ///////////////////////////////////////////////////////////////////////////// |
552 | ///////////////////////////////////////////////////////////////////////////// |
477 | |
553 | |
478 | struct rxvt_font_x11 : rxvt_font { |
554 | struct rxvt_font_x11 : rxvt_font |
|
|
555 | { |
479 | rxvt_font_x11 () { f = 0; } |
556 | rxvt_font_x11 () { f = 0; } |
480 | |
557 | |
481 | void clear (); |
558 | void clear (); |
482 | |
559 | |
483 | rxvt_fontprop properties (); |
560 | rxvt_fontprop properties (); |
484 | |
561 | |
485 | bool load (const rxvt_fontprop &prop); |
562 | bool load (const rxvt_fontprop &prop, bool force_prop); |
486 | |
563 | |
487 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
564 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
488 | |
565 | |
489 | void draw (rxvt_drawable &d, int x, int y, |
566 | void draw (rxvt_drawable &d, int x, int y, |
490 | const text_t *text, int len, |
567 | const text_t *text, int len, |
491 | int fg, int bg); |
568 | int fg, int bg); |
492 | |
569 | |
493 | bool slow; // wether this is a proportional font or has other funny characteristics |
570 | bool slow; // whether this is a proportional font or has other funny characteristics |
494 | XFontStruct *f; |
571 | XFontStruct *f; |
495 | codeset cs; |
|
|
496 | bool enc2b, encm; |
572 | bool enc2b, encm; |
497 | |
573 | |
498 | char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
574 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
499 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
575 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
500 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
576 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
501 | bool set_properties (rxvt_fontprop &p, const char *name); |
577 | bool set_properties (rxvt_fontprop &p, const char *name); |
502 | }; |
578 | }; |
503 | |
579 | |
504 | char * |
580 | char * |
505 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
581 | rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const |
506 | { |
582 | { |
507 | unsigned long value; |
583 | unsigned long value; |
508 | |
584 | |
509 | if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value)) |
585 | if (XGetFontProperty (f, property, &value)) |
510 | return XGetAtomName (term->display->display, value); |
586 | return XGetAtomName (term->dpy, value); |
511 | else |
587 | else |
512 | return rxvt_strdup (repl); |
588 | return repl ? strdup (repl) : 0; |
513 | } |
589 | } |
514 | |
590 | |
515 | rxvt_fontprop |
591 | rxvt_fontprop |
516 | rxvt_font_x11::properties () |
592 | rxvt_font_x11::properties () |
517 | { |
593 | { |
… | |
… | |
521 | } |
597 | } |
522 | |
598 | |
523 | bool |
599 | bool |
524 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
600 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
525 | { |
601 | { |
526 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
602 | p.width = width != rxvt_fontprop::unset ? width |
|
|
603 | : avgwidth ? (avgwidth + 1) / 10 |
|
|
604 | : (height + 1) / 2; |
527 | p.height = height; |
605 | p.height = height; |
528 | p.ascent = rxvt_fontprop::unset; |
606 | p.ascent = rxvt_fontprop::unset; |
529 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
607 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
530 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
608 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
531 | |
609 | |
… | |
… | |
536 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
614 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
537 | { |
615 | { |
538 | unsigned long height; |
616 | unsigned long height; |
539 | |
617 | |
540 | #if 0 |
618 | #if 0 |
541 | if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height)) |
619 | if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height)) |
542 | return false; |
620 | return false; |
543 | #else |
621 | #else |
544 | height = f->ascent + f->descent; |
622 | height = f->ascent + f->descent; |
545 | #endif |
623 | #endif |
546 | |
624 | |
547 | unsigned long avgwidth; |
625 | unsigned long avgwidth; |
548 | if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth)) |
626 | if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth)) |
549 | avgwidth = 0; |
627 | avgwidth = 0; |
550 | |
628 | |
551 | char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
629 | char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium"); |
552 | char *slant = get_property (f, "SLANT", "r"); |
630 | char *slant = get_property (f, term->xa [XA_SLANT], "r"); |
553 | |
631 | |
554 | set_properties (p, height, weight, slant, avgwidth); |
632 | set_properties (p, height, weight, slant, avgwidth); |
555 | |
633 | |
556 | free (weight); |
634 | free (weight); |
557 | free (slant); |
635 | free (slant); |
… | |
… | |
597 | return false; |
675 | return false; |
598 | } |
676 | } |
599 | |
677 | |
600 | // fix the size of scalable fonts |
678 | // fix the size of scalable fonts |
601 | static bool |
679 | static bool |
602 | replace_field (char *buf, const char *name, int index, const char old, const char *replace) |
680 | replace_field (char **ptr, const char *name, int index, const char old, const char *replace) |
603 | { |
681 | { |
604 | int slashes = 0; |
682 | int slashes = 0; |
605 | const char *field, *end; |
683 | const char *field, *end; |
606 | |
684 | |
607 | for (const char *c = name; *c; c++) |
685 | for (const char *c = name; *c; c++) |
… | |
… | |
617 | break; |
695 | break; |
618 | } |
696 | } |
619 | |
697 | |
620 | if (slashes >= 13 && (!old || *field == old)) |
698 | if (slashes >= 13 && (!old || *field == old)) |
621 | { |
699 | { |
622 | // TODO: check for overflow in font-name |
700 | size_t len = field - name; |
623 | strncpy (buf, name, field - name); |
701 | *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); |
624 | buf += field - name; |
702 | memcpy (*ptr, name, len); |
625 | strcpy (buf, replace); |
703 | strcpy (*ptr + len, replace); |
626 | strcat (buf, end); |
704 | strcat (*ptr, end); |
627 | |
705 | |
628 | return true; |
706 | return true; |
629 | } |
707 | } |
630 | else |
708 | else |
631 | { |
709 | { |
632 | strcpy (buf, name); |
710 | *ptr = strdup (name); |
633 | |
711 | |
634 | return false; |
712 | return false; |
635 | } |
713 | } |
636 | } |
714 | } |
637 | |
715 | |
638 | bool |
716 | bool |
639 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
717 | rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop) |
640 | { |
718 | { |
641 | dTermDisplay; |
719 | dTermDisplay; |
642 | |
720 | |
643 | clear (); |
721 | clear (); |
644 | |
722 | |
645 | char field_str[64]; // enough for 128 bits |
723 | char field_str[64]; // enough for 128 bits |
646 | |
724 | |
647 | // first morph the font if required |
725 | // first morph the font if required |
648 | if (prop.weight != rxvt_fontprop::unset |
726 | if (force_prop) |
649 | || prop.slant != rxvt_fontprop::unset) |
|
|
650 | { |
727 | { |
651 | char fname[1024]; |
728 | char *fname; |
652 | |
729 | |
653 | if (name[0] != '-') |
730 | if (name[0] != '-') |
654 | { |
731 | { |
655 | f = XLoadQueryFont (disp, name); |
732 | f = XLoadQueryFont (disp, name); |
656 | |
733 | |
657 | if (!f) |
734 | if (!f) |
658 | return false; |
735 | return false; |
659 | |
736 | |
660 | char *new_name = get_property (f, "FONT", name); |
737 | char *new_name = get_property (f, XA_FONT, 0); |
661 | |
738 | |
662 | if (new_name) |
739 | if (new_name) |
663 | set_name (new_name); |
740 | set_name (new_name); |
664 | else |
741 | else |
665 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
742 | rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name); |
666 | |
743 | |
667 | XFreeFont (disp, f); |
744 | XFreeFont (disp, f); |
668 | f = 0; |
745 | f = 0; |
669 | } |
746 | } |
670 | |
747 | |
671 | if (prop.weight != rxvt_fontprop::unset) |
748 | if (prop.weight != rxvt_fontprop::unset) |
672 | { |
749 | { |
673 | replace_field (fname, name, 2, 0, |
750 | replace_field (&fname, name, 2, 0, |
674 | prop.weight < rxvt_fontprop::bold |
751 | prop.weight < rxvt_fontprop::bold |
675 | ? "medium" : "bold"); |
752 | ? "medium" : "bold"); |
676 | set_name (strdup (fname)); |
753 | set_name (fname); |
677 | } |
754 | } |
678 | |
755 | |
679 | if (prop.slant != rxvt_fontprop::unset) |
756 | if (prop.slant != rxvt_fontprop::unset) |
680 | { |
757 | { |
681 | replace_field (fname, name, 3, 0, |
758 | replace_field (&fname, name, 3, 0, |
682 | prop.slant < rxvt_fontprop::italic |
759 | prop.slant < rxvt_fontprop::italic |
683 | ? "r" : "i"); // TODO: handle "o"blique, too |
760 | ? "r" : "i"); // TODO: handle "o"blique, too |
684 | set_name (strdup (fname)); |
761 | set_name (fname); |
685 | } |
762 | } |
686 | } |
763 | } |
687 | |
764 | |
688 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
765 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
689 | ? 0 : prop.height); |
766 | ? 0 : prop.height); |
… | |
… | |
714 | font_weight *fonts = new font_weight[count]; |
791 | font_weight *fonts = new font_weight[count]; |
715 | |
792 | |
716 | for (int i = 0; i < count; i++) |
793 | for (int i = 0; i < count; i++) |
717 | { |
794 | { |
718 | rxvt_fontprop p; |
795 | rxvt_fontprop p; |
719 | char fname[1024]; |
796 | char *fname; |
720 | |
797 | |
721 | int diff = 0; |
798 | int diff = 0; |
722 | |
799 | |
723 | if (replace_field (fname, list[i], 6, '0', field_str)) |
800 | if (replace_field (&fname, list[i], 6, '0', field_str)) |
724 | diff += 10; // slightly penalize scalable fonts |
801 | diff += 10; // slightly penalize scalable fonts |
|
|
802 | else |
|
|
803 | { |
|
|
804 | free (fname); |
725 | else if (replace_field (fname, list[i], 11, '0', "0")) |
805 | if (replace_field (&fname, list[i], 11, '0', "0")) |
726 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
806 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
|
|
807 | } |
727 | |
808 | |
728 | if (!set_properties (p, fname)) |
809 | if (!set_properties (p, fname) |
|
|
810 | // also weed out too large fonts |
|
|
811 | || (prop.height != rxvt_fontprop::unset |
|
|
812 | && p.height > prop.height)) |
|
|
813 | { |
|
|
814 | free (fname); |
729 | continue; |
815 | continue; |
730 | |
816 | } |
731 | if (prop.height != rxvt_fontprop::unset |
|
|
732 | && p.height > prop.height) // weed out too large fonts |
|
|
733 | continue; |
|
|
734 | |
817 | |
735 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
818 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
736 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
819 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
737 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
820 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
738 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
821 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
739 | |
822 | |
740 | fonts[i].name = strdup (fname); |
823 | fonts[i].name = fname; |
741 | fonts[i].diff = diff; |
824 | fonts[i].diff = diff; |
742 | } |
825 | } |
743 | |
826 | |
744 | XFreeFontNames (list); |
827 | XFreeFontNames (list); |
745 | |
828 | |
746 | // this loop only iterates when the guessed font-size is too small |
829 | // this loop only iterates when the guessed font-size is too small |
747 | for (;;) |
830 | for (;;) |
748 | { |
831 | { |
749 | font_weight *best = fonts + count - 1; |
832 | font_weight *best = fonts; |
750 | |
833 | |
751 | for (font_weight *w = best; w-- > fonts; ) |
834 | for (font_weight *w = fonts + 1; w < fonts + count; w++) |
752 | if (w->diff <= best->diff) |
835 | if (w->diff < best->diff) |
753 | best = w; |
836 | best = w; |
754 | |
837 | |
755 | if (!best->name |
838 | if (!best->name |
756 | || !(f = XLoadQueryFont (disp, best->name))) |
839 | || !(f = XLoadQueryFont (disp, best->name))) |
757 | break; |
840 | break; |
… | |
… | |
774 | delete [] fonts; |
857 | delete [] fonts; |
775 | |
858 | |
776 | if (!f) |
859 | if (!f) |
777 | return false; |
860 | return false; |
778 | |
861 | |
779 | char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
862 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
780 | char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
863 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
|
|
864 | |
|
|
865 | cs = CS_UNKNOWN; |
781 | |
866 | |
782 | if (registry && encoding) |
867 | if (registry && encoding) |
783 | { |
868 | { |
784 | char charset[64]; |
869 | char charset[64]; |
785 | snprintf (charset, 64, "%s-%s", registry, encoding); |
870 | snprintf (charset, 64, "%s-%s", registry, encoding); |
786 | |
871 | |
787 | cs = codeset_from_name (charset); |
872 | cs = codeset_from_name (charset); |
788 | } |
873 | |
789 | else |
874 | if (cs == CS_UNKNOWN) |
|
|
875 | rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset); |
790 | { |
876 | } |
|
|
877 | |
|
|
878 | free (registry); |
|
|
879 | free (encoding); |
|
|
880 | |
|
|
881 | if (cs == CS_UNKNOWN) |
|
|
882 | { |
791 | const char *charset = get_property (f, "FONT", 0); |
883 | char *value = get_property (f, XA_FONT, 0); |
|
|
884 | const char *charset = value; |
792 | |
885 | |
793 | if (!charset) |
886 | if (!charset) |
794 | charset = name; |
887 | charset = name; |
795 | |
888 | |
796 | int count = 13; |
889 | int count = 13; |
797 | while (*charset) |
890 | while (*charset) |
798 | if (*charset++ == '-' && !--count) |
891 | if (*charset++ == '-' && !--count) |
799 | break; |
892 | break; |
800 | |
893 | |
801 | cs = codeset_from_name (charset); |
894 | cs = codeset_from_name (charset); |
|
|
895 | if (cs == CS_UNKNOWN) |
|
|
896 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
|
|
897 | |
|
|
898 | free (value); |
|
|
899 | } |
|
|
900 | |
|
|
901 | if (cs == CS_UNKNOWN) |
802 | } |
902 | { |
803 | |
903 | clear (); |
804 | free (registry); |
904 | return false; |
805 | free (encoding); |
905 | } |
806 | |
906 | |
807 | if (cs == CS_UNICODE) |
907 | if (cs == CS_UNICODE) |
808 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
908 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
809 | |
909 | |
810 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
910 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
811 | enc2b = encm || f->max_char_or_byte2 > 255; |
911 | enc2b = encm || f->max_char_or_byte2 > 255; |
812 | |
912 | |
813 | slow = false; |
913 | slow = false; |
814 | |
914 | |
815 | #if 1 // only used for slow detection, TODO optimize |
915 | #if 1 // only used for slow detection, TODO optimize |
816 | if (f->min_bounds.width == f->max_bounds.width) |
916 | if (f->min_bounds.width == f->max_bounds.width || !f->per_char) |
817 | width = f->min_bounds.width; |
|
|
818 | else if (f->per_char == NULL) |
|
|
819 | width = f->max_bounds.width; |
917 | width = f->max_bounds.width; |
820 | else |
918 | else |
821 | { |
919 | { |
822 | slow = true; |
920 | slow = true; |
823 | |
921 | |
824 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
922 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
825 | |
923 | |
826 | if (encm) |
924 | if (encm) |
827 | N += (f->max_byte1 - f->min_byte1) |
925 | N += (f->max_byte1 - f->min_byte1) |
828 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
926 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
829 | |
927 | |
830 | while (N) |
928 | while (N) |
831 | { |
929 | { |
832 | if (f->per_char[N].width > width) |
930 | if (f->per_char[N].width > width) |
833 | width = f->per_char[N].width; |
931 | width = f->per_char[N].width; |
834 | |
932 | |
… | |
… | |
837 | } |
935 | } |
838 | #endif |
936 | #endif |
839 | |
937 | |
840 | width = 1; |
938 | width = 1; |
841 | |
939 | |
842 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
940 | for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++) |
843 | { |
941 | { |
844 | if (cs != CS_UNICODE |
|
|
845 | && *t > 0x100 |
|
|
846 | && FROM_UNICODE (cs, *t) == NOCHAR) |
942 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
847 | continue; |
943 | continue; |
848 | |
944 | |
849 | // ignore characters we wouldn't use anyways |
945 | // ignore characters we wouldn't use anyways |
850 | bool careful; |
946 | bool careful; |
851 | if (!has_char (*t, &prop, careful)) |
947 | if (!has_char (*t, &prop, careful)) |
852 | continue; |
948 | continue; |
853 | |
949 | |
854 | XChar2b ch = { *t >> 8, *t }; |
950 | // the casts are needed in C++11 (see 8.5.1) |
|
|
951 | XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t }; |
855 | |
952 | |
856 | XCharStruct g; |
953 | XCharStruct g; |
857 | int dir_ret, asc_ret, des_ret; |
954 | int dir_ret, asc_ret, des_ret; |
858 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
955 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
859 | |
956 | |
|
|
957 | int wcw = WCWIDTH (*t); |
860 | int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
958 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
861 | |
959 | |
862 | if (width < g.width) width = g.width; |
960 | if (width < g.width) width = g.width; |
863 | } |
|
|
864 | |
|
|
865 | if (cs == CS_UNKNOWN) |
|
|
866 | { |
961 | } |
867 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
|
|
868 | |
962 | |
|
|
963 | #if 0 // do it per-character |
|
|
964 | if (prop && width > prop->width) |
|
|
965 | { |
869 | clear (); |
966 | clear (); |
870 | return false; |
967 | return false; |
871 | } |
968 | } |
872 | |
|
|
873 | #if 0 // do it per-character |
|
|
874 | if (prop && width > prop->width) |
|
|
875 | { |
|
|
876 | clear (); |
|
|
877 | return false; |
|
|
878 | } |
|
|
879 | #endif |
969 | #endif |
880 | |
970 | |
881 | return true; |
971 | return true; |
882 | } |
972 | } |
883 | |
973 | |
884 | void |
974 | void |
885 | rxvt_font_x11::clear () |
975 | rxvt_font_x11::clear () |
886 | { |
976 | { |
887 | if (f) |
977 | if (f) |
888 | { |
978 | { |
889 | XFreeFont (term->display->display, f); |
979 | XFreeFont (term->dpy, f); |
890 | f = 0; |
980 | f = 0; |
891 | } |
981 | } |
892 | } |
982 | } |
893 | |
983 | |
894 | bool |
984 | bool |
895 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
985 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
896 | { |
986 | { |
|
|
987 | careful = false; |
|
|
988 | |
897 | uint32_t ch = FROM_UNICODE (cs, unicode); |
989 | uint32_t ch = FROM_UNICODE (cs, unicode); |
898 | |
990 | |
899 | if (ch == NOCHAR) |
991 | if (ch == NOCHAR) |
900 | return false; |
992 | return false; |
901 | |
993 | |
902 | /* check wether the character exists in _this_ font. horrible. */ |
994 | /* check whether the character exists in _this_ font. horrible. */ |
903 | XCharStruct *xcs; |
995 | XCharStruct *xcs; |
904 | |
996 | |
905 | if (encm) |
997 | if (encm) |
906 | { |
998 | { |
907 | unsigned char byte1 = ch >> 8; |
999 | unsigned char byte1 = ch >> 8; |
… | |
… | |
937 | return false; |
1029 | return false; |
938 | |
1030 | |
939 | if (!prop || prop->width == rxvt_fontprop::unset) |
1031 | if (!prop || prop->width == rxvt_fontprop::unset) |
940 | return true; |
1032 | return true; |
941 | |
1033 | |
942 | // check character against base font bounding box |
1034 | // check whether character overlaps previous/next character |
943 | int w = xcs->rbearing - xcs->lbearing; |
1035 | int w = xcs->rbearing - xcs->lbearing; |
944 | int wcw = WCWIDTH (unicode); |
1036 | int wcw = max (WCWIDTH (unicode), 1); |
945 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
|
|
946 | |
1037 | |
947 | careful = w > prop->width; |
1038 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
|
|
1039 | |
948 | if (careful && OVERLAP_OK (w, prop)) |
1040 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
949 | return false; |
1041 | return false; |
950 | |
1042 | |
951 | return true; |
1043 | return true; |
952 | } |
1044 | } |
953 | |
1045 | |
… | |
… | |
964 | dTermDisplay; |
1056 | dTermDisplay; |
965 | dTermGC; |
1057 | dTermGC; |
966 | |
1058 | |
967 | bool slow = this->slow |
1059 | bool slow = this->slow |
968 | || width != term->fwidth |
1060 | || width != term->fwidth |
969 | || height != term->fheight; |
1061 | || height != term->fheight |
|
|
1062 | || ascent != f->ascent; |
970 | |
1063 | |
971 | int base = ascent; // sorry, incorrect: term->fbase; |
1064 | int base = ascent; // sorry, incorrect: term->fbase; |
972 | |
1065 | |
973 | XGCValues v; |
1066 | XGCValues v; |
974 | v.foreground = term->pix_colors[fg]; |
1067 | v.foreground = term->pix_colors[fg]; |
… | |
… | |
987 | else |
1080 | else |
988 | { |
1081 | { |
989 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1082 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
990 | |
1083 | |
991 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1084 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
992 | |
1085 | |
993 | if (slow) |
1086 | if (slow) |
994 | { |
1087 | { |
995 | do |
1088 | do |
996 | { |
1089 | { |
997 | if (xc->byte1 || xc->byte2) |
1090 | if (xc->byte1 || xc->byte2) |
… | |
… | |
1019 | else |
1112 | else |
1020 | { |
1113 | { |
1021 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1114 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1022 | |
1115 | |
1023 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1116 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1024 | |
1117 | |
1025 | if (slow) |
1118 | if (slow) |
1026 | { |
1119 | { |
1027 | do |
1120 | do |
1028 | { |
1121 | { |
1029 | if (*xc) |
1122 | if (*xc) |
… | |
… | |
1042 | |
1135 | |
1043 | ///////////////////////////////////////////////////////////////////////////// |
1136 | ///////////////////////////////////////////////////////////////////////////// |
1044 | |
1137 | |
1045 | #if XFT |
1138 | #if XFT |
1046 | |
1139 | |
1047 | struct rxvt_font_xft : rxvt_font { |
1140 | struct rxvt_font_xft : rxvt_font |
|
|
1141 | { |
|
|
1142 | #if XFT_CHAR_CACHE |
|
|
1143 | // we cache the qascii range xoffsets in the name of speed, |
|
|
1144 | // expecting terminals to deal mostly with these characters |
|
|
1145 | // we also assume the xoff always fits into uint8_t, |
|
|
1146 | // which is questionable, but let's see... |
|
|
1147 | // also, it is uncomfortably bug, due toit he uints. |
|
|
1148 | enum { char_cache_min = 0x20, char_cache_max = 0x7e }; |
|
|
1149 | uint8_t xoff_cache [char_cache_max - char_cache_min + 1]; |
|
|
1150 | FT_UInt glyph_cache [char_cache_max - char_cache_min + 1]; |
|
|
1151 | #endif |
|
|
1152 | |
1048 | rxvt_font_xft () { f = 0; } |
1153 | rxvt_font_xft () |
|
|
1154 | { |
|
|
1155 | f = 0; |
|
|
1156 | } |
1049 | |
1157 | |
1050 | void clear (); |
1158 | void clear (); |
1051 | |
1159 | |
1052 | rxvt_fontprop properties (); |
1160 | rxvt_fontprop properties (); |
1053 | |
1161 | |
1054 | bool load (const rxvt_fontprop &prop); |
1162 | bool load (const rxvt_fontprop &prop, bool force_prop); |
1055 | |
1163 | |
1056 | void draw (rxvt_drawable &d, int x, int y, |
1164 | void draw (rxvt_drawable &d, int x, int y, |
1057 | const text_t *text, int len, |
1165 | const text_t *text, int len, |
1058 | int fg, int bg); |
1166 | int fg, int bg); |
1059 | |
1167 | |
1060 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; |
1168 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
1061 | |
1169 | |
1062 | protected: |
1170 | protected: |
1063 | XftFont *f; |
1171 | XftFont *f; |
1064 | }; |
1172 | }; |
1065 | |
1173 | |
1066 | void |
1174 | void |
1067 | rxvt_font_xft::clear () |
1175 | rxvt_font_xft::clear () |
1068 | { |
1176 | { |
1069 | if (f) |
1177 | if (f) |
1070 | { |
1178 | { |
1071 | XftFontClose (term->display->display, f); |
1179 | XftFontClose (term->dpy, f); |
1072 | f = 0; |
1180 | f = 0; |
1073 | } |
1181 | } |
1074 | } |
1182 | } |
1075 | |
1183 | |
1076 | rxvt_fontprop |
1184 | rxvt_fontprop |
… | |
… | |
1092 | |
1200 | |
1093 | return p; |
1201 | return p; |
1094 | } |
1202 | } |
1095 | |
1203 | |
1096 | bool |
1204 | bool |
1097 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1205 | rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop) |
1098 | { |
1206 | { |
1099 | dTermDisplay; |
1207 | dTermDisplay; |
1100 | |
1208 | |
1101 | clear (); |
1209 | clear (); |
1102 | |
1210 | |
… | |
… | |
1111 | && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
1219 | && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
1112 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1220 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1113 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1221 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1114 | |
1222 | |
1115 | if (prop.weight != rxvt_fontprop::unset |
1223 | if (prop.weight != rxvt_fontprop::unset |
1116 | && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
1224 | && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)) |
1117 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1225 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1118 | |
1226 | |
1119 | if (prop.slant != rxvt_fontprop::unset |
1227 | if (prop.slant != rxvt_fontprop::unset |
1120 | && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) |
1228 | && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)) |
1121 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1229 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1122 | |
1230 | |
1123 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1231 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1124 | // clip width, we can't do better, or can we? |
1232 | // clip width, we can't do better, or can we? |
1125 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1233 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1126 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); |
1234 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); |
1127 | #endif |
1235 | #endif |
1128 | |
1236 | |
1129 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1237 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1130 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1238 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1131 | |
1239 | |
… | |
… | |
1143 | int ftheight = 0; |
1251 | int ftheight = 0; |
1144 | bool success = true; |
1252 | bool success = true; |
1145 | |
1253 | |
1146 | for (;;) |
1254 | for (;;) |
1147 | { |
1255 | { |
|
|
1256 | p = FcPatternDuplicate (match); |
1148 | f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); |
1257 | f = XftFontOpenPattern (disp, p); |
1149 | |
1258 | |
1150 | if (!f) |
1259 | if (!f) |
1151 | { |
1260 | { |
|
|
1261 | FcPatternDestroy (p); |
1152 | success = false; |
1262 | success = false; |
1153 | break; |
1263 | break; |
1154 | } |
1264 | } |
1155 | |
1265 | |
1156 | FT_Face face = XftLockFace (f); |
1266 | FT_Face face = XftLockFace (f); |
… | |
… | |
1164 | |
1274 | |
1165 | XftUnlockFace (f); |
1275 | XftUnlockFace (f); |
1166 | |
1276 | |
1167 | int glheight = height; |
1277 | int glheight = height; |
1168 | |
1278 | |
1169 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1279 | for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++) |
1170 | { |
1280 | { |
1171 | FcChar16 ch = *t; |
1281 | FcChar16 ch = *t; |
1172 | |
1282 | |
1173 | if (cs != CS_UNICODE |
1283 | if (cs != CS_UNICODE |
1174 | && ch > 0x100 |
1284 | && ch > 0x100 |
… | |
… | |
1193 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
1303 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
1194 | } |
1304 | } |
1195 | |
1305 | |
1196 | if (!width) |
1306 | if (!width) |
1197 | { |
1307 | { |
1198 | rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); |
1308 | rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name); |
1199 | |
1309 | width = f->max_advance_width; |
1200 | XftFontClose (disp, f); |
|
|
1201 | f = 0; |
|
|
1202 | |
|
|
1203 | success = false; |
|
|
1204 | break; |
1310 | break; |
1205 | } |
1311 | } |
1206 | |
1312 | |
1207 | if (prop.height == rxvt_fontprop::unset |
1313 | if (prop.height == rxvt_fontprop::unset |
1208 | || (height <= prop.height && glheight <= prop.height) |
1314 | || (height <= prop.height && glheight <= prop.height) |
… | |
… | |
1235 | clear (); |
1341 | clear (); |
1236 | success = false; |
1342 | success = false; |
1237 | } |
1343 | } |
1238 | #endif |
1344 | #endif |
1239 | |
1345 | |
|
|
1346 | #if XFT_CHAR_CACHE |
|
|
1347 | // populate char cache |
|
|
1348 | for (FcChar16 ch = char_cache_min; ch <= char_cache_max; ++ch) |
|
|
1349 | { |
|
|
1350 | FT_UInt glyph = XftCharIndex (disp, f, ch); |
|
|
1351 | glyph_cache [ch - char_cache_min] = glyph; |
|
|
1352 | |
|
|
1353 | XGlyphInfo g; |
|
|
1354 | XftGlyphExtents (disp, f, &glyph, 1, &g); |
|
|
1355 | xoff_cache [ch - char_cache_min] = g.xOff; |
|
|
1356 | } |
|
|
1357 | #endif |
|
|
1358 | |
1240 | return success; |
1359 | return success; |
1241 | } |
1360 | } |
1242 | |
1361 | |
1243 | bool |
1362 | bool |
1244 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1363 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1245 | { |
1364 | { |
1246 | careful = false; |
1365 | careful = false; |
1247 | |
1366 | |
|
|
1367 | // handle non-bmp chars when text_t is 16 bit |
|
|
1368 | #if ENABLE_COMBINING && !UNICODE_3 |
|
|
1369 | if (ecb_expect_false (IS_COMPOSE (unicode))) |
|
|
1370 | if (compose_char *cc = rxvt_composite [unicode]) |
|
|
1371 | if (cc->c2 == NOCHAR) |
|
|
1372 | unicode = cc->c1; |
|
|
1373 | else |
|
|
1374 | return false; |
|
|
1375 | else |
|
|
1376 | return false; |
|
|
1377 | #endif |
|
|
1378 | |
|
|
1379 | FcChar32 chr = unicode; |
|
|
1380 | |
1248 | if (!XftCharExists (term->display->display, f, unicode)) |
1381 | if (!XftCharExists (term->dpy, f, chr)) |
1249 | return false; |
1382 | return false; |
1250 | |
1383 | |
1251 | if (!prop || prop->width == rxvt_fontprop::unset) |
1384 | if (!prop || prop->width == rxvt_fontprop::unset) |
1252 | return true; |
1385 | return true; |
1253 | |
1386 | |
1254 | // check character against base font bounding box |
1387 | int wcw = max (WCWIDTH (chr), 1); |
1255 | FcChar32 ch = unicode; |
1388 | |
1256 | XGlyphInfo g; |
1389 | XGlyphInfo g; |
1257 | XftTextExtents32 (term->display->display, f, &ch, 1, &g); |
1390 | XftTextExtents32 (term->dpy, f, &chr, 1, &g); |
1258 | |
1391 | |
1259 | int w = g.width - g.x; |
1392 | int w = g.width - g.x; |
1260 | int wcw = WCWIDTH (unicode); |
|
|
1261 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
|
|
1262 | |
1393 | |
1263 | careful = w > prop->width; |
1394 | careful = g.x > 0 || w > prop->width * wcw; |
|
|
1395 | |
1264 | if (careful && OVERLAP_OK (w, prop)) |
1396 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
|
|
1397 | return false; |
|
|
1398 | |
|
|
1399 | // this weeds out _totally_ broken fonts, or glyphs |
|
|
1400 | if (!OVERLAP_OK (g.xOff, wcw, prop)) |
1265 | return false; |
1401 | return false; |
1266 | |
1402 | |
1267 | return true; |
1403 | return true; |
1268 | } |
1404 | } |
1269 | |
1405 | |
1270 | void |
1406 | void |
1271 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1407 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1272 | const text_t *text, int len, |
1408 | const text_t *text, int len, |
1273 | int fg, int bg) |
1409 | int fg, int bg) |
1274 | { |
1410 | { |
1275 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1411 | XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); |
1276 | |
|
|
1277 | XGlyphInfo extents; |
|
|
1278 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
|
|
1279 | XftGlyphSpec *ep = enc; |
1412 | XftGlyphSpec *ep = enc; |
1280 | |
1413 | |
1281 | dTermDisplay; |
1414 | dTermDisplay; |
1282 | dTermGC; |
1415 | dTermGC; |
|
|
1416 | |
|
|
1417 | int w = term->fwidth * len; |
|
|
1418 | int h = term->fheight; |
|
|
1419 | |
|
|
1420 | bool buffered = bg >= Color_transparent |
|
|
1421 | && term->option (Opt_buffered); |
1283 | |
1422 | |
1284 | // cut trailing spaces |
1423 | // cut trailing spaces |
1285 | while (len && text [len - 1] == ' ') |
1424 | while (len && text [len - 1] == ' ') |
1286 | len--; |
1425 | len--; |
1287 | |
1426 | |
|
|
1427 | int x_ = buffered ? 0 : x; |
|
|
1428 | int y_ = buffered ? 0 : y; |
|
|
1429 | |
1288 | while (len) |
1430 | while (len) |
1289 | { |
1431 | { |
1290 | int cwidth = term->fwidth; |
1432 | int cwidth = term->fwidth; |
1291 | FcChar32 fc = *text++; len--; |
1433 | FcChar32 chr = *text++; len--; |
1292 | |
1434 | |
1293 | while (len && *text == NOCHAR) |
1435 | while (len && *text == NOCHAR) |
1294 | text++, len--, cwidth += term->fwidth; |
1436 | text++, len--, cwidth += term->fwidth; |
1295 | |
1437 | |
1296 | if (fc != ' ') // skip spaces |
1438 | if (chr != ' ') // skip spaces |
|
|
1439 | { |
|
|
1440 | // handle non-bmp chars when text_t is 16 bit |
|
|
1441 | #if ENABLE_COMBINING && !UNICODE_3 |
|
|
1442 | if (ecb_expect_false (IS_COMPOSE (chr))) |
|
|
1443 | if (compose_char *cc = rxvt_composite [chr]) |
|
|
1444 | if (cc->c2 == NOCHAR) |
|
|
1445 | chr = cc->c1; |
|
|
1446 | #endif |
|
|
1447 | |
|
|
1448 | #if 0 |
|
|
1449 | FT_UInt glyphs [decltype (exp)::max_size]; |
|
|
1450 | |
|
|
1451 | for (int i = 0; i < nchrs; ++i) |
|
|
1452 | glyphs [i] = XftCharIndex (disp, f, chrs [i]); |
|
|
1453 | |
|
|
1454 | for (int i = 0; i < nchrs; ++i) |
1297 | { |
1455 | { |
|
|
1456 | XGlyphInfo ep; |
|
|
1457 | XftGlyphExtents (disp, f, glyphs+i, 1, &ep); |
|
|
1458 | printf ("gs %4x g %4x + %3d,%3d o %3d,%3d wh %3d,%3d\n", chrs[i],glyphs[i],ep.x,ep.y,ep.xOff,ep.yOff,ep.width,ep.height); |
|
|
1459 | } |
|
|
1460 | #endif |
|
|
1461 | |
|
|
1462 | FT_UInt glyph; |
|
|
1463 | int xOff; |
|
|
1464 | |
|
|
1465 | #if XFT_CHAR_CACHE |
|
|
1466 | if (ecb_expect_true (IN_RANGE_INC (chr, char_cache_min, char_cache_max))) |
|
|
1467 | { |
|
|
1468 | glyph = glyph_cache [chr - char_cache_min]; |
|
|
1469 | xOff = xoff_cache [chr - char_cache_min]; |
|
|
1470 | } |
|
|
1471 | else |
|
|
1472 | #endif |
|
|
1473 | { |
1298 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1474 | glyph = XftCharIndex (disp, f, chr); |
|
|
1475 | XGlyphInfo extents; |
1299 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1476 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
|
|
1477 | xOff = extents.xOff; |
|
|
1478 | } |
1300 | |
1479 | |
1301 | ep->glyph = glyph; |
1480 | ep->glyph = glyph; |
1302 | ep->x = x + (cwidth - extents.xOff >> 1); |
1481 | ep->x = x_; |
1303 | ep->y = y + ascent; |
1482 | ep->y = y_ + ascent; |
|
|
1483 | |
|
|
1484 | // the xft font cell might differ from the terminal font cell, |
|
|
1485 | // in which case we use the average between the two. |
|
|
1486 | ep->x += xOff ? cwidth - xOff >> 1 : 0; |
|
|
1487 | |
|
|
1488 | // xft/freetype represent combining characters as characters with zero |
|
|
1489 | // width rendered over the previous character with some fonts, while |
|
|
1490 | // in other fonts, they are considered normal characters, while yet |
|
|
1491 | // in other fonts, they are shifted all over the place. |
|
|
1492 | // we handle the first two cases by keying off on xOff being 0 |
|
|
1493 | // for zero-width chars. normally, we would add extents.xOff |
|
|
1494 | // of the base character here, but we don't have that, so we use cwidth. |
|
|
1495 | ep->x += xOff ? 0 : cwidth; |
|
|
1496 | |
1304 | ep++; |
1497 | ++ep; |
1305 | } |
1498 | } |
1306 | |
1499 | |
1307 | x += cwidth; |
1500 | x_ += cwidth; |
|
|
1501 | } |
|
|
1502 | |
|
|
1503 | if (buffered) |
1308 | } |
1504 | { |
1309 | |
|
|
1310 | if (ep != enc) |
1505 | if (ep != enc) |
|
|
1506 | { |
|
|
1507 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
|
|
1508 | |
|
|
1509 | #ifdef HAVE_IMG |
|
|
1510 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
|
|
1511 | |
|
|
1512 | if (term->bg_img |
|
|
1513 | && (bg == Color_transparent || bg == Color_bg |
|
|
1514 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
|
|
1515 | { |
|
|
1516 | int src_x = x, src_y = y; |
|
|
1517 | |
|
|
1518 | if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT) |
|
|
1519 | { |
|
|
1520 | src_x += term->window_vt_x; |
|
|
1521 | src_y += term->window_vt_y; |
|
|
1522 | } |
|
|
1523 | |
|
|
1524 | if (term->bg_img->w >= src_x + w |
|
|
1525 | && term->bg_img->h >= src_y + h) |
|
|
1526 | { |
|
|
1527 | XCopyArea (disp, term->bg_img->pm, d2, gc, |
|
|
1528 | src_x, src_y, w, h, 0, 0); |
|
|
1529 | } |
|
|
1530 | else |
|
|
1531 | { |
|
|
1532 | XGCValues gcv; |
|
|
1533 | |
|
|
1534 | gcv.fill_style = FillTiled; |
|
|
1535 | gcv.tile = term->bg_img->pm; |
|
|
1536 | gcv.ts_x_origin = -src_x; |
|
|
1537 | gcv.ts_y_origin = -src_y; |
|
|
1538 | |
|
|
1539 | XChangeGC (disp, gc, |
|
|
1540 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
|
|
1541 | &gcv); |
|
|
1542 | |
|
|
1543 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
|
|
1544 | |
|
|
1545 | gcv.fill_style = FillSolid; |
|
|
1546 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
|
|
1547 | } |
|
|
1548 | |
|
|
1549 | if (dst) |
|
|
1550 | { |
|
|
1551 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1552 | |
|
|
1553 | // dst can only be set when bg >= 0 |
|
|
1554 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
1555 | } |
|
|
1556 | } |
|
|
1557 | else |
|
|
1558 | #endif |
|
|
1559 | XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h); |
|
|
1560 | |
|
|
1561 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
|
|
1562 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
|
|
1563 | } |
|
|
1564 | else |
|
|
1565 | clear_rect (d, x, y, w, h, bg); |
|
|
1566 | } |
|
|
1567 | else |
|
|
1568 | { |
|
|
1569 | clear_rect (d, x, y, w, h, bg); |
1311 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
1570 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
|
|
1571 | } |
1312 | } |
1572 | } |
|
|
1573 | |
1313 | #endif |
1574 | #endif |
1314 | |
1575 | |
1315 | ///////////////////////////////////////////////////////////////////////////// |
1576 | ///////////////////////////////////////////////////////////////////////////// |
1316 | |
1577 | |
1317 | rxvt_fontset::rxvt_fontset (rxvt_term *term) |
1578 | rxvt_fontset::rxvt_fontset (rxvt_term *term) |
… | |
… | |
1328 | void |
1589 | void |
1329 | rxvt_fontset::clear () |
1590 | rxvt_fontset::clear () |
1330 | { |
1591 | { |
1331 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1592 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1332 | = rxvt_fontprop::unset; |
1593 | = rxvt_fontprop::unset; |
|
|
1594 | force_prop = false; |
1333 | |
1595 | |
1334 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1596 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1335 | FONT_UNREF (*i); |
1597 | (*i)->unref (); |
1336 | |
1598 | |
1337 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1599 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1338 | delete *p; |
1600 | delete *p; |
1339 | |
1601 | |
1340 | free (fontdesc); fontdesc = 0; |
1602 | free (fontdesc); fontdesc = 0; |
… | |
… | |
1342 | fonts.clear (); |
1604 | fonts.clear (); |
1343 | |
1605 | |
1344 | fallback = fallback_fonts; |
1606 | fallback = fallback_fonts; |
1345 | } |
1607 | } |
1346 | |
1608 | |
|
|
1609 | void |
|
|
1610 | rxvt_fontset::prepare_font (rxvt_font *font, codeset cs) |
|
|
1611 | { |
|
|
1612 | font->set_term (term); |
|
|
1613 | |
|
|
1614 | font->cs = cs; |
|
|
1615 | font->loaded = false; |
|
|
1616 | } |
|
|
1617 | |
1347 | rxvt_font * |
1618 | rxvt_font * |
1348 | rxvt_fontset::new_font (const char *name, codeset cs) |
1619 | rxvt_fontset::new_font (const char *name, codeset cs) |
1349 | { |
1620 | { |
1350 | rxvt_font *f; |
1621 | rxvt_font *f; |
1351 | |
1622 | |
1352 | if (!name || !*name) |
1623 | if (!name || !*name) |
1353 | { |
1624 | { |
1354 | name = ""; |
1625 | name = ""; |
1355 | f = new rxvt_font_default (this); |
1626 | f = new rxvt_font_default (this); |
1356 | } |
1627 | } |
… | |
… | |
1367 | f = new rxvt_font_x11; |
1638 | f = new rxvt_font_x11; |
1368 | } |
1639 | } |
1369 | else |
1640 | else |
1370 | f = new rxvt_font_x11; |
1641 | f = new rxvt_font_x11; |
1371 | |
1642 | |
1372 | f->set_term (term); |
|
|
1373 | f->set_name (strdup (name)); |
1643 | f->set_name (strdup (name)); |
1374 | |
1644 | prepare_font (f, cs); |
1375 | f->cs = cs; |
|
|
1376 | f->loaded = false; |
|
|
1377 | |
1645 | |
1378 | return f; |
1646 | return f; |
1379 | } |
1647 | } |
1380 | |
1648 | |
1381 | ///////////////////////////////////////////////////////////////////////////// |
1649 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1650 | |
|
|
1651 | void |
|
|
1652 | rxvt_fontset::push_font (rxvt_font *font) |
|
|
1653 | { |
|
|
1654 | // the fontCount index is reserved for the overflow font, it is only |
|
|
1655 | // necessary when we get fontCount or more fonts, as they cannot be |
|
|
1656 | // represented in the rendition. |
|
|
1657 | if (fonts.size () == fontCount) |
|
|
1658 | { |
|
|
1659 | rxvt_font *f = new rxvt_font_overflow (this); |
|
|
1660 | |
|
|
1661 | prepare_font (f, CS_UNICODE); |
|
|
1662 | fonts.push_back (f); |
|
|
1663 | } |
|
|
1664 | |
|
|
1665 | fonts.push_back (font); |
|
|
1666 | } |
1382 | |
1667 | |
1383 | void |
1668 | void |
1384 | rxvt_fontset::add_fonts (const char *desc) |
1669 | rxvt_fontset::add_fonts (const char *desc) |
1385 | { |
1670 | { |
1386 | if (desc) |
1671 | if (desc) |
… | |
… | |
1415 | cs = codeset_from_name (spec + sizeof ("codeset=") - 1); |
1700 | cs = codeset_from_name (spec + sizeof ("codeset=") - 1); |
1416 | else |
1701 | else |
1417 | rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); |
1702 | rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); |
1418 | |
1703 | |
1419 | desc++; |
1704 | desc++; |
1420 | while (*desc <= ' ') desc++; |
1705 | while (*desc <= ' ' && *desc) desc++; |
1421 | } |
1706 | } |
1422 | |
1707 | |
1423 | end = strchr (desc, ','); |
1708 | end = strchr (desc, ','); |
1424 | if (!end) |
1709 | if (!end) |
1425 | end = desc + strlen (desc); |
1710 | end = desc + strlen (desc); |
1426 | |
1711 | |
1427 | if (end - desc < 511) |
1712 | if (end - desc < 511) |
1428 | { |
1713 | { |
1429 | strncpy (buf, desc, end - desc); |
1714 | memcpy (buf, desc, end - desc); |
1430 | buf[end - desc] = 0; |
1715 | buf[end - desc] = 0; |
1431 | |
1716 | |
1432 | fonts.push_back (new_font (buf, cs)); |
1717 | push_font (new_font (buf, cs)); |
1433 | } |
1718 | } |
1434 | else |
1719 | else |
1435 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1720 | rxvt_warn ("fontset element too long (>511 bytes), ignored.\n"); |
1436 | |
1721 | |
1437 | desc = end + 1; |
1722 | desc = end + 1; |
1438 | } |
1723 | } |
1439 | while (*end); |
1724 | while (*end); |
1440 | } |
1725 | } |
… | |
… | |
1449 | if (fonts[i]->loaded) |
1734 | if (fonts[i]->loaded) |
1450 | return true; |
1735 | return true; |
1451 | |
1736 | |
1452 | fonts[i]->loaded = true; |
1737 | fonts[i]->loaded = true; |
1453 | |
1738 | |
1454 | if (!fonts[i]->load (prop)) |
1739 | if (!fonts[i]->load (prop, force_prop)) |
1455 | { |
1740 | { |
1456 | fonts[i]->cs = CS_UNKNOWN; |
1741 | fonts[i]->cs = CS_UNKNOWN; |
1457 | return false; |
1742 | return false; |
1458 | } |
1743 | } |
1459 | |
1744 | |
… | |
… | |
1465 | { |
1750 | { |
1466 | clear (); |
1751 | clear (); |
1467 | |
1752 | |
1468 | fontdesc = strdup (desc); |
1753 | fontdesc = strdup (desc); |
1469 | |
1754 | |
1470 | fonts.push_back (new_font (0, CS_UNICODE)); |
1755 | push_font (new_font (0, CS_UNICODE)); |
1471 | realize_font (0); |
1756 | realize_font (0); |
1472 | |
1757 | |
1473 | add_fonts (desc); |
1758 | add_fonts (desc); |
1474 | |
1759 | |
1475 | return true; |
1760 | return true; |
… | |
… | |
1484 | |
1769 | |
1485 | return -1; |
1770 | return -1; |
1486 | } |
1771 | } |
1487 | |
1772 | |
1488 | int |
1773 | int |
1489 | rxvt_fontset::find_font (unicode_t unicode) |
1774 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1490 | { |
1775 | { |
1491 | if (unicode >= 1<<20) |
1776 | // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3 |
|
|
1777 | if (unicode > 0x1fffff) |
1492 | return 0; |
1778 | return 0; |
1493 | |
1779 | |
1494 | unicode_t hi = unicode >> 8; |
1780 | unicode_t hi = unicode >> 8; |
1495 | |
1781 | |
1496 | if (hi < fmap.size () |
1782 | if (hi < fmap.size ()) |
1497 | && fmap[hi] |
1783 | if (pagemap *pm = fmap[hi]) |
1498 | && (*fmap[hi])[unicode & 0xff] != 0xff) |
1784 | if ((*pm)[unicode & 0xff] != 0xff) |
1499 | return (*fmap[hi])[unicode & 0xff]; |
1785 | return (*pm)[unicode & 0xff]; |
1500 | |
1786 | |
1501 | unsigned int i; |
1787 | unsigned int i; |
1502 | |
1788 | |
1503 | for (i = 0; i < fonts.size (); i++) |
1789 | for (i = 0; i < fonts.size (); i++) |
1504 | { |
1790 | { |
… | |
… | |
1520 | goto next_font; |
1806 | goto next_font; |
1521 | |
1807 | |
1522 | bool careful; |
1808 | bool careful; |
1523 | if (f->has_char (unicode, &prop, careful)) |
1809 | if (f->has_char (unicode, &prop, careful)) |
1524 | { |
1810 | { |
1525 | if (careful) |
1811 | i = (i << 1) | careful; |
1526 | i |= 128; |
|
|
1527 | |
1812 | |
1528 | goto found; |
1813 | goto found; |
1529 | } |
1814 | } |
1530 | |
1815 | |
1531 | next_font: |
1816 | next_font: |
1532 | if (i == fonts.size () - 1) |
1817 | if (i == fonts.size () - 1) |
1533 | { |
1818 | { |
|
|
1819 | // compose characters are handled by the default font, unless another font takes over |
|
|
1820 | // we do not go via the fallback list for speed reasons. |
|
|
1821 | if (IS_COMPOSE (unicode)) |
|
|
1822 | return 0; |
|
|
1823 | |
1534 | if (fallback->name) |
1824 | if (fallback->name) |
1535 | { |
1825 | { |
1536 | // search through the fallback list |
1826 | // search through the fallback list |
1537 | fonts.push_back (new_font (fallback->name, fallback->cs)); |
1827 | push_font (new_font (fallback->name, fallback->cs)); |
1538 | fallback++; |
1828 | fallback++; |
1539 | } |
1829 | } |
1540 | else |
1830 | else |
1541 | { |
1831 | { |
1542 | // try to find a new font. |
1832 | // try to find a new font. |
… | |
… | |
1544 | // way to configure this and xft is easier to hack in, |
1834 | // way to configure this and xft is easier to hack in, |
1545 | // while x11 has more framework in place already. |
1835 | // while x11 has more framework in place already. |
1546 | // TODO: this is a real resource hog, xft takes ages(?) |
1836 | // TODO: this is a real resource hog, xft takes ages(?) |
1547 | #if XFT && USE_SLOW_LOOKUP |
1837 | #if XFT && USE_SLOW_LOOKUP |
1548 | // grab the first xft font that seems suitable |
1838 | // grab the first xft font that seems suitable |
|
|
1839 | // TOOD: should go first for cellchar (spacing 110) then mono, then else |
1549 | FcPattern *p = FcPatternCreate (); |
1840 | FcPattern *p = FcPatternCreate (); |
1550 | |
1841 | |
1551 | FcCharSet *s = FcCharSetCreate (); |
1842 | FcCharSet *s = FcCharSetCreate (); |
1552 | FcCharSetAddChar (s, unicode); |
1843 | FcCharSetAddChar (s, unicode); |
1553 | FcPatternAddCharSet (p, FC_CHARSET, s); |
1844 | FcPatternAddCharSet (p, FC_CHARSET, s); |
… | |
… | |
1560 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1851 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1561 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1852 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1562 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1853 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1563 | |
1854 | |
1564 | XftResult result; |
1855 | XftResult result; |
1565 | FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result); |
1856 | FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result); |
1566 | |
1857 | |
1567 | FcPatternDestroy (p); |
1858 | FcPatternDestroy (p); |
1568 | |
1859 | |
1569 | if (match) |
1860 | if (match) |
1570 | { |
1861 | { |
… | |
… | |
1573 | FcPatternDestroy (match); |
1864 | FcPatternDestroy (match); |
1574 | |
1865 | |
1575 | if (find_font (font) < 0) |
1866 | if (find_font (font) < 0) |
1576 | { |
1867 | { |
1577 | char fontname[4096]; |
1868 | char fontname[4096]; |
1578 | sprintf (fontname, "xft:%-.4090s", font); |
1869 | snprintf (fontname, sizeof (fontname), "xft:%s", font); |
1579 | |
1870 | |
1580 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1871 | push_font (new_font (fontname, CS_UNICODE)); |
1581 | } |
1872 | } |
1582 | |
1873 | |
1583 | free (font); |
1874 | free (font); |
1584 | } |
1875 | } |
1585 | #endif |
1876 | #endif |
… | |
… | |
1597 | while (hi >= fmap.size ()) |
1888 | while (hi >= fmap.size ()) |
1598 | fmap.push_back (0); |
1889 | fmap.push_back (0); |
1599 | |
1890 | |
1600 | if (!fmap[hi]) |
1891 | if (!fmap[hi]) |
1601 | { |
1892 | { |
1602 | fmap[hi] = (pagemap *)new pagemap; |
1893 | fmap[hi] = new pagemap; |
1603 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1894 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1604 | } |
1895 | } |
1605 | |
1896 | |
1606 | (*fmap[hi])[unicode & 0xff] = i; |
1897 | (*fmap[hi])[unicode & 0xff] = i; |
1607 | } |
1898 | } |
1608 | |
1899 | |
1609 | return i; |
1900 | return i; |
1610 | } |
1901 | } |
1611 | |
1902 | |
1612 | |
|
|
1613 | |
|
|