1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*----------------------------------------------------------------------* |
2 | * File: rxvtfont.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 |
… | |
… | |
24 | #include "rxvtlib.h" |
24 | #include "rxvtlib.h" |
25 | #include "rxvtutil.h" |
25 | #include "rxvtutil.h" |
26 | #include "rxvtfont.h" |
26 | #include "rxvtfont.h" |
27 | |
27 | |
28 | #include <cstdlib> |
28 | #include <cstdlib> |
29 | #include <wchar.h> |
29 | |
30 | #include <inttypes.h> |
30 | #include <inttypes.h> |
31 | |
31 | |
32 | #define DISPLAY r->display->display |
|
|
33 | #define TGC r->gc |
|
|
34 | |
|
|
35 | #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 | )) |
36 | |
40 | |
37 | const struct rxvt_fallback_font { |
41 | const struct rxvt_fallback_font { |
38 | codeset cs; |
42 | codeset cs; |
39 | const char *name; |
43 | const char *name; |
40 | } fallback_fonts[] = { |
44 | } fallback_fonts[] = { |
… | |
… | |
60 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
64 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
61 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
65 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
62 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
66 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
63 | |
67 | |
64 | # if XFT |
68 | # if XFT |
65 | { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, |
69 | { CS_KOI8_U, "xft::lang=ru" }, |
66 | |
70 | |
67 | { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, |
71 | { CS_ISO8859_5, "xft::lang=ru" }, |
68 | { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, |
72 | { CS_ISO8859_6, "xft::lang=ar" }, |
69 | { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, |
73 | { CS_ISO8859_7, "xft::lang=el" }, |
70 | { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, |
74 | { CS_ISO8859_8, "xft::lang=he" }, |
71 | { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, |
75 | { CS_ISO8859_9, "xft::lang=tr" }, |
72 | { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, |
76 | { CS_ISO8859_10, "xft::lang=se" }, |
73 | { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, |
77 | { CS_ISO8859_11, "xft::lang=th" }, |
74 | # endif |
78 | # endif |
75 | #endif |
79 | #endif |
76 | |
80 | |
77 | // japanese |
81 | // japanese |
78 | #if ENCODING_JP || ENCODING_JP_EXT |
82 | #if ENCODING_JP || ENCODING_JP_EXT |
79 | # if XFT |
83 | # if XFT |
80 | // prefer xft for complex scripts |
84 | // prefer xft for complex scripts |
81 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
85 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
82 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
86 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
83 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
87 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
84 | { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, |
88 | { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, |
85 | # endif |
89 | # endif |
86 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
90 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
87 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
91 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
88 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
92 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
89 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
93 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
… | |
… | |
93 | |
97 | |
94 | #if ENCODING_ZH || ENCODING_ZH_EXT |
98 | #if ENCODING_ZH || ENCODING_ZH_EXT |
95 | # if XFT |
99 | # if XFT |
96 | { CS_GBK_0, "xft:AR PL KaitiM GB" }, |
100 | { CS_GBK_0, "xft:AR PL KaitiM GB" }, |
97 | { CS_GBK_0, "xft:AR PL SungtiL GB" }, |
101 | { CS_GBK_0, "xft:AR PL SungtiL GB" }, |
98 | { CS_GBK_0, "xft::spacing=100:lang=zh" }, |
102 | { CS_GBK_0, "xft::lang=zh" }, |
99 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
103 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
100 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
104 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
101 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
105 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
102 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
106 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
103 | { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, |
107 | { CS_GB2312_1980_0, "xft::lang=zh" }, |
104 | # endif |
108 | # endif |
105 | { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, |
109 | { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, |
106 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
110 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
107 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
111 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
108 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
112 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
… | |
… | |
121 | #if ENCODING_KR |
125 | #if ENCODING_KR |
122 | { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
126 | { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
123 | { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
127 | { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
124 | # if XFT |
128 | # if XFT |
125 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
129 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
126 | { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, |
130 | { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, |
127 | # endif |
131 | # endif |
128 | #endif |
132 | #endif |
129 | |
133 | |
130 | // generic font fallback |
|
|
131 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
134 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
132 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
135 | //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. |
133 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
|
|
134 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
|
|
135 | #if XFT |
136 | #if XFT |
136 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
137 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
137 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
138 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
138 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
139 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
139 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, |
140 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, |
140 | |
141 | |
141 | // FreeMono is usually uglier than x fonts, so try last only. |
142 | // FreeMono is usually uglier than x fonts, so try after the others |
142 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
143 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
143 | #endif |
144 | #endif |
144 | |
145 | |
|
|
146 | // generic font fallback, put this last, as many iso10646 fonts have extents |
|
|
147 | // specified for all glyphs in the range they cover, but most are simply empty |
|
|
148 | //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
|
|
149 | //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
145 | { CS_UNKNOWN, 0 } |
150 | { CS_UNKNOWN, 0 } |
146 | }; |
151 | }; |
147 | |
152 | |
148 | // these characters are used to guess the font height and width |
153 | // these characters are used to guess the font height and width |
149 | // pango uses a similar algorithm and doesn't trust the font either. |
154 | // pango uses a similar algorithm and doesn't trust the font either. |
… | |
… | |
153 | 0x304c, 0x672c, // が本 |
158 | 0x304c, 0x672c, // が本 |
154 | }; |
159 | }; |
155 | |
160 | |
156 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
161 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
157 | |
162 | |
|
|
163 | #define dTermDisplay Display *disp = term->dpy |
|
|
164 | #define dTermGC GC gc = term->gc |
|
|
165 | |
158 | ///////////////////////////////////////////////////////////////////////////// |
166 | ///////////////////////////////////////////////////////////////////////////// |
159 | |
|
|
160 | #if XFT |
|
|
161 | rxvt_drawable::~rxvt_drawable () |
|
|
162 | { |
|
|
163 | if (xftdrawable) |
|
|
164 | XftDrawDestroy (xftdrawable); |
|
|
165 | } |
|
|
166 | |
|
|
167 | rxvt_drawable::operator XftDraw *() |
|
|
168 | { |
|
|
169 | if (!xftdrawable) |
|
|
170 | xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); |
|
|
171 | |
|
|
172 | return xftdrawable; |
|
|
173 | } |
|
|
174 | #endif |
|
|
175 | |
|
|
176 | ///////////////////////////////////////////////////////////////////////////// |
|
|
177 | |
|
|
178 | static void *enc_buf; |
|
|
179 | static uint32_t enc_len; |
|
|
180 | |
|
|
181 | static inline void * |
|
|
182 | get_enc_buf (uint32_t len) |
|
|
183 | { |
|
|
184 | if (len > enc_len) |
|
|
185 | { |
|
|
186 | free (enc_buf); |
|
|
187 | enc_buf = malloc (len); |
|
|
188 | enc_len = len; |
|
|
189 | } |
|
|
190 | |
|
|
191 | return enc_buf; |
|
|
192 | } |
|
|
193 | |
167 | |
194 | static const char * |
168 | static const char * |
195 | 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) |
196 | { |
170 | { |
197 | uint8_t *buf = (uint8_t *)get_enc_buf (len); |
171 | uint8_t *buf = rxvt_temp_buf<uint8_t> (len); |
|
|
172 | uint8_t *res = buf; |
198 | |
173 | |
199 | while (len--) |
174 | while (len--) |
200 | { |
175 | { |
201 | uint32_t c = FROM_UNICODE (cs, *text++); |
176 | uint32_t c = FROM_UNICODE (cs, *text++); |
202 | |
177 | |
… | |
… | |
207 | } |
182 | } |
208 | |
183 | |
209 | *buf++ = c; |
184 | *buf++ = c; |
210 | } |
185 | } |
211 | |
186 | |
212 | return (const char *)enc_buf; |
187 | return (const char *)res; |
213 | } |
188 | } |
214 | |
189 | |
215 | static const XChar2b * |
190 | static const XChar2b * |
216 | enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) |
191 | enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) |
217 | { |
192 | { |
218 | XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); |
193 | XChar2b *buf = rxvt_temp_buf<XChar2b> (len); |
|
|
194 | XChar2b *res = buf; |
219 | |
195 | |
220 | while (len--) |
196 | while (len--) |
221 | { |
197 | { |
222 | uint32_t c = FROM_UNICODE (cs, *text++); |
198 | uint32_t c = FROM_UNICODE (cs, *text++); |
223 | |
199 | |
… | |
… | |
230 | buf->byte1 = c >> 8; |
206 | buf->byte1 = c >> 8; |
231 | buf->byte2 = c; |
207 | buf->byte2 = c; |
232 | buf++; |
208 | buf++; |
233 | } |
209 | } |
234 | |
210 | |
235 | return (XChar2b *)enc_buf; |
211 | return res; |
236 | } |
212 | } |
237 | |
213 | |
238 | ///////////////////////////////////////////////////////////////////////////// |
214 | ///////////////////////////////////////////////////////////////////////////// |
|
|
215 | |
|
|
216 | rxvt_font::rxvt_font () |
|
|
217 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
|
|
218 | { |
|
|
219 | } |
239 | |
220 | |
240 | void |
221 | void |
241 | rxvt_font::set_name (char *name) |
222 | rxvt_font::set_name (char *name) |
242 | { |
223 | { |
243 | if (this->name == name) |
224 | if (this->name == name) |
… | |
… | |
246 | if (this->name) free (this->name); // let the compiler optimize |
227 | if (this->name) free (this->name); // let the compiler optimize |
247 | this->name = name; |
228 | this->name = name; |
248 | } |
229 | } |
249 | |
230 | |
250 | void |
231 | void |
251 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) |
232 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
252 | { |
233 | { |
253 | if (color == Color_bg) |
234 | dTermDisplay; |
254 | XClearArea (d.display->display, d, x, y, w, h, FALSE); |
235 | dTermGC; |
|
|
236 | |
|
|
237 | if (color == Color_bg || color == Color_transparent) |
|
|
238 | XClearArea (disp, d, x, y, w, h, false); |
255 | else if (color >= 0) |
239 | else if (color >= 0) |
256 | { |
240 | { |
257 | #if XFT |
241 | #if XFT |
258 | XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); |
242 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
259 | #else |
243 | #else |
260 | XSetForeground (d.display->display, TGC, r->pix_colors[color]); |
244 | XSetForeground (disp, gc, term->pix_colors[color]); |
261 | XFillRectangle (d.display->display, d, TGC, x, y, w, h); |
245 | XFillRectangle (disp, d, gc, x, y, w, h); |
262 | #endif |
246 | #endif |
263 | } |
247 | } |
264 | } |
248 | } |
|
|
249 | |
|
|
250 | ///////////////////////////////////////////////////////////////////////////// |
265 | |
251 | |
266 | #include "table/linedraw.h" |
252 | #include "table/linedraw.h" |
267 | |
253 | |
268 | struct rxvt_font_default : rxvt_font { |
254 | struct rxvt_font_default : rxvt_font { |
269 | struct rxvt_fontset *fs; |
255 | struct rxvt_fontset *fs; |
… | |
… | |
284 | p.slant = rxvt_fontprop::roman; |
270 | p.slant = rxvt_fontprop::roman; |
285 | |
271 | |
286 | return p; |
272 | return p; |
287 | } |
273 | } |
288 | |
274 | |
289 | bool load (const rxvt_fontprop &prop) |
275 | bool load (const rxvt_fontprop &prop, bool force_prop) |
290 | { |
276 | { |
291 | width = 1; height = 1; |
277 | width = 1; height = 1; |
292 | ascent = 1; descent = 0; |
278 | ascent = 1; descent = 0; |
293 | |
279 | |
294 | set_name (strdup ("built-in support font")); |
280 | set_name (strdup ("built-in support font")); |
295 | |
281 | |
296 | return true; |
282 | return true; |
297 | } |
283 | } |
298 | |
284 | |
299 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
285 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
300 | { |
286 | { |
301 | careful = false; |
287 | careful = false; |
302 | |
288 | |
303 | if (unicode <= 0x001f) |
289 | if (unicode <= 0x001f) |
304 | return true; |
290 | return true; |
… | |
… | |
308 | |
294 | |
309 | if (unicode <= 0x009f) |
295 | if (unicode <= 0x009f) |
310 | return true; |
296 | return true; |
311 | |
297 | |
312 | if (unicode >= 0x2500 && unicode <= 0x259f && |
298 | if (unicode >= 0x2500 && unicode <= 0x259f && |
313 | ! OPTION_R (Opt_skipBuiltinGlyphs)) |
299 | !term->option (Opt_skipBuiltinGlyphs)) |
314 | return true; |
300 | return true; |
315 | |
301 | |
316 | if (IS_COMPOSE (unicode)) |
302 | if (IS_COMPOSE (unicode)) |
317 | return true; |
303 | return true; |
318 | |
304 | |
… | |
… | |
334 | void |
320 | void |
335 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
321 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
336 | const text_t *text, int len, |
322 | const text_t *text, int len, |
337 | int fg, int bg) |
323 | int fg, int bg) |
338 | { |
324 | { |
339 | Display *disp = d.display->display; |
325 | dTermDisplay; |
|
|
326 | dTermGC; |
340 | |
327 | |
341 | clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); |
328 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
342 | |
329 | |
343 | XSetForeground (disp, TGC, r->pix_colors[fg]); |
330 | XSetForeground (disp, gc, term->pix_colors[fg]); |
344 | |
331 | |
345 | while (len) |
332 | while (len) |
346 | { |
333 | { |
347 | #if ENABLE_COMBINING |
334 | #if ENABLE_COMBINING |
348 | compose_char *cc; |
335 | compose_char *cc; |
… | |
… | |
352 | |
339 | |
353 | while (++text, --len && *text == NOCHAR) |
340 | while (++text, --len && *text == NOCHAR) |
354 | ; |
341 | ; |
355 | |
342 | |
356 | int width = text - tp; |
343 | int width = text - tp; |
357 | int fwidth = r->fwidth * width; |
344 | int fwidth = term->fwidth * width; |
358 | |
345 | |
359 | if (0x2500 <= t && t <= 0x259f && |
346 | if (0x2500 <= t && t <= 0x259f) |
360 | ! OPTION_R (Opt_skipBuiltinGlyphs)) |
|
|
361 | { |
347 | { |
362 | uint16_t offs = linedraw_offs[t - 0x2500]; |
348 | uint16_t offs = linedraw_offs[t - 0x2500]; |
363 | uint32_t *a = linedraw_command + (offs >> 4); |
349 | uint32_t *a = linedraw_command + (offs >> 4); |
364 | uint32_t *b = a + (offs & 15); |
350 | uint32_t *b = a + (offs & 15); |
365 | |
351 | |
366 | int W = fwidth; |
352 | int W = fwidth; |
367 | int H = r->fheight; |
353 | int H = term->fheight; |
368 | |
354 | |
369 | int x_[16]; |
355 | int x_[16]; |
370 | int y_[16]; |
356 | int y_[16]; |
371 | |
357 | |
372 | for (int i = 0; i <= 8; i++) |
358 | for (int i = 0; i <= 8; i++) |
… | |
… | |
380 | |
366 | |
381 | XGCValues gcv; |
367 | XGCValues gcv; |
382 | |
368 | |
383 | gcv.cap_style = CapButt; |
369 | gcv.cap_style = CapButt; |
384 | gcv.line_width = 0; |
370 | gcv.line_width = 0; |
385 | XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); |
371 | XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv); |
386 | |
372 | |
387 | while (a < b) |
373 | while (a < b) |
388 | { |
374 | { |
389 | uint32_t command = *a++; |
375 | uint32_t command = *a++; |
390 | |
376 | |
… | |
… | |
397 | int y2 = y_[(command >> 0) & 15]; |
383 | int y2 = y_[(command >> 0) & 15]; |
398 | |
384 | |
399 | switch (op) |
385 | switch (op) |
400 | { |
386 | { |
401 | case 0: // line |
387 | case 0: // line |
402 | XDrawLine (disp, d, TGC, x1, y1, x2, y2); |
388 | XDrawLine (disp, d, gc, x1, y1, x2, y2); |
403 | break; |
389 | break; |
404 | |
390 | |
405 | case 1: // rectangle, possibly stippled |
391 | case 1: // rectangle, possibly stippled |
406 | if (a) |
392 | if (a) |
407 | { |
393 | { |
… | |
… | |
410 | gcv.fill_style = FillStippled; |
396 | gcv.fill_style = FillStippled; |
411 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
397 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
412 | gcv.ts_x_origin = x; |
398 | gcv.ts_x_origin = x; |
413 | gcv.ts_y_origin = y; |
399 | gcv.ts_y_origin = y; |
414 | |
400 | |
415 | XChangeGC (disp, TGC, |
401 | XChangeGC (disp, gc, |
416 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
402 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
417 | &gcv); |
403 | &gcv); |
418 | } |
404 | } |
419 | |
405 | |
420 | XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
406 | XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
421 | |
407 | |
422 | if (a) |
408 | if (a) |
423 | { |
409 | { |
424 | XFreePixmap (disp, gcv.stipple); |
410 | XFreePixmap (disp, gcv.stipple); |
425 | gcv.stipple = 0; |
411 | gcv.stipple = 0; |
426 | gcv.fill_style = FillSolid; |
412 | gcv.fill_style = FillSolid; |
427 | XChangeGC (disp, TGC, GCFillStyle, &gcv); |
413 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
428 | } |
414 | } |
429 | break; |
415 | break; |
430 | case 2: // arc |
416 | case 2: // arc |
431 | XDrawArc (disp, d, TGC, |
417 | XDrawArc (disp, d, gc, |
432 | x1 - W/2, y1 - H/2, W-1, H-1, |
418 | x1 - W/2, y1 - H/2, W-1, H-1, |
433 | (a - 1) * 90*64, (b - 1) * 90*64); |
419 | (a - 1) * 90*64, (b - 1) * 90*64); |
434 | break; |
420 | break; |
435 | } |
421 | } |
436 | } |
422 | } |
437 | } |
423 | } |
438 | #if ENABLE_COMBINING |
424 | #if ENABLE_COMBINING |
439 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
425 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
440 | { |
426 | { |
|
|
427 | min_it (width, 2); // we only support wcwidth up to 2 |
|
|
428 | |
441 | text_t chrs[2]; |
429 | text_t chrs[2]; |
442 | width = min (2, width); |
|
|
443 | chrs [1] = NOCHAR; |
430 | chrs [1] = NOCHAR; |
444 | |
431 | |
445 | *chrs = cc->c1; |
432 | *chrs = cc->c1; |
446 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
433 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
447 | f1->draw (d, x, y, chrs, width, fg, bg); |
434 | f1->draw (d, x, y, chrs, width, fg, bg); |
… | |
… | |
454 | *chrs = cc->c2; |
441 | *chrs = cc->c2; |
455 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
442 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
456 | ? f1 |
443 | ? f1 |
457 | : (*fs)[fs->find_font (cc->c2)]; |
444 | : (*fs)[fs->find_font (cc->c2)]; |
458 | |
445 | |
459 | f2->draw (d, x, y, chrs, width, fg, -1); |
446 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
460 | } |
447 | } |
461 | } |
448 | } |
462 | #endif |
449 | #endif |
463 | else |
450 | else |
464 | switch (t) |
451 | switch (t) |
… | |
… | |
467 | case ZERO_WIDTH_CHAR: |
454 | case ZERO_WIDTH_CHAR: |
468 | case NOCHAR: |
455 | case NOCHAR: |
469 | break; |
456 | break; |
470 | |
457 | |
471 | default: |
458 | default: |
472 | XDrawRectangle (disp, d, TGC, x + 2, y + 2, |
459 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
473 | fwidth - 4, r->fheight - 4); |
460 | fwidth - 4, term->fheight - 4); |
474 | } |
461 | } |
475 | |
462 | |
476 | x += fwidth; |
463 | x += fwidth; |
477 | } |
464 | } |
478 | } |
465 | } |
… | |
… | |
484 | |
471 | |
485 | void clear (); |
472 | void clear (); |
486 | |
473 | |
487 | rxvt_fontprop properties (); |
474 | rxvt_fontprop properties (); |
488 | |
475 | |
489 | bool load (const rxvt_fontprop &prop); |
476 | bool load (const rxvt_fontprop &prop, bool force_prop); |
490 | |
477 | |
491 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); |
478 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
492 | |
479 | |
493 | void draw (rxvt_drawable &d, int x, int y, |
480 | void draw (rxvt_drawable &d, int x, int y, |
494 | const text_t *text, int len, |
481 | const text_t *text, int len, |
495 | int fg, int bg); |
482 | int fg, int bg); |
496 | |
483 | |
497 | bool slow; // wether this is a proportional font or has other funny characteristics |
484 | bool slow; // wether this is a proportional font or has other funny characteristics |
498 | XFontStruct *f; |
485 | XFontStruct *f; |
499 | codeset cs; |
|
|
500 | bool enc2b, encm; |
486 | bool enc2b, encm; |
501 | |
487 | |
502 | char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
488 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
503 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
489 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
504 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
490 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
505 | bool set_properties (rxvt_fontprop &p, const char *name); |
491 | bool set_properties (rxvt_fontprop &p, const char *name); |
506 | }; |
492 | }; |
507 | |
493 | |
508 | char * |
494 | char * |
509 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
495 | rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const |
510 | { |
496 | { |
511 | unsigned long value; |
497 | unsigned long value; |
512 | |
498 | |
513 | if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) |
499 | if (XGetFontProperty (f, property, &value)) |
514 | return XGetAtomName (DISPLAY, value); |
500 | return XGetAtomName (term->dpy, value); |
515 | else |
501 | else |
516 | return rxvt_strdup (repl); |
502 | return rxvt_strdup (repl); |
517 | } |
503 | } |
518 | |
504 | |
519 | rxvt_fontprop |
505 | rxvt_fontprop |
… | |
… | |
525 | } |
511 | } |
526 | |
512 | |
527 | bool |
513 | bool |
528 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
514 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
529 | { |
515 | { |
530 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
516 | p.width = width != rxvt_fontprop::unset ? width |
|
|
517 | : avgwidth ? (avgwidth + 1) / 10 |
|
|
518 | : (height + 1) / 2; |
531 | p.height = height; |
519 | p.height = height; |
532 | p.ascent = rxvt_fontprop::unset; |
520 | p.ascent = rxvt_fontprop::unset; |
533 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
521 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
534 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
522 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
535 | |
523 | |
… | |
… | |
540 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
528 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
541 | { |
529 | { |
542 | unsigned long height; |
530 | unsigned long height; |
543 | |
531 | |
544 | #if 0 |
532 | #if 0 |
545 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
533 | if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height)) |
546 | return false; |
534 | return false; |
547 | #else |
535 | #else |
548 | height = f->ascent + f->descent; |
536 | height = f->ascent + f->descent; |
549 | #endif |
537 | #endif |
550 | |
538 | |
551 | unsigned long avgwidth; |
539 | unsigned long avgwidth; |
552 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
540 | if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth)) |
553 | avgwidth = 0; |
541 | avgwidth = 0; |
554 | |
542 | |
555 | char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
543 | char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium"); |
556 | char *slant = get_property (f, "SLANT", "r"); |
544 | char *slant = get_property (f, term->xa [XA_SLANT], "r"); |
557 | |
545 | |
558 | set_properties (p, height, weight, slant, avgwidth); |
546 | set_properties (p, height, weight, slant, avgwidth); |
559 | |
547 | |
560 | free (weight); |
548 | free (weight); |
561 | free (slant); |
549 | free (slant); |
… | |
… | |
566 | } |
554 | } |
567 | |
555 | |
568 | bool |
556 | bool |
569 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
557 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
570 | { |
558 | { |
|
|
559 | dTermDisplay; |
571 | int slashes = 0; |
560 | int slashes = 0; |
572 | const char *comp[13]; |
561 | const char *comp[13]; |
573 | |
562 | |
574 | for (const char *c = name; *c; c++) |
563 | for (const char *c = name; *c; c++) |
575 | if (*c == '-') |
564 | if (*c == '-') |
… | |
… | |
583 | if (slashes >= 13 |
572 | if (slashes >= 13 |
584 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
573 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
585 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
574 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
586 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
575 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
587 | |
576 | |
588 | XFontStruct *f = XLoadQueryFont (DISPLAY, name); |
577 | XFontStruct *f = XLoadQueryFont (disp, name); |
589 | |
578 | |
590 | if (f) |
579 | if (f) |
591 | { |
580 | { |
592 | // the font should really exist now. if not, we have a problem |
581 | // the font should really exist now. if not, we have a problem |
593 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
582 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
594 | // in that case, just return garbage. |
583 | // in that case, just return garbage. |
595 | bool ret = set_properties (p, f); |
584 | bool ret = set_properties (p, f); |
596 | XFreeFont (DISPLAY, f); |
585 | XFreeFont (disp, f); |
597 | return ret; |
586 | return ret; |
598 | } |
587 | } |
599 | else |
588 | else |
600 | return false; |
589 | return false; |
601 | } |
590 | } |
… | |
… | |
637 | return false; |
626 | return false; |
638 | } |
627 | } |
639 | } |
628 | } |
640 | |
629 | |
641 | bool |
630 | bool |
642 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
631 | rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop) |
643 | { |
632 | { |
644 | Display *disp = DISPLAY; |
633 | dTermDisplay; |
645 | |
634 | |
646 | clear (); |
635 | clear (); |
647 | |
636 | |
648 | char field_str[64]; // enough for 128 bits |
637 | char field_str[64]; // enough for 128 bits |
649 | |
638 | |
650 | // first morph the font if required |
639 | // first morph the font if required |
651 | if (prop.weight != rxvt_fontprop::unset |
640 | if (force_prop) |
652 | || prop.slant != rxvt_fontprop::unset) |
|
|
653 | { |
641 | { |
654 | char fname[1024]; |
642 | char fname[1024]; |
655 | |
643 | |
656 | if (name[0] != '-') |
644 | if (name[0] != '-') |
657 | { |
645 | { |
658 | f = XLoadQueryFont (disp, name); |
646 | f = XLoadQueryFont (disp, name); |
659 | |
647 | |
660 | if (!f) |
648 | if (!f) |
661 | return false; |
649 | return false; |
662 | |
650 | |
663 | char *new_name = get_property (f, "FONT", name); |
651 | char *new_name = get_property (f, XA_FONT, name); |
664 | |
652 | |
665 | if (new_name) |
653 | if (new_name) |
666 | set_name (new_name); |
654 | set_name (new_name); |
667 | else |
655 | else |
668 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
656 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
… | |
… | |
724 | int diff = 0; |
712 | int diff = 0; |
725 | |
713 | |
726 | if (replace_field (fname, list[i], 6, '0', field_str)) |
714 | if (replace_field (fname, list[i], 6, '0', field_str)) |
727 | diff += 10; // slightly penalize scalable fonts |
715 | diff += 10; // slightly penalize scalable fonts |
728 | else if (replace_field (fname, list[i], 11, '0', "0")) |
716 | else if (replace_field (fname, list[i], 11, '0', "0")) |
729 | diff += 300; // more heavily penalize what looks like scaled bitmap fotns |
717 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
730 | |
718 | |
731 | if (!set_properties (p, fname)) |
719 | if (!set_properties (p, fname)) |
732 | continue; |
720 | continue; |
733 | |
721 | |
734 | if (prop.height != rxvt_fontprop::unset |
722 | if (prop.height != rxvt_fontprop::unset |
… | |
… | |
777 | delete [] fonts; |
765 | delete [] fonts; |
778 | |
766 | |
779 | if (!f) |
767 | if (!f) |
780 | return false; |
768 | return false; |
781 | |
769 | |
782 | char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
770 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
783 | char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
771 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
784 | |
772 | |
785 | if (registry && encoding) |
773 | if (registry && encoding) |
786 | { |
774 | { |
787 | char charset[64]; |
775 | char charset[64]; |
788 | snprintf (charset, 64, "%s-%s", registry, encoding); |
776 | snprintf (charset, 64, "%s-%s", registry, encoding); |
789 | |
777 | |
790 | cs = codeset_from_name (charset); |
778 | cs = codeset_from_name (charset); |
791 | } |
779 | } |
792 | else |
780 | else |
793 | { |
781 | { |
794 | const char *charset = get_property (f, "FONT", 0); |
782 | const char *charset = get_property (f, XA_FONT, 0); |
795 | |
783 | |
796 | if (!charset) |
784 | if (!charset) |
797 | charset = name; |
785 | charset = name; |
798 | |
786 | |
799 | int count = 13; |
787 | int count = 13; |
… | |
… | |
814 | enc2b = encm || f->max_char_or_byte2 > 255; |
802 | enc2b = encm || f->max_char_or_byte2 > 255; |
815 | |
803 | |
816 | slow = false; |
804 | slow = false; |
817 | |
805 | |
818 | #if 1 // only used for slow detection, TODO optimize |
806 | #if 1 // only used for slow detection, TODO optimize |
819 | if (f->min_bounds.width == f->max_bounds.width) |
807 | if (f->min_bounds.width == f->max_bounds.width || !f->per_char) |
820 | width = f->min_bounds.width; |
|
|
821 | else if (f->per_char == NULL) |
|
|
822 | width = f->max_bounds.width; |
808 | width = f->max_bounds.width; |
823 | else |
809 | else |
824 | { |
810 | { |
825 | slow = true; |
811 | slow = true; |
826 | |
812 | |
… | |
… | |
842 | |
828 | |
843 | width = 1; |
829 | width = 1; |
844 | |
830 | |
845 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
831 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
846 | { |
832 | { |
847 | if (cs != CS_UNICODE |
|
|
848 | && *t > 0x100 |
|
|
849 | && FROM_UNICODE (cs, *t) == NOCHAR) |
833 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
850 | continue; |
834 | continue; |
851 | |
835 | |
852 | // ignore characters we wouldn't use anyways |
836 | // ignore characters we wouldn't use anyways |
853 | bool careful; |
837 | bool careful; |
854 | if (!has_char (*t, &prop, careful)) |
838 | if (!has_char (*t, &prop, careful)) |
… | |
… | |
858 | |
842 | |
859 | XCharStruct g; |
843 | XCharStruct g; |
860 | int dir_ret, asc_ret, des_ret; |
844 | int dir_ret, asc_ret, des_ret; |
861 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
845 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
862 | |
846 | |
|
|
847 | int wcw = WCWIDTH (*t); |
863 | int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
848 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
864 | |
849 | |
865 | if (width < g.width) width = g.width; |
850 | if (width < g.width) width = g.width; |
866 | } |
851 | } |
867 | |
852 | |
868 | if (cs == CS_UNKNOWN) |
853 | if (cs == CS_UNKNOWN) |
869 | { |
854 | { |
870 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
855 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
… | |
… | |
887 | void |
872 | void |
888 | rxvt_font_x11::clear () |
873 | rxvt_font_x11::clear () |
889 | { |
874 | { |
890 | if (f) |
875 | if (f) |
891 | { |
876 | { |
892 | XFreeFont (DISPLAY, f); |
877 | XFreeFont (term->dpy, f); |
893 | f = 0; |
878 | f = 0; |
894 | } |
879 | } |
895 | } |
880 | } |
896 | |
881 | |
897 | bool |
882 | bool |
898 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
883 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
899 | { |
884 | { |
900 | uint32_t ch = FROM_UNICODE (cs, unicode); |
885 | uint32_t ch = FROM_UNICODE (cs, unicode); |
901 | |
886 | |
902 | if (ch == NOCHAR) |
887 | if (ch == NOCHAR) |
903 | return false; |
888 | return false; |
… | |
… | |
940 | return false; |
925 | return false; |
941 | |
926 | |
942 | if (!prop || prop->width == rxvt_fontprop::unset) |
927 | if (!prop || prop->width == rxvt_fontprop::unset) |
943 | return true; |
928 | return true; |
944 | |
929 | |
945 | // check character against base font bounding box |
930 | // check wether character overlaps previous/next character |
946 | int w = xcs->width; |
931 | int w = xcs->rbearing - xcs->lbearing; |
947 | int wcw = wcwidth (unicode); |
932 | int wcw = max (WCWIDTH (unicode), 1); |
948 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
|
|
949 | |
933 | |
950 | careful = w > prop->width; |
934 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
951 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
935 | |
|
|
936 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
952 | return false; |
937 | return false; |
953 | |
938 | |
954 | return true; |
939 | return true; |
955 | } |
940 | } |
956 | |
941 | |
… | |
… | |
962 | // this looks like a mess /. |
947 | // this looks like a mess /. |
963 | // and it is a mess /. |
948 | // and it is a mess /. |
964 | // yet we are trying to be perfect /. |
949 | // yet we are trying to be perfect /. |
965 | // but the result still isn't perfect /. |
950 | // but the result still isn't perfect /. |
966 | |
951 | |
|
|
952 | dTermDisplay; |
|
|
953 | dTermGC; |
|
|
954 | |
967 | bool slow = this->slow |
955 | bool slow = this->slow |
968 | || width != r->fwidth |
956 | || width != term->fwidth |
969 | || height != r->fheight; |
957 | || height != term->fheight; |
970 | |
958 | |
971 | int base = ascent; // sorry, incorrect: r->fbase; |
959 | int base = ascent; // sorry, incorrect: term->fbase; |
972 | |
960 | |
973 | XGCValues v; |
961 | XGCValues v; |
974 | v.foreground = r->pix_colors[fg]; |
962 | v.foreground = term->pix_colors[fg]; |
975 | v.font = f->fid; |
963 | v.font = f->fid; |
976 | |
964 | |
977 | if (enc2b) |
965 | if (enc2b) |
978 | { |
966 | { |
979 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
967 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
980 | |
968 | |
981 | if (bg == Color_bg && !slow) |
969 | if (bg == Color_bg && !slow) |
982 | { |
970 | { |
983 | v.background = r->pix_colors[bg]; |
971 | v.background = term->pix_colors[bg]; |
984 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
972 | XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v); |
985 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
973 | XDrawImageString16 (disp, d, gc, x, y + base, xc, len); |
986 | } |
974 | } |
987 | else |
975 | else |
988 | { |
976 | { |
989 | clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); |
977 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
990 | |
978 | |
991 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
979 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
992 | |
980 | |
993 | if (slow) |
981 | if (slow) |
994 | { |
982 | { |
995 | do |
983 | do |
996 | { |
984 | { |
997 | if (xc->byte1 || xc->byte2) |
985 | if (xc->byte1 || xc->byte2) |
998 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
986 | XDrawString16 (disp, d, gc, x, y + base, xc, 1); |
999 | |
987 | |
1000 | x += r->fwidth; |
988 | x += term->fwidth; |
1001 | xc++; len--; |
989 | xc++; len--; |
1002 | } |
990 | } |
1003 | while (len); |
991 | while (len); |
1004 | } |
992 | } |
1005 | else |
993 | else |
1006 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); |
994 | XDrawString16 (disp, d, gc, x, y + base, xc, len); |
1007 | } |
995 | } |
1008 | } |
996 | } |
1009 | else |
997 | else |
1010 | { |
998 | { |
1011 | const char *xc = enc_char (text, len, cs, slow); |
999 | const char *xc = enc_char (text, len, cs, slow); |
1012 | |
1000 | |
1013 | if (bg == Color_bg && !slow) |
1001 | if (bg == Color_bg && !slow) |
1014 | { |
1002 | { |
1015 | v.background = r->pix_colors[bg]; |
1003 | v.background = term->pix_colors[bg]; |
1016 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
1004 | XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v); |
1017 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
1005 | XDrawImageString (disp, d, gc, x, y + base, xc, len); |
1018 | } |
1006 | } |
1019 | else |
1007 | else |
1020 | { |
1008 | { |
1021 | clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); |
1009 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1022 | |
1010 | |
1023 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
1011 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1024 | |
1012 | |
1025 | if (slow) |
1013 | if (slow) |
1026 | { |
1014 | { |
1027 | do |
1015 | do |
1028 | { |
1016 | { |
1029 | if (*xc) |
1017 | if (*xc) |
1030 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
1018 | XDrawString (disp, d, gc, x, y + base, xc, 1); |
1031 | |
1019 | |
1032 | x += r->fwidth; |
1020 | x += term->fwidth; |
1033 | xc++; len--; |
1021 | xc++; len--; |
1034 | } |
1022 | } |
1035 | while (len); |
1023 | while (len); |
1036 | } |
1024 | } |
1037 | else |
1025 | else |
1038 | XDrawString (d.display->display, d, TGC, x, y + base, xc, len); |
1026 | XDrawString (disp, d, gc, x, y + base, xc, len); |
1039 | } |
1027 | } |
1040 | } |
1028 | } |
1041 | } |
1029 | } |
1042 | |
1030 | |
1043 | ///////////////////////////////////////////////////////////////////////////// |
1031 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
1049 | |
1037 | |
1050 | void clear (); |
1038 | void clear (); |
1051 | |
1039 | |
1052 | rxvt_fontprop properties (); |
1040 | rxvt_fontprop properties (); |
1053 | |
1041 | |
1054 | bool load (const rxvt_fontprop &prop); |
1042 | bool load (const rxvt_fontprop &prop, bool force_prop); |
1055 | |
1043 | |
1056 | void draw (rxvt_drawable &d, int x, int y, |
1044 | void draw (rxvt_drawable &d, int x, int y, |
1057 | const text_t *text, int len, |
1045 | const text_t *text, int len, |
1058 | int fg, int bg); |
1046 | int fg, int bg); |
1059 | |
1047 | |
1060 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); |
1048 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; |
1061 | |
1049 | |
1062 | protected: |
1050 | protected: |
1063 | XftFont *f; |
1051 | XftFont *f; |
1064 | }; |
1052 | }; |
1065 | |
1053 | |
1066 | void |
1054 | void |
1067 | rxvt_font_xft::clear () |
1055 | rxvt_font_xft::clear () |
1068 | { |
1056 | { |
1069 | if (f) |
1057 | if (f) |
1070 | { |
1058 | { |
1071 | XftFontClose (DISPLAY, f); |
1059 | XftFontClose (term->dpy, f); |
1072 | f = 0; |
1060 | f = 0; |
1073 | } |
1061 | } |
1074 | } |
1062 | } |
1075 | |
1063 | |
1076 | rxvt_fontprop |
1064 | rxvt_fontprop |
… | |
… | |
1092 | |
1080 | |
1093 | return p; |
1081 | return p; |
1094 | } |
1082 | } |
1095 | |
1083 | |
1096 | bool |
1084 | bool |
1097 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1085 | rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop) |
1098 | { |
1086 | { |
1099 | Display *disp = DISPLAY; |
1087 | dTermDisplay; |
1100 | |
1088 | |
1101 | clear (); |
1089 | clear (); |
1102 | |
1090 | |
1103 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
1091 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
1104 | |
1092 | |
… | |
… | |
1111 | && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
1099 | && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
1112 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1100 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1113 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1101 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1114 | |
1102 | |
1115 | if (prop.weight != rxvt_fontprop::unset |
1103 | if (prop.weight != rxvt_fontprop::unset |
1116 | && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
1104 | && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)) |
1117 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1105 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1118 | |
1106 | |
1119 | if (prop.slant != rxvt_fontprop::unset |
1107 | if (prop.slant != rxvt_fontprop::unset |
1120 | && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) |
1108 | && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)) |
1121 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1109 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1122 | |
1110 | |
1123 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1111 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1124 | // clip width, we can't do better, or can we? |
1112 | // clip width, we can't do better, or can we? |
1125 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1113 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
… | |
… | |
1131 | |
1119 | |
1132 | // store generated name so iso14755 view gives better results |
1120 | // store generated name so iso14755 view gives better results |
1133 | set_name ((char *)FcNameUnparse (p)); |
1121 | set_name ((char *)FcNameUnparse (p)); |
1134 | |
1122 | |
1135 | XftResult result; |
1123 | XftResult result; |
1136 | FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); |
1124 | FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result); |
1137 | |
1125 | |
1138 | FcPatternDestroy (p); |
1126 | FcPatternDestroy (p); |
1139 | |
1127 | |
1140 | if (!match) |
1128 | if (!match) |
1141 | return false; |
1129 | return false; |
… | |
… | |
1183 | XGlyphInfo g; |
1171 | XGlyphInfo g; |
1184 | XftTextExtents16 (disp, f, &ch, 1, &g); |
1172 | XftTextExtents16 (disp, f, &ch, 1, &g); |
1185 | |
1173 | |
1186 | g.width -= g.x; |
1174 | g.width -= g.x; |
1187 | |
1175 | |
1188 | int wcw = wcwidth (ch); |
1176 | int wcw = WCWIDTH (ch); |
1189 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
1177 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
1190 | |
1178 | |
1191 | if (width < g.width ) width = g.width; |
1179 | if (width < g.width ) width = g.width; |
1192 | if (height < g.height ) height = g.height; |
1180 | if (height < g.height ) height = g.height; |
1193 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
1181 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
… | |
… | |
1239 | |
1227 | |
1240 | return success; |
1228 | return success; |
1241 | } |
1229 | } |
1242 | |
1230 | |
1243 | bool |
1231 | bool |
1244 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
1232 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1245 | { |
1233 | { |
1246 | careful = false; |
1234 | careful = false; |
1247 | |
1235 | |
1248 | if (!XftCharExists (DISPLAY, f, unicode)) |
1236 | if (!XftCharExists (term->dpy, f, unicode)) |
1249 | return false; |
1237 | return false; |
1250 | |
1238 | |
1251 | if (!prop || prop->width == rxvt_fontprop::unset) |
1239 | if (!prop || prop->width == rxvt_fontprop::unset) |
1252 | return true; |
1240 | return true; |
1253 | |
1241 | |
1254 | // check character against base font bounding box |
1242 | // check character against base font bounding box |
1255 | FcChar32 ch = unicode; |
1243 | FcChar32 ch = unicode; |
1256 | XGlyphInfo g; |
1244 | XGlyphInfo g; |
1257 | XftTextExtents32 (DISPLAY, f, &ch, 1, &g); |
1245 | XftTextExtents32 (term->dpy, f, &ch, 1, &g); |
1258 | |
1246 | |
1259 | int w = g.width - g.x; |
1247 | int w = g.width - g.x; |
1260 | int wcw = wcwidth (unicode); |
1248 | int wcw = max (WCWIDTH (unicode), 1); |
1261 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
|
|
1262 | |
1249 | |
1263 | careful = w > prop->width; |
1250 | careful = g.x > 0 || w > prop->width * wcw; |
1264 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
1251 | |
|
|
1252 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
|
|
1253 | return false; |
|
|
1254 | |
|
|
1255 | // this weeds out _totally_ broken fonts, or glyphs |
|
|
1256 | if (!OVERLAP_OK (g.xOff, wcw, prop)) |
1265 | return false; |
1257 | return false; |
1266 | |
1258 | |
1267 | return true; |
1259 | return true; |
1268 | } |
1260 | } |
1269 | |
1261 | |
1270 | void |
1262 | void |
1271 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1263 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1272 | const text_t *text, int len, |
1264 | const text_t *text, int len, |
1273 | int fg, int bg) |
1265 | int fg, int bg) |
1274 | { |
1266 | { |
1275 | clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); |
|
|
1276 | |
|
|
1277 | int base = ascent; // should be fbase, but that is incorrect |
|
|
1278 | |
|
|
1279 | XGlyphInfo extents; |
1267 | XGlyphInfo extents; |
1280 | FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); |
1268 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1281 | FcChar32 *ep = enc; |
1269 | XftGlyphSpec *ep = enc; |
1282 | int ewidth = 0; |
1270 | |
|
|
1271 | dTermDisplay; |
|
|
1272 | dTermGC; |
|
|
1273 | |
|
|
1274 | int w = term->fwidth * len; |
|
|
1275 | int h = term->fheight; |
|
|
1276 | |
|
|
1277 | /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. |
|
|
1278 | * Maybe make buffering into a resource flag? Compile time option doesn't seems like a |
|
|
1279 | * good idea from the perspective of packaging for wide variety of user configs. |
|
|
1280 | */ |
|
|
1281 | bool buffered = true |
|
|
1282 | #ifdef FORCE_UNBUFFERED_XFT |
|
|
1283 | && bg >= 0 |
|
|
1284 | #endif |
|
|
1285 | ; |
|
|
1286 | // cut trailing spaces |
|
|
1287 | while (len && text [len - 1] == ' ') |
|
|
1288 | len--; |
|
|
1289 | |
|
|
1290 | int x_ = buffered ? 0 : x; |
|
|
1291 | int y_ = buffered ? 0 : y; |
1283 | |
1292 | |
1284 | while (len) |
1293 | while (len) |
1285 | { |
1294 | { |
1286 | int cwidth = r->fwidth; |
1295 | int cwidth = term->fwidth; |
1287 | FcChar32 fc = *text++; len--; |
1296 | FcChar32 fc = *text++; len--; |
1288 | |
1297 | |
1289 | while (len && *text == NOCHAR) |
1298 | while (len && *text == NOCHAR) |
1290 | text++, len--, cwidth += r->fwidth; |
1299 | text++, len--, cwidth += term->fwidth; |
1291 | |
1300 | |
1292 | if (fc == ' ' && ep == enc) // skip leading spaces |
1301 | if (fc != ' ') // skip spaces |
|
|
1302 | { |
|
|
1303 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
|
|
1304 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
|
|
1305 | |
|
|
1306 | ep->glyph = glyph; |
|
|
1307 | ep->x = x_ + (cwidth - extents.xOff >> 1); |
|
|
1308 | ep->y = y_ + ascent; |
|
|
1309 | |
|
|
1310 | if (extents.xOff == 0) |
|
|
1311 | ep->x = x_ + cwidth; |
|
|
1312 | |
|
|
1313 | ep++; |
|
|
1314 | } |
|
|
1315 | |
1293 | x += cwidth; |
1316 | x_ += cwidth; |
|
|
1317 | } |
|
|
1318 | |
|
|
1319 | if (buffered) |
|
|
1320 | { |
|
|
1321 | if (ep != enc) |
|
|
1322 | { |
|
|
1323 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
|
|
1324 | bool back_rendered = false; |
|
|
1325 | |
|
|
1326 | #ifdef HAVE_BG_PIXMAP |
|
|
1327 | if (term->bgPixmap.pixmap) |
|
|
1328 | { |
|
|
1329 | Picture dst = 0; |
|
|
1330 | |
|
|
1331 | if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) |
|
|
1332 | dst = XftDrawPicture (d2); |
|
|
1333 | |
|
|
1334 | if (bg < 0 || dst != 0) |
|
|
1335 | { |
|
|
1336 | int src_x = x, src_y = y ; |
|
|
1337 | |
|
|
1338 | if (term->bgPixmap.is_parentOrigin ()) |
|
|
1339 | { |
|
|
1340 | src_x += term->window_vt_x; |
|
|
1341 | src_y += term->window_vt_y; |
|
|
1342 | } |
|
|
1343 | |
|
|
1344 | if (term->bgPixmap.pmap_width >= src_x+w |
|
|
1345 | && term->bgPixmap.pmap_height >= src_y+h) |
|
|
1346 | { |
|
|
1347 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
|
|
1348 | src_x, src_y, w, h, 0, 0); |
|
|
1349 | } |
|
|
1350 | else |
|
|
1351 | { |
|
|
1352 | XGCValues gcv; |
|
|
1353 | |
|
|
1354 | gcv.fill_style = FillTiled; |
|
|
1355 | gcv.tile = term->bgPixmap.pixmap; |
|
|
1356 | gcv.ts_x_origin = -src_x; |
|
|
1357 | gcv.ts_y_origin = -src_y; |
|
|
1358 | |
|
|
1359 | XChangeGC (disp, gc, |
|
|
1360 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
|
|
1361 | &gcv); |
|
|
1362 | |
|
|
1363 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
|
|
1364 | |
|
|
1365 | gcv.fill_style = FillSolid; |
|
|
1366 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
|
|
1367 | } |
|
|
1368 | |
|
|
1369 | if (bg >= 0) |
|
|
1370 | { |
|
|
1371 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1372 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
1373 | } |
|
|
1374 | |
|
|
1375 | back_rendered = true; |
|
|
1376 | } |
|
|
1377 | } |
|
|
1378 | #endif |
|
|
1379 | |
|
|
1380 | if (bg >= 0 && !back_rendered) |
|
|
1381 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
|
|
1382 | |
|
|
1383 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
|
|
1384 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
|
|
1385 | } |
1294 | else |
1386 | else |
1295 | { |
1387 | clear_rect (d, x, y, w, h, bg); |
1296 | FT_UInt gl = XftCharIndex (d.display->display, f, fc); |
1388 | } |
1297 | XftGlyphExtents (d.display->display, f, &gl, 1, &extents); |
1389 | else |
1298 | |
|
|
1299 | if (extents.xOff != cwidth) |
|
|
1300 | { |
|
|
1301 | if (ewidth) |
|
|
1302 | { |
|
|
1303 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
|
|
1304 | x, y + base, enc, ep - enc); |
|
|
1305 | x += ewidth; |
|
|
1306 | |
|
|
1307 | ep = enc; |
|
|
1308 | ewidth = 0; |
|
|
1309 | } |
|
|
1310 | |
|
|
1311 | if (extents.xOff > cwidth) |
|
|
1312 | extents.xOff = cwidth; |
|
|
1313 | |
|
|
1314 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
|
|
1315 | x + (cwidth - extents.xOff >> 1), |
|
|
1316 | y + base, &gl, 1); |
|
|
1317 | x += cwidth; |
|
|
1318 | } |
|
|
1319 | else |
|
|
1320 | { |
|
|
1321 | *ep++ = gl; |
|
|
1322 | ewidth += cwidth; |
|
|
1323 | } |
|
|
1324 | } |
|
|
1325 | } |
1390 | { |
1326 | |
1391 | clear_rect (d, x, y, w, h, bg); |
1327 | if (ep != enc) |
|
|
1328 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
1392 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
1329 | x, y + base, enc, ep - enc); |
1393 | } |
1330 | } |
1394 | } |
|
|
1395 | |
1331 | #endif |
1396 | #endif |
1332 | |
1397 | |
1333 | ///////////////////////////////////////////////////////////////////////////// |
1398 | ///////////////////////////////////////////////////////////////////////////// |
1334 | |
1399 | |
1335 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
1400 | rxvt_fontset::rxvt_fontset (rxvt_term *term) |
1336 | : fontdesc (0), r (r) |
1401 | : fontdesc (0), term (term) |
1337 | { |
1402 | { |
1338 | clear (); |
1403 | clear (); |
1339 | } |
1404 | } |
1340 | |
1405 | |
1341 | rxvt_fontset::~rxvt_fontset () |
1406 | rxvt_fontset::~rxvt_fontset () |
… | |
… | |
1346 | void |
1411 | void |
1347 | rxvt_fontset::clear () |
1412 | rxvt_fontset::clear () |
1348 | { |
1413 | { |
1349 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1414 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1350 | = rxvt_fontprop::unset; |
1415 | = rxvt_fontprop::unset; |
|
|
1416 | force_prop = false; |
1351 | |
1417 | |
1352 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1418 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1353 | FONT_UNREF (*i); |
1419 | FONT_UNREF (*i); |
1354 | |
1420 | |
1355 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1421 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
… | |
… | |
1385 | f = new rxvt_font_x11; |
1451 | f = new rxvt_font_x11; |
1386 | } |
1452 | } |
1387 | else |
1453 | else |
1388 | f = new rxvt_font_x11; |
1454 | f = new rxvt_font_x11; |
1389 | |
1455 | |
1390 | f->set_term (r); |
1456 | f->set_term (term); |
1391 | f->set_name (strdup (name)); |
1457 | f->set_name (strdup (name)); |
1392 | |
1458 | |
1393 | f->cs = cs; |
1459 | f->cs = cs; |
1394 | f->loaded = false; |
1460 | f->loaded = false; |
1395 | |
1461 | |
… | |
… | |
1467 | if (fonts[i]->loaded) |
1533 | if (fonts[i]->loaded) |
1468 | return true; |
1534 | return true; |
1469 | |
1535 | |
1470 | fonts[i]->loaded = true; |
1536 | fonts[i]->loaded = true; |
1471 | |
1537 | |
1472 | if (!fonts[i]->load (prop)) |
1538 | if (!fonts[i]->load (prop, force_prop)) |
1473 | { |
1539 | { |
1474 | fonts[i]->cs = CS_UNKNOWN; |
1540 | fonts[i]->cs = CS_UNKNOWN; |
1475 | return false; |
1541 | return false; |
1476 | } |
1542 | } |
1477 | |
1543 | |
… | |
… | |
1578 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1644 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1579 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1645 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1580 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1646 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1581 | |
1647 | |
1582 | XftResult result; |
1648 | XftResult result; |
1583 | FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); |
1649 | FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result); |
1584 | |
1650 | |
1585 | FcPatternDestroy (p); |
1651 | FcPatternDestroy (p); |
1586 | |
1652 | |
1587 | if (match) |
1653 | if (match) |
1588 | { |
1654 | { |