1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*--------------------------------*-C-*---------------------------------* |
2 | * File: defaultfont.C |
2 | * File: rxvtfont.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
4 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
5 | * - original version. |
5 | * - original version. |
6 | * |
6 | * |
7 | * This program is free software; you can redistribute it and/or modify |
7 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by |
8 | * it under the terms of the GNU General Public License as published by |
9 | * the Free Software Foundation; either version 2 of the License, or |
9 | * the Free Software Foundation; either version 2 of the License, or |
… | |
… | |
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * GNU General Public License for more details. |
15 | * GNU General Public License for more details. |
16 | * |
16 | * |
17 | * You should have received a copy of the GNU General Public License |
17 | * You should have received a copy of the GNU General Public License |
18 | * along with this program; if not, write to the Free Software |
18 | * along with this program; if not, write to the Free Software |
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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" |
24 | #include "rxvtutil.h" |
25 | #include "rxvtutil.h" |
25 | #include "rxvtfont.h" |
26 | #include "rxvtfont.h" |
26 | |
27 | |
27 | #include <cstdlib> |
28 | #include <cstdlib> |
28 | #include <wchar.h> |
29 | |
29 | #include <inttypes.h> |
30 | #include <inttypes.h> |
30 | |
31 | |
31 | #define DISPLAY r->display->display |
|
|
32 | #define TGC r->TermWin.gc |
|
|
33 | |
|
|
34 | #define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width |
32 | #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 |
|
|
34 | |
|
|
35 | #define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ |
|
|
36 | (prop)->slant >= rxvt_fontprop::italic \ |
|
|
37 | ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
|
|
38 | : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
|
|
39 | )) |
35 | |
40 | |
36 | const struct rxvt_fallback_font { |
41 | const struct rxvt_fallback_font { |
37 | codeset cs; |
42 | codeset cs; |
38 | const char *name; |
43 | const char *name; |
39 | } fallback_fonts[] = { |
44 | } fallback_fonts[] = { |
… | |
… | |
59 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
64 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
60 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
65 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
61 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
66 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
62 | |
67 | |
63 | # if XFT |
68 | # if XFT |
64 | { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, |
69 | { CS_KOI8_U, "xft::lang=ru" }, |
65 | |
70 | |
66 | { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, |
71 | { CS_ISO8859_5, "xft::lang=ru" }, |
67 | { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, |
72 | { CS_ISO8859_6, "xft::lang=ar" }, |
68 | { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, |
73 | { CS_ISO8859_7, "xft::lang=el" }, |
69 | { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, |
74 | { CS_ISO8859_8, "xft::lang=he" }, |
70 | { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, |
75 | { CS_ISO8859_9, "xft::lang=tr" }, |
71 | { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, |
76 | { CS_ISO8859_10, "xft::lang=se" }, |
72 | { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, |
77 | { CS_ISO8859_11, "xft::lang=th" }, |
73 | # endif |
78 | # endif |
74 | #endif |
79 | #endif |
75 | |
80 | |
76 | // japanese |
81 | // japanese |
77 | #if ENCODING_JP || ENCODING_JP_EXT |
82 | #if ENCODING_JP || ENCODING_JP_EXT |
78 | # if XFT |
83 | # if XFT |
79 | // prefer xft for complex scripts |
84 | // prefer xft for complex scripts |
80 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
85 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
81 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
86 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
82 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
87 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
83 | { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, |
88 | { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, |
84 | # endif |
89 | # endif |
85 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
90 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
86 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
91 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
87 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
92 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
88 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
93 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
… | |
… | |
92 | |
97 | |
93 | #if ENCODING_ZH || ENCODING_ZH_EXT |
98 | #if ENCODING_ZH || ENCODING_ZH_EXT |
94 | # if XFT |
99 | # if XFT |
95 | { CS_GBK_0, "xft:AR PL KaitiM GB" }, |
100 | { CS_GBK_0, "xft:AR PL KaitiM GB" }, |
96 | { CS_GBK_0, "xft:AR PL SungtiL GB" }, |
101 | { CS_GBK_0, "xft:AR PL SungtiL GB" }, |
97 | { CS_GBK_0, "xft::spacing=100:lang=zh" }, |
102 | { CS_GBK_0, "xft::lang=zh" }, |
98 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
103 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
99 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
104 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
100 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
105 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
101 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
106 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
102 | { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, |
107 | { CS_GB2312_1980_0, "xft::lang=zh" }, |
103 | # endif |
108 | # endif |
104 | { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, |
109 | { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, |
105 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
110 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
106 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
111 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
107 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
112 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
… | |
… | |
120 | #if ENCODING_KR |
125 | #if ENCODING_KR |
121 | { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
126 | { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
122 | { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
127 | { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
123 | # if XFT |
128 | # if XFT |
124 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
129 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
125 | { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, |
130 | { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, |
126 | # endif |
131 | # endif |
127 | #endif |
132 | #endif |
128 | |
133 | |
129 | // generic font fallback |
134 | // generic font fallback |
130 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
135 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
131 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
136 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
132 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
137 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
133 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
138 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
134 | #if XFT |
139 | #if XFT |
135 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"}, |
140 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
136 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
141 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
137 | { CS_UNICODE, "xft:Andale Mono:antialias=false" }, |
142 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
138 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, |
143 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, |
139 | |
144 | |
140 | // FreeMono is usually uglier than x fonts, so try last only. |
145 | // FreeMono is usually uglier than x fonts, so try last only. |
141 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
146 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
142 | #endif |
147 | #endif |
143 | |
148 | |
… | |
… | |
152 | 0x304c, 0x672c, // が本 |
157 | 0x304c, 0x672c, // が本 |
153 | }; |
158 | }; |
154 | |
159 | |
155 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
160 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
156 | |
161 | |
|
|
162 | #define dTermDisplay Display *disp = term->xdisp |
|
|
163 | #define dTermGC GC gc = term->gc |
|
|
164 | |
157 | ///////////////////////////////////////////////////////////////////////////// |
165 | ///////////////////////////////////////////////////////////////////////////// |
158 | |
166 | |
159 | #if XFT |
167 | #if XFT |
160 | rxvt_drawable::~rxvt_drawable () |
168 | rxvt_drawable::~rxvt_drawable () |
161 | { |
169 | { |
… | |
… | |
164 | } |
172 | } |
165 | |
173 | |
166 | rxvt_drawable::operator XftDraw *() |
174 | rxvt_drawable::operator XftDraw *() |
167 | { |
175 | { |
168 | if (!xftdrawable) |
176 | if (!xftdrawable) |
169 | xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); |
177 | xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap); |
170 | |
178 | |
171 | return xftdrawable; |
179 | return xftdrawable; |
172 | } |
180 | } |
173 | #endif |
181 | #endif |
174 | |
182 | |
175 | ///////////////////////////////////////////////////////////////////////////// |
183 | ///////////////////////////////////////////////////////////////////////////// |
176 | |
|
|
177 | static void *enc_buf; |
|
|
178 | static uint32_t enc_len; |
|
|
179 | |
|
|
180 | static inline void * |
|
|
181 | get_enc_buf (uint32_t len) |
|
|
182 | { |
|
|
183 | if (len > enc_len) |
|
|
184 | { |
|
|
185 | free (enc_buf); |
|
|
186 | enc_buf = malloc (len); |
|
|
187 | enc_len = len; |
|
|
188 | } |
|
|
189 | |
|
|
190 | return enc_buf; |
|
|
191 | } |
|
|
192 | |
184 | |
193 | static const char * |
185 | static const char * |
194 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
186 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
195 | { |
187 | { |
196 | uint8_t *buf = (uint8_t *)get_enc_buf (len); |
188 | uint8_t *buf = rxvt_temp_buf<uint8_t> (len); |
|
|
189 | uint8_t *res = buf; |
197 | |
190 | |
198 | while (len--) |
191 | while (len--) |
199 | { |
192 | { |
200 | uint32_t c = FROM_UNICODE (cs, *text++); |
193 | uint32_t c = FROM_UNICODE (cs, *text++); |
201 | |
194 | |
… | |
… | |
206 | } |
199 | } |
207 | |
200 | |
208 | *buf++ = c; |
201 | *buf++ = c; |
209 | } |
202 | } |
210 | |
203 | |
211 | return (const char *)enc_buf; |
204 | return (const char *)res; |
212 | } |
205 | } |
213 | |
206 | |
214 | static const XChar2b * |
207 | static const XChar2b * |
215 | enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) |
208 | enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) |
216 | { |
209 | { |
217 | XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); |
210 | XChar2b *buf = rxvt_temp_buf<XChar2b> (len); |
|
|
211 | XChar2b *res = buf; |
218 | |
212 | |
219 | while (len--) |
213 | while (len--) |
220 | { |
214 | { |
221 | uint32_t c = FROM_UNICODE (cs, *text++); |
215 | uint32_t c = FROM_UNICODE (cs, *text++); |
222 | |
216 | |
… | |
… | |
229 | buf->byte1 = c >> 8; |
223 | buf->byte1 = c >> 8; |
230 | buf->byte2 = c; |
224 | buf->byte2 = c; |
231 | buf++; |
225 | buf++; |
232 | } |
226 | } |
233 | |
227 | |
234 | return (XChar2b *)enc_buf; |
228 | return res; |
235 | } |
229 | } |
236 | |
230 | |
237 | ///////////////////////////////////////////////////////////////////////////// |
231 | ///////////////////////////////////////////////////////////////////////////// |
|
|
232 | |
|
|
233 | rxvt_font::rxvt_font () |
|
|
234 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
|
|
235 | { |
|
|
236 | } |
238 | |
237 | |
239 | void |
238 | void |
240 | rxvt_font::set_name (char *name) |
239 | rxvt_font::set_name (char *name) |
241 | { |
240 | { |
242 | if (this->name == name) |
241 | if (this->name == name) |
… | |
… | |
245 | if (this->name) free (this->name); // let the compiler optimize |
244 | if (this->name) free (this->name); // let the compiler optimize |
246 | this->name = name; |
245 | this->name = name; |
247 | } |
246 | } |
248 | |
247 | |
249 | void |
248 | void |
250 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) |
249 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
251 | { |
250 | { |
|
|
251 | dTermDisplay; |
|
|
252 | dTermGC; |
|
|
253 | |
252 | if (color == Color_bg) |
254 | if (color == Color_bg) |
253 | XClearArea (d.display->display, d, x, y, w, h, FALSE); |
255 | XClearArea (disp, d, x, y, w, h, false); |
254 | else if (color >= 0) |
256 | else if (color >= 0) |
255 | { |
257 | { |
256 | #if XFT |
258 | #if XFT |
257 | XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); |
259 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
258 | #else |
260 | #else |
259 | XSetForeground (d.display->display, TGC, r->pix_colors[color]); |
261 | XSetForeground (disp, gc, term->pix_colors[color]); |
260 | XFillRectangle (d.display->display, d, TGC, x, y, w, h); |
262 | XFillRectangle (disp, d, gc, x, y, w, h); |
261 | #endif |
263 | #endif |
262 | } |
264 | } |
263 | } |
265 | } |
|
|
266 | |
|
|
267 | ///////////////////////////////////////////////////////////////////////////// |
264 | |
268 | |
265 | #include "table/linedraw.h" |
269 | #include "table/linedraw.h" |
266 | |
270 | |
267 | struct rxvt_font_default : rxvt_font { |
271 | struct rxvt_font_default : rxvt_font { |
268 | struct rxvt_fontset *fs; |
272 | struct rxvt_fontset *fs; |
… | |
… | |
276 | rxvt_fontprop properties () |
280 | rxvt_fontprop properties () |
277 | { |
281 | { |
278 | rxvt_fontprop p; |
282 | rxvt_fontprop p; |
279 | |
283 | |
280 | p.width = p.height = 1; |
284 | p.width = p.height = 1; |
|
|
285 | p.ascent = rxvt_fontprop::unset; |
281 | p.weight = rxvt_fontprop::medium; |
286 | p.weight = rxvt_fontprop::medium; |
282 | p.slant = rxvt_fontprop::roman; |
287 | p.slant = rxvt_fontprop::roman; |
283 | |
288 | |
284 | return p; |
289 | return p; |
285 | } |
290 | } |
… | |
… | |
292 | set_name (strdup ("built-in support font")); |
297 | set_name (strdup ("built-in support font")); |
293 | |
298 | |
294 | return true; |
299 | return true; |
295 | } |
300 | } |
296 | |
301 | |
297 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
302 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
298 | { |
303 | { |
299 | careful = false; |
304 | careful = false; |
300 | |
305 | |
301 | if (unicode <= 0x001f) |
306 | if (unicode <= 0x001f) |
302 | return true; |
307 | return true; |
… | |
… | |
305 | return false; |
310 | return false; |
306 | |
311 | |
307 | if (unicode <= 0x009f) |
312 | if (unicode <= 0x009f) |
308 | return true; |
313 | return true; |
309 | |
314 | |
310 | if (unicode >= 0x2500 && unicode <= 0x259f) |
315 | if (unicode >= 0x2500 && unicode <= 0x259f && |
|
|
316 | !term->option (Opt_skipBuiltinGlyphs)) |
311 | return true; |
317 | return true; |
312 | |
318 | |
313 | if (IS_COMPOSE (unicode)) |
319 | if (IS_COMPOSE (unicode)) |
314 | return true; |
320 | return true; |
315 | |
321 | |
… | |
… | |
331 | void |
337 | void |
332 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
338 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
333 | const text_t *text, int len, |
339 | const text_t *text, int len, |
334 | int fg, int bg) |
340 | int fg, int bg) |
335 | { |
341 | { |
|
|
342 | dTermDisplay; |
|
|
343 | dTermGC; |
|
|
344 | |
336 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
345 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
337 | |
346 | |
338 | XSetForeground (d.display->display, TGC, r->pix_colors[fg]); |
347 | XSetForeground (disp, gc, term->pix_colors[fg]); |
339 | |
348 | |
340 | while (len) |
349 | while (len) |
341 | { |
350 | { |
342 | #if ENABLE_COMBINING |
351 | #if ENABLE_COMBINING |
343 | compose_char *cc; |
352 | compose_char *cc; |
… | |
… | |
347 | |
356 | |
348 | while (++text, --len && *text == NOCHAR) |
357 | while (++text, --len && *text == NOCHAR) |
349 | ; |
358 | ; |
350 | |
359 | |
351 | int width = text - tp; |
360 | int width = text - tp; |
352 | int fwidth = r->TermWin.fwidth * width; |
361 | int fwidth = term->fwidth * width; |
353 | |
362 | |
354 | if (0x2500 <= t && t <= 0x259f) |
363 | if (0x2500 <= t && t <= 0x259f) |
355 | { |
364 | { |
356 | uint16_t offs = linedraw_offs[t - 0x2500]; |
365 | uint16_t offs = linedraw_offs[t - 0x2500]; |
357 | uint32_t *a = linedraw_command + (offs >> 4); |
366 | uint32_t *a = linedraw_command + (offs >> 4); |
358 | uint32_t *b = a + (offs & 15); |
367 | uint32_t *b = a + (offs & 15); |
359 | |
368 | |
360 | int W = fwidth; |
369 | int W = fwidth; |
361 | int H = r->TermWin.fheight; |
370 | int H = term->fheight; |
362 | |
371 | |
363 | int x_[16]; |
372 | int x_[16]; |
364 | int y_[16]; |
373 | int y_[16]; |
365 | |
374 | |
366 | for (int i = 0; i <= 8; i++) |
375 | for (int i = 0; i <= 8; i++) |
… | |
… | |
374 | |
383 | |
375 | XGCValues gcv; |
384 | XGCValues gcv; |
376 | |
385 | |
377 | gcv.cap_style = CapButt; |
386 | gcv.cap_style = CapButt; |
378 | gcv.line_width = 0; |
387 | gcv.line_width = 0; |
379 | XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); |
388 | XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv); |
380 | |
389 | |
381 | while (a < b) |
390 | while (a < b) |
382 | { |
391 | { |
383 | uint32_t command = *a++; |
392 | uint32_t command = *a++; |
384 | |
393 | |
… | |
… | |
391 | int y2 = y_[(command >> 0) & 15]; |
400 | int y2 = y_[(command >> 0) & 15]; |
392 | |
401 | |
393 | switch (op) |
402 | switch (op) |
394 | { |
403 | { |
395 | case 0: // line |
404 | case 0: // line |
396 | XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); |
405 | XDrawLine (disp, d, gc, x1, y1, x2, y2); |
397 | break; |
406 | break; |
398 | |
407 | |
399 | case 1: // rectangle, possibly stippled |
408 | case 1: // rectangle, possibly stippled |
400 | if (a) |
409 | if (a) |
401 | { |
410 | { |
402 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
411 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
403 | |
412 | |
404 | gcv.fill_style = FillStippled; |
413 | gcv.fill_style = FillStippled; |
405 | gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); |
414 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
406 | gcv.ts_x_origin = x; |
415 | gcv.ts_x_origin = x; |
407 | gcv.ts_y_origin = y; |
416 | gcv.ts_y_origin = y; |
408 | |
417 | |
409 | XChangeGC (d.display->display, TGC, |
418 | XChangeGC (disp, gc, |
410 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
419 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
411 | &gcv); |
420 | &gcv); |
412 | } |
421 | } |
413 | |
422 | |
414 | XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
423 | XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
415 | |
424 | |
416 | if (a) |
425 | if (a) |
417 | { |
426 | { |
418 | XFreePixmap (d.display->display, gcv.stipple); |
427 | XFreePixmap (disp, gcv.stipple); |
419 | gcv.stipple = 0; |
428 | gcv.stipple = 0; |
420 | gcv.fill_style = FillSolid; |
429 | gcv.fill_style = FillSolid; |
421 | XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); |
430 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
422 | } |
431 | } |
423 | break; |
432 | break; |
424 | case 2: // arc |
433 | case 2: // arc |
425 | XDrawArc (d.display->display, d, TGC, |
434 | XDrawArc (disp, d, gc, |
426 | x1 - W/2, y1 - H/2, W-1, H-1, |
435 | x1 - W/2, y1 - H/2, W-1, H-1, |
427 | (a - 1) * 90*64, (b - 1) * 90*64); |
436 | (a - 1) * 90*64, (b - 1) * 90*64); |
428 | break; |
437 | break; |
429 | } |
438 | } |
430 | } |
439 | } |
431 | } |
440 | } |
432 | #if ENABLE_COMBINING |
441 | #if ENABLE_COMBINING |
433 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
442 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
434 | { |
443 | { |
|
|
444 | min_it (width, 2); // we only support wcwidth up to 2 |
|
|
445 | |
435 | text_t chrs[2]; |
446 | text_t chrs[2]; |
436 | width = min (2, width); |
|
|
437 | chrs [1] = NOCHAR; |
447 | chrs [1] = NOCHAR; |
438 | |
448 | |
439 | *chrs = cc->c1; |
449 | *chrs = cc->c1; |
440 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
450 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
441 | f1->draw (d, x, y, chrs, width, fg, bg); |
451 | f1->draw (d, x, y, chrs, width, fg, bg); |
… | |
… | |
461 | case ZERO_WIDTH_CHAR: |
471 | case ZERO_WIDTH_CHAR: |
462 | case NOCHAR: |
472 | case NOCHAR: |
463 | break; |
473 | break; |
464 | |
474 | |
465 | default: |
475 | default: |
466 | XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, |
476 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
467 | fwidth - 4, r->TermWin.fheight - 4); |
477 | fwidth - 4, term->fheight - 4); |
468 | } |
478 | } |
469 | |
479 | |
470 | x += fwidth; |
480 | x += fwidth; |
471 | } |
481 | } |
472 | } |
482 | } |
… | |
… | |
480 | |
490 | |
481 | rxvt_fontprop properties (); |
491 | rxvt_fontprop properties (); |
482 | |
492 | |
483 | bool load (const rxvt_fontprop &prop); |
493 | bool load (const rxvt_fontprop &prop); |
484 | |
494 | |
485 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); |
495 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
486 | |
496 | |
487 | void draw (rxvt_drawable &d, int x, int y, |
497 | void draw (rxvt_drawable &d, int x, int y, |
488 | const text_t *text, int len, |
498 | const text_t *text, int len, |
489 | int fg, int bg); |
499 | int fg, int bg); |
490 | |
500 | |
491 | bool slow; // wether this is a proportional font or has other funny characteristics |
501 | bool slow; // wether this is a proportional font or has other funny characteristics |
492 | XFontStruct *f; |
502 | XFontStruct *f; |
493 | codeset cs; |
503 | codeset cs; |
494 | bool enc2b, encm; |
504 | bool enc2b, encm; |
495 | |
505 | |
496 | char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
506 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
497 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
507 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
498 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
508 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
499 | bool set_properties (rxvt_fontprop &p, const char *name); |
509 | bool set_properties (rxvt_fontprop &p, const char *name); |
500 | }; |
510 | }; |
501 | |
511 | |
502 | char * |
512 | char * |
503 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
513 | rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const |
504 | { |
514 | { |
505 | unsigned long value; |
515 | unsigned long value; |
506 | |
516 | |
507 | if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) |
517 | if (XGetFontProperty (f, property, &value)) |
508 | return XGetAtomName (DISPLAY, value); |
518 | return XGetAtomName (term->xdisp, value); |
509 | else |
519 | else |
510 | return rxvt_strdup (repl); |
520 | return rxvt_strdup (repl); |
511 | } |
521 | } |
512 | |
522 | |
513 | rxvt_fontprop |
523 | rxvt_fontprop |
… | |
… | |
519 | } |
529 | } |
520 | |
530 | |
521 | bool |
531 | bool |
522 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
532 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
523 | { |
533 | { |
524 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
534 | p.width = width != rxvt_fontprop::unset ? width |
|
|
535 | : avgwidth ? (avgwidth + 1) / 10 |
|
|
536 | : (height + 1) / 2; |
525 | p.height = height; |
537 | p.height = height; |
|
|
538 | p.ascent = rxvt_fontprop::unset; |
526 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
539 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
527 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
540 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
528 | |
541 | |
529 | return true; |
542 | return true; |
530 | } |
543 | } |
… | |
… | |
533 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
546 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
534 | { |
547 | { |
535 | unsigned long height; |
548 | unsigned long height; |
536 | |
549 | |
537 | #if 0 |
550 | #if 0 |
538 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
551 | if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height)) |
539 | return false; |
552 | return false; |
540 | #else |
553 | #else |
541 | height = f->ascent + f->descent; |
554 | height = f->ascent + f->descent; |
542 | #endif |
555 | #endif |
543 | |
556 | |
544 | unsigned long avgwidth; |
557 | unsigned long avgwidth; |
545 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
558 | if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth)) |
546 | avgwidth = 0; |
559 | avgwidth = 0; |
547 | |
560 | |
548 | char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
561 | char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium"); |
549 | char *slant = get_property (f, "SLANT", "r"); |
562 | char *slant = get_property (f, term->xa [XA_SLANT], "r"); |
550 | |
563 | |
551 | set_properties (p, height, weight, slant, avgwidth); |
564 | set_properties (p, height, weight, slant, avgwidth); |
552 | |
565 | |
553 | free (weight); |
566 | free (weight); |
554 | free (slant); |
567 | free (slant); |
555 | |
568 | |
|
|
569 | p.ascent = f->ascent; |
|
|
570 | |
556 | return true; |
571 | return true; |
557 | } |
572 | } |
558 | |
573 | |
559 | bool |
574 | bool |
560 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
575 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
561 | { |
576 | { |
|
|
577 | dTermDisplay; |
562 | int slashes = 0; |
578 | int slashes = 0; |
563 | const char *comp[13]; |
579 | const char *comp[13]; |
564 | |
580 | |
565 | for (const char *c = name; *c; c++) |
581 | for (const char *c = name; *c; c++) |
566 | if (*c == '-') |
582 | if (*c == '-') |
… | |
… | |
574 | if (slashes >= 13 |
590 | if (slashes >= 13 |
575 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
591 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
576 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
592 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
577 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
593 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
578 | |
594 | |
579 | XFontStruct *f = XLoadQueryFont (DISPLAY, name); |
595 | XFontStruct *f = XLoadQueryFont (disp, name); |
580 | |
596 | |
581 | if (f) |
597 | if (f) |
582 | { |
598 | { |
583 | // the font should really exist now. if not, we have a problem |
599 | // the font should really exist now. if not, we have a problem |
584 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
600 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
585 | // in that case, just return garbage. |
601 | // in that case, just return garbage. |
586 | bool ret = set_properties (p, f); |
602 | bool ret = set_properties (p, f); |
587 | XFreeFont (DISPLAY, f); |
603 | XFreeFont (disp, f); |
588 | return ret; |
604 | return ret; |
589 | } |
605 | } |
590 | else |
606 | else |
591 | return false; |
607 | return false; |
592 | } |
608 | } |
… | |
… | |
630 | } |
646 | } |
631 | |
647 | |
632 | bool |
648 | bool |
633 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
649 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
634 | { |
650 | { |
|
|
651 | dTermDisplay; |
|
|
652 | |
635 | clear (); |
653 | clear (); |
636 | |
654 | |
637 | char field_str[64]; // enough for 128 bits |
655 | char field_str[64]; // enough for 128 bits |
638 | |
656 | |
639 | // first morph the font if required |
657 | // first morph the font if required |
… | |
… | |
642 | { |
660 | { |
643 | char fname[1024]; |
661 | char fname[1024]; |
644 | |
662 | |
645 | if (name[0] != '-') |
663 | if (name[0] != '-') |
646 | { |
664 | { |
647 | f = XLoadQueryFont (DISPLAY, name); |
665 | f = XLoadQueryFont (disp, name); |
648 | |
666 | |
649 | if (!f) |
667 | if (!f) |
650 | return false; |
668 | return false; |
651 | |
669 | |
652 | char *new_name = get_property (f, "FONT", name); |
670 | char *new_name = get_property (f, XA_FONT, name); |
653 | |
671 | |
654 | if (new_name) |
672 | if (new_name) |
655 | set_name (new_name); |
673 | set_name (new_name); |
656 | else |
674 | else |
657 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
675 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
658 | |
676 | |
659 | XFreeFont (DISPLAY, f); |
677 | XFreeFont (disp, f); |
660 | f = 0; |
678 | f = 0; |
661 | } |
679 | } |
662 | |
680 | |
663 | if (prop.weight != rxvt_fontprop::unset) |
681 | if (prop.weight != rxvt_fontprop::unset) |
664 | { |
682 | { |
… | |
… | |
694 | ~font_weight () { free (name); } |
712 | ~font_weight () { free (name); } |
695 | }; |
713 | }; |
696 | |
714 | |
697 | char **list; |
715 | char **list; |
698 | int count; |
716 | int count; |
699 | list = XListFonts (DISPLAY, name, 4000, &count); |
717 | list = XListFonts (disp, name, 4000, &count); |
700 | |
718 | |
701 | set_name (0); |
719 | set_name (0); |
702 | |
720 | |
703 | if (!list) |
721 | if (!list) |
704 | return false; |
722 | return false; |
… | |
… | |
712 | |
730 | |
713 | int diff = 0; |
731 | int diff = 0; |
714 | |
732 | |
715 | if (replace_field (fname, list[i], 6, '0', field_str)) |
733 | if (replace_field (fname, list[i], 6, '0', field_str)) |
716 | diff += 10; // slightly penalize scalable fonts |
734 | diff += 10; // slightly penalize scalable fonts |
|
|
735 | else if (replace_field (fname, list[i], 11, '0', "0")) |
|
|
736 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
717 | |
737 | |
718 | if (!set_properties (p, fname)) |
738 | if (!set_properties (p, fname)) |
719 | continue; |
739 | continue; |
720 | |
740 | |
721 | if (prop.height != rxvt_fontprop::unset |
741 | if (prop.height != rxvt_fontprop::unset |
… | |
… | |
737 | for (;;) |
757 | for (;;) |
738 | { |
758 | { |
739 | font_weight *best = fonts + count - 1; |
759 | font_weight *best = fonts + count - 1; |
740 | |
760 | |
741 | for (font_weight *w = best; w-- > fonts; ) |
761 | for (font_weight *w = best; w-- > fonts; ) |
742 | if (w->diff < best->diff) |
762 | if (w->diff <= best->diff) |
743 | best = w; |
763 | best = w; |
744 | |
764 | |
745 | if (!best->name |
765 | if (!best->name |
746 | || !(f = XLoadQueryFont (DISPLAY, best->name))) |
766 | || !(f = XLoadQueryFont (disp, best->name))) |
747 | break; |
767 | break; |
748 | |
768 | |
749 | set_name (best->name); |
769 | set_name (best->name); |
750 | best->clear (); |
770 | best->clear (); |
751 | |
771 | |
… | |
… | |
764 | delete [] fonts; |
784 | delete [] fonts; |
765 | |
785 | |
766 | if (!f) |
786 | if (!f) |
767 | return false; |
787 | return false; |
768 | |
788 | |
769 | char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
789 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
770 | char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
790 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
771 | |
791 | |
772 | if (registry && encoding) |
792 | if (registry && encoding) |
773 | { |
793 | { |
774 | char charset[64]; |
794 | char charset[64]; |
775 | snprintf (charset, 64, "%s-%s", registry, encoding); |
795 | snprintf (charset, 64, "%s-%s", registry, encoding); |
776 | |
796 | |
777 | cs = codeset_from_name (charset); |
797 | cs = codeset_from_name (charset); |
778 | } |
798 | } |
779 | else |
799 | else |
780 | { |
800 | { |
781 | const char *charset = get_property (f, "FONT", 0); |
801 | const char *charset = get_property (f, XA_FONT, 0); |
782 | |
802 | |
783 | if (!charset) |
803 | if (!charset) |
784 | charset = name; |
804 | charset = name; |
785 | |
805 | |
786 | int count = 13; |
806 | int count = 13; |
… | |
… | |
801 | enc2b = encm || f->max_char_or_byte2 > 255; |
821 | enc2b = encm || f->max_char_or_byte2 > 255; |
802 | |
822 | |
803 | slow = false; |
823 | slow = false; |
804 | |
824 | |
805 | #if 1 // only used for slow detection, TODO optimize |
825 | #if 1 // only used for slow detection, TODO optimize |
806 | if (f->min_bounds.width == f->max_bounds.width) |
826 | if (f->min_bounds.width == f->max_bounds.width || !f->per_char) |
807 | width = f->min_bounds.width; |
|
|
808 | else if (f->per_char == NULL) |
|
|
809 | width = f->max_bounds.width; |
827 | width = f->max_bounds.width; |
810 | else |
828 | else |
811 | { |
829 | { |
812 | slow = true; |
830 | slow = true; |
813 | |
831 | |
… | |
… | |
829 | |
847 | |
830 | width = 1; |
848 | width = 1; |
831 | |
849 | |
832 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
850 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
833 | { |
851 | { |
834 | if (cs != CS_UNICODE |
|
|
835 | && *t > 0x100 |
|
|
836 | && FROM_UNICODE (cs, *t) == NOCHAR) |
852 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
837 | continue; |
853 | continue; |
838 | |
854 | |
839 | // ignore characters we wouldn't use anyways |
855 | // ignore characters we wouldn't use anyways |
840 | bool careful; |
856 | bool careful; |
841 | if (!has_char (*t, &prop, careful)) |
857 | if (!has_char (*t, &prop, careful)) |
… | |
… | |
845 | |
861 | |
846 | XCharStruct g; |
862 | XCharStruct g; |
847 | int dir_ret, asc_ret, des_ret; |
863 | int dir_ret, asc_ret, des_ret; |
848 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
864 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
849 | |
865 | |
850 | int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; |
866 | int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
851 | |
867 | |
852 | if (width < g.width) width = g.width; |
868 | if (width < g.width) width = g.width; |
853 | } |
869 | } |
854 | |
870 | |
855 | if (cs == CS_UNKNOWN) |
871 | if (cs == CS_UNKNOWN) |
856 | { |
872 | { |
857 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
873 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
… | |
… | |
874 | void |
890 | void |
875 | rxvt_font_x11::clear () |
891 | rxvt_font_x11::clear () |
876 | { |
892 | { |
877 | if (f) |
893 | if (f) |
878 | { |
894 | { |
879 | XFreeFont (DISPLAY, f); |
895 | XFreeFont (term->xdisp, f); |
880 | f = 0; |
896 | f = 0; |
881 | } |
897 | } |
882 | } |
898 | } |
883 | |
899 | |
884 | bool |
900 | bool |
885 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
901 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
886 | { |
902 | { |
887 | uint32_t ch = FROM_UNICODE (cs, unicode); |
903 | uint32_t ch = FROM_UNICODE (cs, unicode); |
888 | |
904 | |
889 | if (ch == NOCHAR) |
905 | if (ch == NOCHAR) |
890 | return false; |
906 | return false; |
… | |
… | |
927 | return false; |
943 | return false; |
928 | |
944 | |
929 | if (!prop || prop->width == rxvt_fontprop::unset) |
945 | if (!prop || prop->width == rxvt_fontprop::unset) |
930 | return true; |
946 | return true; |
931 | |
947 | |
932 | // check character against base font bounding box |
948 | // check wether character overlaps previous/next character |
933 | int w = xcs->width; |
949 | int w = xcs->rbearing - xcs->lbearing; |
934 | int wcw = wcwidth (unicode); |
950 | int wcw = WCWIDTH (unicode); |
935 | if (wcw > 0) w /= wcw; |
|
|
936 | |
951 | |
937 | careful = w > prop->width; |
952 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
938 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
953 | |
|
|
954 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
939 | return false; |
955 | return false; |
940 | |
956 | |
941 | return true; |
957 | return true; |
942 | } |
958 | } |
943 | |
959 | |
… | |
… | |
949 | // this looks like a mess /. |
965 | // this looks like a mess /. |
950 | // and it is a mess /. |
966 | // and it is a mess /. |
951 | // yet we are trying to be perfect /. |
967 | // yet we are trying to be perfect /. |
952 | // but the result still isn't perfect /. |
968 | // but the result still isn't perfect /. |
953 | |
969 | |
|
|
970 | dTermDisplay; |
|
|
971 | dTermGC; |
|
|
972 | |
954 | bool slow = this->slow |
973 | bool slow = this->slow |
955 | || width != r->TermWin.fwidth |
974 | || width != term->fwidth |
956 | || height != r->TermWin.fheight; |
975 | || height != term->fheight; |
957 | |
976 | |
958 | int base = ascent; // sorry, incorrect: r->TermWin.fbase; |
977 | int base = ascent; // sorry, incorrect: term->fbase; |
959 | |
978 | |
960 | XGCValues v; |
979 | XGCValues v; |
961 | v.foreground = r->pix_colors[fg]; |
980 | v.foreground = term->pix_colors[fg]; |
962 | v.font = f->fid; |
981 | v.font = f->fid; |
963 | |
982 | |
964 | if (enc2b) |
983 | if (enc2b) |
965 | { |
984 | { |
966 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
985 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
967 | |
986 | |
968 | if (bg == Color_bg && !slow) |
987 | if (bg == Color_bg && !slow) |
969 | { |
988 | { |
970 | v.background = r->pix_colors[bg]; |
989 | v.background = term->pix_colors[bg]; |
971 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
990 | XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v); |
972 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
991 | XDrawImageString16 (disp, d, gc, x, y + base, xc, len); |
973 | } |
992 | } |
974 | else |
993 | else |
975 | { |
994 | { |
976 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
995 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
977 | |
996 | |
978 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
997 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
979 | |
998 | |
980 | if (slow) |
999 | if (slow) |
981 | { |
1000 | { |
982 | do |
1001 | do |
983 | { |
1002 | { |
984 | if (xc->byte1 || xc->byte2) |
1003 | if (xc->byte1 || xc->byte2) |
985 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
1004 | XDrawString16 (disp, d, gc, x, y + base, xc, 1); |
986 | |
1005 | |
987 | x += r->TermWin.fwidth; |
1006 | x += term->fwidth; |
988 | xc++; len--; |
1007 | xc++; len--; |
989 | } |
1008 | } |
990 | while (len); |
1009 | while (len); |
991 | } |
1010 | } |
992 | else |
1011 | else |
993 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); |
1012 | XDrawString16 (disp, d, gc, x, y + base, xc, len); |
994 | } |
1013 | } |
995 | } |
1014 | } |
996 | else |
1015 | else |
997 | { |
1016 | { |
998 | const char *xc = enc_char (text, len, cs, slow); |
1017 | const char *xc = enc_char (text, len, cs, slow); |
999 | |
1018 | |
1000 | if (bg == Color_bg && !slow) |
1019 | if (bg == Color_bg && !slow) |
1001 | { |
1020 | { |
1002 | v.background = r->pix_colors[bg]; |
1021 | v.background = term->pix_colors[bg]; |
1003 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
1022 | XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v); |
1004 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
1023 | XDrawImageString (disp, d, gc, x, y + base, xc, len); |
1005 | } |
1024 | } |
1006 | else |
1025 | else |
1007 | { |
1026 | { |
1008 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
1027 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1009 | |
1028 | |
1010 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
1029 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1011 | |
1030 | |
1012 | if (slow) |
1031 | if (slow) |
1013 | { |
1032 | { |
1014 | do |
1033 | do |
1015 | { |
1034 | { |
1016 | if (*xc) |
1035 | if (*xc) |
1017 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
1036 | XDrawString (disp, d, gc, x, y + base, xc, 1); |
1018 | |
1037 | |
1019 | x += r->TermWin.fwidth; |
1038 | x += term->fwidth; |
1020 | xc++; len--; |
1039 | xc++; len--; |
1021 | } |
1040 | } |
1022 | while (len); |
1041 | while (len); |
1023 | } |
1042 | } |
1024 | else |
1043 | else |
1025 | XDrawString (d.display->display, d, TGC, x, y + base, xc, len); |
1044 | XDrawString (disp, d, gc, x, y + base, xc, len); |
1026 | } |
1045 | } |
1027 | } |
1046 | } |
1028 | } |
1047 | } |
1029 | |
1048 | |
1030 | ///////////////////////////////////////////////////////////////////////////// |
1049 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
1042 | |
1061 | |
1043 | void draw (rxvt_drawable &d, int x, int y, |
1062 | void draw (rxvt_drawable &d, int x, int y, |
1044 | const text_t *text, int len, |
1063 | const text_t *text, int len, |
1045 | int fg, int bg); |
1064 | int fg, int bg); |
1046 | |
1065 | |
1047 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); |
1066 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; |
1048 | |
1067 | |
1049 | protected: |
1068 | protected: |
1050 | XftFont *f; |
1069 | XftFont *f; |
1051 | }; |
1070 | }; |
1052 | |
1071 | |
1053 | void |
1072 | void |
1054 | rxvt_font_xft::clear () |
1073 | rxvt_font_xft::clear () |
1055 | { |
1074 | { |
1056 | if (f) |
1075 | if (f) |
1057 | { |
1076 | { |
1058 | XftFontClose (DISPLAY, f); |
1077 | XftFontClose (term->xdisp, f); |
1059 | f = 0; |
1078 | f = 0; |
1060 | } |
1079 | } |
1061 | } |
1080 | } |
1062 | |
1081 | |
1063 | rxvt_fontprop |
1082 | rxvt_fontprop |
… | |
… | |
1067 | |
1086 | |
1068 | FT_Face face = XftLockFace (f); |
1087 | FT_Face face = XftLockFace (f); |
1069 | |
1088 | |
1070 | p.width = width; |
1089 | p.width = width; |
1071 | p.height = height; |
1090 | p.height = height; |
|
|
1091 | p.ascent = ascent; |
1072 | p.weight = face->style_flags & FT_STYLE_FLAG_BOLD |
1092 | p.weight = face->style_flags & FT_STYLE_FLAG_BOLD |
1073 | ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
1093 | ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
1074 | p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC |
1094 | p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC |
1075 | ? rxvt_fontprop::italic : rxvt_fontprop::roman; |
1095 | ? rxvt_fontprop::italic : rxvt_fontprop::roman; |
1076 | |
1096 | |
… | |
… | |
1080 | } |
1100 | } |
1081 | |
1101 | |
1082 | bool |
1102 | bool |
1083 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1103 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1084 | { |
1104 | { |
|
|
1105 | dTermDisplay; |
|
|
1106 | |
1085 | clear (); |
1107 | clear (); |
1086 | |
1108 | |
1087 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
1109 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
1088 | |
1110 | |
1089 | if (!p) |
1111 | if (!p) |
1090 | return false; |
1112 | return false; |
1091 | |
1113 | |
1092 | FcValue v; |
1114 | FcValue v; |
1093 | |
1115 | |
1094 | if (prop.height != rxvt_fontprop::unset |
1116 | if (prop.height != rxvt_fontprop::unset |
1095 | || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
1117 | && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
1096 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1118 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1097 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1119 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1098 | |
1120 | |
1099 | if (prop.weight != rxvt_fontprop::unset |
1121 | if (prop.weight != rxvt_fontprop::unset |
1100 | && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
1122 | && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
… | |
… | |
1115 | |
1137 | |
1116 | // store generated name so iso14755 view gives better results |
1138 | // store generated name so iso14755 view gives better results |
1117 | set_name ((char *)FcNameUnparse (p)); |
1139 | set_name ((char *)FcNameUnparse (p)); |
1118 | |
1140 | |
1119 | XftResult result; |
1141 | XftResult result; |
1120 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
1142 | FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result); |
1121 | |
1143 | |
1122 | FcPatternDestroy (p); |
1144 | FcPatternDestroy (p); |
1123 | |
1145 | |
1124 | if (!match) |
1146 | if (!match) |
1125 | return false; |
1147 | return false; |
… | |
… | |
1127 | int ftheight = 0; |
1149 | int ftheight = 0; |
1128 | bool success = true; |
1150 | bool success = true; |
1129 | |
1151 | |
1130 | for (;;) |
1152 | for (;;) |
1131 | { |
1153 | { |
1132 | f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); |
1154 | f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); |
1133 | |
1155 | |
1134 | if (!f) |
1156 | if (!f) |
1135 | { |
1157 | { |
1136 | success = false; |
1158 | success = false; |
1137 | break; |
1159 | break; |
… | |
… | |
1146 | |
1168 | |
1147 | bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; |
1169 | bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; |
1148 | |
1170 | |
1149 | XftUnlockFace (f); |
1171 | XftUnlockFace (f); |
1150 | |
1172 | |
|
|
1173 | int glheight = height; |
|
|
1174 | |
1151 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1175 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1152 | { |
1176 | { |
1153 | FcChar16 ch = *t; |
1177 | FcChar16 ch = *t; |
1154 | |
1178 | |
1155 | if (cs != CS_UNICODE |
1179 | if (cs != CS_UNICODE |
… | |
… | |
1161 | bool careful; |
1185 | bool careful; |
1162 | if (!has_char (*t, &prop, careful)) |
1186 | if (!has_char (*t, &prop, careful)) |
1163 | continue; |
1187 | continue; |
1164 | |
1188 | |
1165 | XGlyphInfo g; |
1189 | XGlyphInfo g; |
1166 | XftTextExtents16 (DISPLAY, f, &ch, 1, &g); |
1190 | XftTextExtents16 (disp, f, &ch, 1, &g); |
1167 | |
1191 | |
|
|
1192 | g.width -= g.x; |
|
|
1193 | |
1168 | int wcw = wcwidth (ch); |
1194 | int wcw = WCWIDTH (ch); |
1169 | if (wcw > 0) g.width = g.width / wcw; |
1195 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
1170 | |
1196 | |
1171 | if (width < g.width) width = g.width; |
1197 | if (width < g.width ) width = g.width; |
1172 | if (height < g.height) height = g.height; |
1198 | if (height < g.height ) height = g.height; |
|
|
1199 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
|
|
1200 | } |
|
|
1201 | |
|
|
1202 | if (!width) |
|
|
1203 | { |
|
|
1204 | rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); |
|
|
1205 | |
|
|
1206 | XftFontClose (disp, f); |
|
|
1207 | f = 0; |
|
|
1208 | |
|
|
1209 | success = false; |
|
|
1210 | break; |
1173 | } |
1211 | } |
1174 | |
1212 | |
1175 | if (prop.height == rxvt_fontprop::unset |
1213 | if (prop.height == rxvt_fontprop::unset |
1176 | || height <= prop.height |
1214 | || (height <= prop.height && glheight <= prop.height) |
1177 | || height <= 2 |
1215 | || height <= 2 |
1178 | || !scalable) |
1216 | || !scalable) |
1179 | break; |
1217 | break; |
1180 | |
1218 | |
1181 | if (ftheight) |
1219 | if (ftheight) |
… | |
… | |
1188 | ftheight -= height - prop.height; |
1226 | ftheight -= height - prop.height; |
1189 | } |
1227 | } |
1190 | else |
1228 | else |
1191 | ftheight = prop.height - 1; |
1229 | ftheight = prop.height - 1; |
1192 | |
1230 | |
1193 | XftFontClose (DISPLAY, f); |
1231 | XftFontClose (disp, f); |
1194 | FcPatternDel (match, FC_PIXEL_SIZE); |
1232 | FcPatternDel (match, FC_PIXEL_SIZE); |
1195 | FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); |
1233 | FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); |
1196 | } |
1234 | } |
1197 | |
1235 | |
1198 | FcPatternDestroy (match); |
1236 | FcPatternDestroy (match); |
1199 | |
1237 | |
1200 | #if 0 // do it per-character |
1238 | #if 0 // do it per-character |
… | |
… | |
1207 | |
1245 | |
1208 | return success; |
1246 | return success; |
1209 | } |
1247 | } |
1210 | |
1248 | |
1211 | bool |
1249 | bool |
1212 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
1250 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1213 | { |
1251 | { |
1214 | careful = false; |
1252 | careful = false; |
1215 | |
1253 | |
1216 | if (!XftCharExists (DISPLAY, f, unicode)) |
1254 | if (!XftCharExists (term->xdisp, f, unicode)) |
1217 | return false; |
1255 | return false; |
1218 | |
1256 | |
1219 | if (!prop || prop->width == rxvt_fontprop::unset) |
1257 | if (!prop || prop->width == rxvt_fontprop::unset) |
1220 | return true; |
1258 | return true; |
1221 | |
1259 | |
1222 | // check character against base font bounding box |
1260 | // check character against base font bounding box |
1223 | FcChar32 ch = unicode; |
1261 | FcChar32 ch = unicode; |
1224 | XGlyphInfo g; |
1262 | XGlyphInfo g; |
1225 | XftTextExtents32 (DISPLAY, f, &ch, 1, &g); |
1263 | XftTextExtents32 (term->xdisp, f, &ch, 1, &g); |
1226 | |
1264 | |
1227 | int w = g.width; |
1265 | int w = g.width - g.x; |
1228 | int wcw = wcwidth (unicode); |
1266 | int wcw = WCWIDTH (unicode); |
1229 | if (wcw > 0) w /= wcw; |
|
|
1230 | |
1267 | |
1231 | careful = w > prop->width; |
1268 | careful = g.x > 0 || w > prop->width * wcw; |
1232 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
1269 | |
|
|
1270 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
|
|
1271 | return false; |
|
|
1272 | |
|
|
1273 | // this weeds out _totally_ broken fonts, or glyphs |
|
|
1274 | if (!OVERLAP_OK (g.xOff, wcw, prop)) |
1233 | return false; |
1275 | return false; |
1234 | |
1276 | |
1235 | return true; |
1277 | return true; |
1236 | } |
1278 | } |
1237 | |
1279 | |
1238 | void |
1280 | void |
1239 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1281 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1240 | const text_t *text, int len, |
1282 | const text_t *text, int len, |
1241 | int fg, int bg) |
1283 | int fg, int bg) |
1242 | { |
1284 | { |
1243 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
1285 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1244 | |
|
|
1245 | int base = ascent; // should be fbase, but that is incorrect |
|
|
1246 | |
1286 | |
1247 | XGlyphInfo extents; |
1287 | XGlyphInfo extents; |
1248 | FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); |
1288 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1249 | FcChar32 *ep = enc; |
1289 | XftGlyphSpec *ep = enc; |
1250 | int ewidth = 0; |
1290 | |
1251 | int xoff = 0; |
1291 | dTermDisplay; |
|
|
1292 | dTermGC; |
|
|
1293 | |
|
|
1294 | // cut trailing spaces |
|
|
1295 | while (len && text [len - 1] == ' ') |
|
|
1296 | len--; |
1252 | |
1297 | |
1253 | while (len) |
1298 | while (len) |
1254 | { |
1299 | { |
1255 | int cwidth = r->TermWin.fwidth; |
1300 | int cwidth = term->fwidth; |
1256 | FcChar32 fc = *text++; len--; |
1301 | FcChar32 fc = *text++; len--; |
1257 | FT_UInt gl; |
|
|
1258 | |
1302 | |
1259 | while (len && *text == NOCHAR) |
1303 | while (len && *text == NOCHAR) |
1260 | text++, len--, cwidth += r->TermWin.fwidth; |
1304 | text++, len--, cwidth += term->fwidth; |
1261 | |
1305 | |
1262 | gl = XftCharIndex (d.display->display, f, fc); |
1306 | if (fc != ' ') // skip spaces |
1263 | XftGlyphExtents (d.display->display, f, &gl, 1, &extents); |
|
|
1264 | |
|
|
1265 | if (extents.xOff != cwidth && ep != enc) |
|
|
1266 | { |
|
|
1267 | if (xoff > ewidth) xoff = ewidth; |
|
|
1268 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
|
|
1269 | x + (ewidth - xoff >> 1), |
|
|
1270 | y + base, enc, ep - enc); |
|
|
1271 | x += ewidth; |
|
|
1272 | |
|
|
1273 | ep = enc; |
|
|
1274 | ewidth = 0; |
|
|
1275 | xoff = 0; |
|
|
1276 | } |
1307 | { |
|
|
1308 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
|
|
1309 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1277 | |
1310 | |
1278 | if (fc == ' ' && ep == enc) // skip leading spaces |
1311 | |
|
|
1312 | ep->glyph = glyph; |
|
|
1313 | ep->x = x + (cwidth - extents.xOff >> 1); |
|
|
1314 | ep->y = y + ascent; |
|
|
1315 | |
|
|
1316 | if (extents.xOff == 0) |
|
|
1317 | ep->x = x + cwidth; |
|
|
1318 | |
|
|
1319 | ep++; |
1279 | { |
1320 | } |
|
|
1321 | |
1280 | x += cwidth; |
1322 | x += cwidth; |
1281 | continue; |
|
|
1282 | } |
|
|
1283 | |
|
|
1284 | else |
|
|
1285 | { |
|
|
1286 | *ep++ = gl; |
|
|
1287 | ewidth += cwidth; |
|
|
1288 | xoff += extents.xOff; |
|
|
1289 | } |
|
|
1290 | } |
1323 | } |
1291 | |
1324 | |
1292 | if (ep != enc) |
1325 | if (ep != enc) |
1293 | { |
|
|
1294 | if (xoff > ewidth) xoff = ewidth; |
|
|
1295 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
1326 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
1296 | x + (ewidth - xoff >> 1), |
|
|
1297 | y + base, enc, ep - enc); |
|
|
1298 | } |
|
|
1299 | } |
1327 | } |
1300 | #endif |
1328 | #endif |
1301 | |
1329 | |
1302 | ///////////////////////////////////////////////////////////////////////////// |
1330 | ///////////////////////////////////////////////////////////////////////////// |
1303 | |
1331 | |
1304 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
1332 | rxvt_fontset::rxvt_fontset (rxvt_term *term) |
1305 | : r (r), fontdesc (0) |
1333 | : fontdesc (0), term (term) |
1306 | { |
1334 | { |
1307 | clear (); |
1335 | clear (); |
1308 | } |
1336 | } |
1309 | |
1337 | |
1310 | rxvt_fontset::~rxvt_fontset () |
1338 | rxvt_fontset::~rxvt_fontset () |
… | |
… | |
1313 | } |
1341 | } |
1314 | |
1342 | |
1315 | void |
1343 | void |
1316 | rxvt_fontset::clear () |
1344 | rxvt_fontset::clear () |
1317 | { |
1345 | { |
1318 | prop.width = prop.height = prop.weight = prop.slant |
1346 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1319 | = rxvt_fontprop::unset; |
1347 | = rxvt_fontprop::unset; |
1320 | |
1348 | |
1321 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1349 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1322 | FONT_UNREF (*i); |
1350 | FONT_UNREF (*i); |
1323 | |
1351 | |
… | |
… | |
1354 | f = new rxvt_font_x11; |
1382 | f = new rxvt_font_x11; |
1355 | } |
1383 | } |
1356 | else |
1384 | else |
1357 | f = new rxvt_font_x11; |
1385 | f = new rxvt_font_x11; |
1358 | |
1386 | |
1359 | f->set_term (r); |
1387 | f->set_term (term); |
1360 | f->set_name (strdup (name)); |
1388 | f->set_name (strdup (name)); |
1361 | |
1389 | |
1362 | f->cs = cs; |
1390 | f->cs = cs; |
1363 | f->loaded = false; |
1391 | f->loaded = false; |
1364 | |
1392 | |
… | |
… | |
1375 | char buf[512]; |
1403 | char buf[512]; |
1376 | const char *end; |
1404 | const char *end; |
1377 | |
1405 | |
1378 | do |
1406 | do |
1379 | { |
1407 | { |
1380 | while (*desc <= ' ') desc++; |
1408 | while (*desc && *desc <= ' ') |
|
|
1409 | desc++; |
1381 | |
1410 | |
1382 | codeset cs = CS_UNICODE; |
1411 | codeset cs = CS_UNICODE; |
1383 | |
1412 | |
1384 | if (*desc == '[') |
1413 | if (*desc == '[') |
1385 | { |
1414 | { |
… | |
… | |
1495 | if (FROM_UNICODE (f->cs, unicode) == NOCHAR) |
1524 | if (FROM_UNICODE (f->cs, unicode) == NOCHAR) |
1496 | goto next_font; |
1525 | goto next_font; |
1497 | |
1526 | |
1498 | if (!realize_font (i)) |
1527 | if (!realize_font (i)) |
1499 | goto next_font; |
1528 | goto next_font; |
|
|
1529 | |
|
|
1530 | if (prop.ascent != rxvt_fontprop::unset) |
|
|
1531 | max_it (f->ascent, prop.ascent); |
1500 | } |
1532 | } |
1501 | |
1533 | |
1502 | if (f->cs == CS_UNKNOWN) |
1534 | if (f->cs == CS_UNKNOWN) |
1503 | goto next_font; |
1535 | goto next_font; |
1504 | |
1536 | |
… | |
… | |
1543 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1575 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1544 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1576 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1545 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1577 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1546 | |
1578 | |
1547 | XftResult result; |
1579 | XftResult result; |
1548 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
1580 | FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result); |
1549 | |
1581 | |
1550 | FcPatternDestroy (p); |
1582 | FcPatternDestroy (p); |
1551 | |
1583 | |
1552 | if (match) |
1584 | if (match) |
1553 | { |
1585 | { |