1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*----------------------------------------------------------------------* |
2 | * File: rxvtfont.C |
2 | * File: rxvtfont.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
4 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
5 | * - original version. |
5 | * - original version. |
6 | * |
6 | * |
… | |
… | |
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 | { |
|
|
234 | dTermDisplay; |
|
|
235 | dTermGC; |
|
|
236 | |
253 | if (color == Color_bg) |
237 | if (color < 0 || color == Color_bg) |
254 | XClearArea (d.display->display, d, x, y, w, h, FALSE); |
238 | XClearArea (disp, d, x, y, w, h, false); |
255 | else if (color >= 0) |
239 | else |
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; |
… | |
… | |
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 | !r->option (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 | { |
347 | { |
361 | uint16_t offs = linedraw_offs[t - 0x2500]; |
348 | uint16_t offs = linedraw_offs[t - 0x2500]; |
362 | uint32_t *a = linedraw_command + (offs >> 4); |
349 | uint32_t *a = linedraw_command + (offs >> 4); |
363 | uint32_t *b = a + (offs & 15); |
350 | uint32_t *b = a + (offs & 15); |
364 | |
351 | |
365 | int W = fwidth; |
352 | int W = fwidth; |
366 | int H = r->fheight; |
353 | int H = term->fheight; |
367 | |
354 | |
368 | int x_[16]; |
355 | int x_[16]; |
369 | int y_[16]; |
356 | int y_[16]; |
370 | |
357 | |
371 | for (int i = 0; i <= 8; i++) |
358 | for (int i = 0; i <= 8; i++) |
… | |
… | |
379 | |
366 | |
380 | XGCValues gcv; |
367 | XGCValues gcv; |
381 | |
368 | |
382 | gcv.cap_style = CapButt; |
369 | gcv.cap_style = CapButt; |
383 | gcv.line_width = 0; |
370 | gcv.line_width = 0; |
384 | XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); |
371 | XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv); |
385 | |
372 | |
386 | while (a < b) |
373 | while (a < b) |
387 | { |
374 | { |
388 | uint32_t command = *a++; |
375 | uint32_t command = *a++; |
389 | |
376 | |
… | |
… | |
396 | int y2 = y_[(command >> 0) & 15]; |
383 | int y2 = y_[(command >> 0) & 15]; |
397 | |
384 | |
398 | switch (op) |
385 | switch (op) |
399 | { |
386 | { |
400 | case 0: // line |
387 | case 0: // line |
401 | XDrawLine (disp, d, TGC, x1, y1, x2, y2); |
388 | XDrawLine (disp, d, gc, x1, y1, x2, y2); |
402 | break; |
389 | break; |
403 | |
390 | |
404 | case 1: // rectangle, possibly stippled |
391 | case 1: // rectangle, possibly stippled |
405 | if (a) |
392 | if (a) |
406 | { |
393 | { |
… | |
… | |
409 | gcv.fill_style = FillStippled; |
396 | gcv.fill_style = FillStippled; |
410 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
397 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
411 | gcv.ts_x_origin = x; |
398 | gcv.ts_x_origin = x; |
412 | gcv.ts_y_origin = y; |
399 | gcv.ts_y_origin = y; |
413 | |
400 | |
414 | XChangeGC (disp, TGC, |
401 | XChangeGC (disp, gc, |
415 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
402 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
416 | &gcv); |
403 | &gcv); |
417 | } |
404 | } |
418 | |
405 | |
419 | 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); |
420 | |
407 | |
421 | if (a) |
408 | if (a) |
422 | { |
409 | { |
423 | XFreePixmap (disp, gcv.stipple); |
410 | XFreePixmap (disp, gcv.stipple); |
424 | gcv.stipple = 0; |
411 | gcv.stipple = 0; |
425 | gcv.fill_style = FillSolid; |
412 | gcv.fill_style = FillSolid; |
426 | XChangeGC (disp, TGC, GCFillStyle, &gcv); |
413 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
427 | } |
414 | } |
428 | break; |
415 | break; |
429 | case 2: // arc |
416 | case 2: // arc |
430 | XDrawArc (disp, d, TGC, |
417 | XDrawArc (disp, d, gc, |
431 | x1 - W/2, y1 - H/2, W-1, H-1, |
418 | x1 - W/2, y1 - H/2, W-1, H-1, |
432 | (a - 1) * 90*64, (b - 1) * 90*64); |
419 | (a - 1) * 90*64, (b - 1) * 90*64); |
433 | break; |
420 | break; |
434 | } |
421 | } |
435 | } |
422 | } |
436 | } |
423 | } |
437 | #if ENABLE_COMBINING |
424 | #if ENABLE_COMBINING |
438 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
425 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
439 | { |
426 | { |
|
|
427 | min_it (width, 2); // we only support wcwidth up to 2 |
|
|
428 | |
440 | text_t chrs[2]; |
429 | text_t chrs[2]; |
441 | width = min (2, width); |
|
|
442 | chrs [1] = NOCHAR; |
430 | chrs [1] = NOCHAR; |
443 | |
431 | |
444 | *chrs = cc->c1; |
432 | *chrs = cc->c1; |
445 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
433 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
446 | f1->draw (d, x, y, chrs, width, fg, bg); |
434 | f1->draw (d, x, y, chrs, width, fg, bg); |
… | |
… | |
466 | case ZERO_WIDTH_CHAR: |
454 | case ZERO_WIDTH_CHAR: |
467 | case NOCHAR: |
455 | case NOCHAR: |
468 | break; |
456 | break; |
469 | |
457 | |
470 | default: |
458 | default: |
471 | XDrawRectangle (disp, d, TGC, x + 2, y + 2, |
459 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
472 | fwidth - 4, r->fheight - 4); |
460 | fwidth - 4, term->fheight - 4); |
473 | } |
461 | } |
474 | |
462 | |
475 | x += fwidth; |
463 | x += fwidth; |
476 | } |
464 | } |
477 | } |
465 | } |
… | |
… | |
485 | |
473 | |
486 | rxvt_fontprop properties (); |
474 | rxvt_fontprop properties (); |
487 | |
475 | |
488 | bool load (const rxvt_fontprop &prop); |
476 | bool load (const rxvt_fontprop &prop); |
489 | |
477 | |
490 | 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; |
491 | |
479 | |
492 | void draw (rxvt_drawable &d, int x, int y, |
480 | void draw (rxvt_drawable &d, int x, int y, |
493 | const text_t *text, int len, |
481 | const text_t *text, int len, |
494 | int fg, int bg); |
482 | int fg, int bg); |
495 | |
483 | |
496 | 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 |
497 | XFontStruct *f; |
485 | XFontStruct *f; |
498 | codeset cs; |
486 | codeset cs; |
499 | bool enc2b, encm; |
487 | bool enc2b, encm; |
500 | |
488 | |
501 | char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
489 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
502 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
490 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
503 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
491 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
504 | bool set_properties (rxvt_fontprop &p, const char *name); |
492 | bool set_properties (rxvt_fontprop &p, const char *name); |
505 | }; |
493 | }; |
506 | |
494 | |
507 | char * |
495 | char * |
508 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
496 | rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const |
509 | { |
497 | { |
510 | unsigned long value; |
498 | unsigned long value; |
511 | |
499 | |
512 | if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) |
500 | if (XGetFontProperty (f, property, &value)) |
513 | return XGetAtomName (DISPLAY, value); |
501 | return XGetAtomName (term->dpy, value); |
514 | else |
502 | else |
515 | return rxvt_strdup (repl); |
503 | return rxvt_strdup (repl); |
516 | } |
504 | } |
517 | |
505 | |
518 | rxvt_fontprop |
506 | rxvt_fontprop |
… | |
… | |
524 | } |
512 | } |
525 | |
513 | |
526 | bool |
514 | bool |
527 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
515 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
528 | { |
516 | { |
529 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
517 | p.width = width != rxvt_fontprop::unset ? width |
|
|
518 | : avgwidth ? (avgwidth + 1) / 10 |
|
|
519 | : (height + 1) / 2; |
530 | p.height = height; |
520 | p.height = height; |
531 | p.ascent = rxvt_fontprop::unset; |
521 | p.ascent = rxvt_fontprop::unset; |
532 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
522 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
533 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
523 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
534 | |
524 | |
… | |
… | |
539 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
529 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
540 | { |
530 | { |
541 | unsigned long height; |
531 | unsigned long height; |
542 | |
532 | |
543 | #if 0 |
533 | #if 0 |
544 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
534 | if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height)) |
545 | return false; |
535 | return false; |
546 | #else |
536 | #else |
547 | height = f->ascent + f->descent; |
537 | height = f->ascent + f->descent; |
548 | #endif |
538 | #endif |
549 | |
539 | |
550 | unsigned long avgwidth; |
540 | unsigned long avgwidth; |
551 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
541 | if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth)) |
552 | avgwidth = 0; |
542 | avgwidth = 0; |
553 | |
543 | |
554 | char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
544 | char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium"); |
555 | char *slant = get_property (f, "SLANT", "r"); |
545 | char *slant = get_property (f, term->xa [XA_SLANT], "r"); |
556 | |
546 | |
557 | set_properties (p, height, weight, slant, avgwidth); |
547 | set_properties (p, height, weight, slant, avgwidth); |
558 | |
548 | |
559 | free (weight); |
549 | free (weight); |
560 | free (slant); |
550 | free (slant); |
… | |
… | |
565 | } |
555 | } |
566 | |
556 | |
567 | bool |
557 | bool |
568 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
558 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
569 | { |
559 | { |
|
|
560 | dTermDisplay; |
570 | int slashes = 0; |
561 | int slashes = 0; |
571 | const char *comp[13]; |
562 | const char *comp[13]; |
572 | |
563 | |
573 | for (const char *c = name; *c; c++) |
564 | for (const char *c = name; *c; c++) |
574 | if (*c == '-') |
565 | if (*c == '-') |
… | |
… | |
582 | if (slashes >= 13 |
573 | if (slashes >= 13 |
583 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
574 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
584 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
575 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
585 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
576 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
586 | |
577 | |
587 | XFontStruct *f = XLoadQueryFont (DISPLAY, name); |
578 | XFontStruct *f = XLoadQueryFont (disp, name); |
588 | |
579 | |
589 | if (f) |
580 | if (f) |
590 | { |
581 | { |
591 | // the font should really exist now. if not, we have a problem |
582 | // the font should really exist now. if not, we have a problem |
592 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
583 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
593 | // in that case, just return garbage. |
584 | // in that case, just return garbage. |
594 | bool ret = set_properties (p, f); |
585 | bool ret = set_properties (p, f); |
595 | XFreeFont (DISPLAY, f); |
586 | XFreeFont (disp, f); |
596 | return ret; |
587 | return ret; |
597 | } |
588 | } |
598 | else |
589 | else |
599 | return false; |
590 | return false; |
600 | } |
591 | } |
… | |
… | |
638 | } |
629 | } |
639 | |
630 | |
640 | bool |
631 | bool |
641 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
632 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
642 | { |
633 | { |
643 | Display *disp = DISPLAY; |
634 | dTermDisplay; |
644 | |
635 | |
645 | clear (); |
636 | clear (); |
646 | |
637 | |
647 | char field_str[64]; // enough for 128 bits |
638 | char field_str[64]; // enough for 128 bits |
648 | |
639 | |
… | |
… | |
657 | f = XLoadQueryFont (disp, name); |
648 | f = XLoadQueryFont (disp, name); |
658 | |
649 | |
659 | if (!f) |
650 | if (!f) |
660 | return false; |
651 | return false; |
661 | |
652 | |
662 | char *new_name = get_property (f, "FONT", name); |
653 | char *new_name = get_property (f, XA_FONT, name); |
663 | |
654 | |
664 | if (new_name) |
655 | if (new_name) |
665 | set_name (new_name); |
656 | set_name (new_name); |
666 | else |
657 | else |
667 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
658 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
… | |
… | |
723 | int diff = 0; |
714 | int diff = 0; |
724 | |
715 | |
725 | if (replace_field (fname, list[i], 6, '0', field_str)) |
716 | if (replace_field (fname, list[i], 6, '0', field_str)) |
726 | diff += 10; // slightly penalize scalable fonts |
717 | diff += 10; // slightly penalize scalable fonts |
727 | else if (replace_field (fname, list[i], 11, '0', "0")) |
718 | else if (replace_field (fname, list[i], 11, '0', "0")) |
728 | diff += 300; // more heavily penalize what looks like scaled bitmap fotns |
719 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
729 | |
720 | |
730 | if (!set_properties (p, fname)) |
721 | if (!set_properties (p, fname)) |
731 | continue; |
722 | continue; |
732 | |
723 | |
733 | if (prop.height != rxvt_fontprop::unset |
724 | if (prop.height != rxvt_fontprop::unset |
… | |
… | |
776 | delete [] fonts; |
767 | delete [] fonts; |
777 | |
768 | |
778 | if (!f) |
769 | if (!f) |
779 | return false; |
770 | return false; |
780 | |
771 | |
781 | char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
772 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
782 | char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
773 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
783 | |
774 | |
784 | if (registry && encoding) |
775 | if (registry && encoding) |
785 | { |
776 | { |
786 | char charset[64]; |
777 | char charset[64]; |
787 | snprintf (charset, 64, "%s-%s", registry, encoding); |
778 | snprintf (charset, 64, "%s-%s", registry, encoding); |
788 | |
779 | |
789 | cs = codeset_from_name (charset); |
780 | cs = codeset_from_name (charset); |
790 | } |
781 | } |
791 | else |
782 | else |
792 | { |
783 | { |
793 | const char *charset = get_property (f, "FONT", 0); |
784 | const char *charset = get_property (f, XA_FONT, 0); |
794 | |
785 | |
795 | if (!charset) |
786 | if (!charset) |
796 | charset = name; |
787 | charset = name; |
797 | |
788 | |
798 | int count = 13; |
789 | int count = 13; |
… | |
… | |
813 | enc2b = encm || f->max_char_or_byte2 > 255; |
804 | enc2b = encm || f->max_char_or_byte2 > 255; |
814 | |
805 | |
815 | slow = false; |
806 | slow = false; |
816 | |
807 | |
817 | #if 1 // only used for slow detection, TODO optimize |
808 | #if 1 // only used for slow detection, TODO optimize |
818 | if (f->min_bounds.width == f->max_bounds.width) |
809 | if (f->min_bounds.width == f->max_bounds.width || !f->per_char) |
819 | width = f->min_bounds.width; |
|
|
820 | else if (f->per_char == NULL) |
|
|
821 | width = f->max_bounds.width; |
810 | width = f->max_bounds.width; |
822 | else |
811 | else |
823 | { |
812 | { |
824 | slow = true; |
813 | slow = true; |
825 | |
814 | |
… | |
… | |
841 | |
830 | |
842 | width = 1; |
831 | width = 1; |
843 | |
832 | |
844 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
833 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
845 | { |
834 | { |
846 | if (cs != CS_UNICODE |
|
|
847 | && *t > 0x100 |
|
|
848 | && FROM_UNICODE (cs, *t) == NOCHAR) |
835 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
849 | continue; |
836 | continue; |
850 | |
837 | |
851 | // ignore characters we wouldn't use anyways |
838 | // ignore characters we wouldn't use anyways |
852 | bool careful; |
839 | bool careful; |
853 | if (!has_char (*t, &prop, careful)) |
840 | if (!has_char (*t, &prop, careful)) |
… | |
… | |
857 | |
844 | |
858 | XCharStruct g; |
845 | XCharStruct g; |
859 | int dir_ret, asc_ret, des_ret; |
846 | int dir_ret, asc_ret, des_ret; |
860 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
847 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
861 | |
848 | |
|
|
849 | int wcw = WCWIDTH (*t); |
862 | int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
850 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
863 | |
851 | |
864 | if (width < g.width) width = g.width; |
852 | if (width < g.width) width = g.width; |
865 | } |
853 | } |
866 | |
854 | |
867 | if (cs == CS_UNKNOWN) |
855 | if (cs == CS_UNKNOWN) |
868 | { |
856 | { |
869 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
857 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
… | |
… | |
886 | void |
874 | void |
887 | rxvt_font_x11::clear () |
875 | rxvt_font_x11::clear () |
888 | { |
876 | { |
889 | if (f) |
877 | if (f) |
890 | { |
878 | { |
891 | XFreeFont (DISPLAY, f); |
879 | XFreeFont (term->dpy, f); |
892 | f = 0; |
880 | f = 0; |
893 | } |
881 | } |
894 | } |
882 | } |
895 | |
883 | |
896 | bool |
884 | bool |
897 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
885 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
898 | { |
886 | { |
899 | uint32_t ch = FROM_UNICODE (cs, unicode); |
887 | uint32_t ch = FROM_UNICODE (cs, unicode); |
900 | |
888 | |
901 | if (ch == NOCHAR) |
889 | if (ch == NOCHAR) |
902 | return false; |
890 | return false; |
… | |
… | |
939 | return false; |
927 | return false; |
940 | |
928 | |
941 | if (!prop || prop->width == rxvt_fontprop::unset) |
929 | if (!prop || prop->width == rxvt_fontprop::unset) |
942 | return true; |
930 | return true; |
943 | |
931 | |
944 | // check character against base font bounding box |
932 | // check wether character overlaps previous/next character |
945 | int w = xcs->width; |
933 | int w = xcs->rbearing - xcs->lbearing; |
946 | int wcw = wcwidth (unicode); |
934 | int wcw = max (WCWIDTH (unicode), 1); |
947 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
|
|
948 | |
935 | |
949 | careful = w > prop->width; |
936 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
950 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
937 | |
|
|
938 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
951 | return false; |
939 | return false; |
952 | |
940 | |
953 | return true; |
941 | return true; |
954 | } |
942 | } |
955 | |
943 | |
… | |
… | |
961 | // this looks like a mess /. |
949 | // this looks like a mess /. |
962 | // and it is a mess /. |
950 | // and it is a mess /. |
963 | // yet we are trying to be perfect /. |
951 | // yet we are trying to be perfect /. |
964 | // but the result still isn't perfect /. |
952 | // but the result still isn't perfect /. |
965 | |
953 | |
|
|
954 | dTermDisplay; |
|
|
955 | dTermGC; |
|
|
956 | |
966 | bool slow = this->slow |
957 | bool slow = this->slow |
967 | || width != r->fwidth |
958 | || width != term->fwidth |
968 | || height != r->fheight; |
959 | || height != term->fheight; |
969 | |
960 | |
970 | int base = ascent; // sorry, incorrect: r->fbase; |
961 | int base = ascent; // sorry, incorrect: term->fbase; |
971 | |
962 | |
972 | XGCValues v; |
963 | XGCValues v; |
973 | v.foreground = r->pix_colors[fg]; |
964 | v.foreground = term->pix_colors[fg]; |
974 | v.font = f->fid; |
965 | v.font = f->fid; |
975 | |
966 | |
976 | if (enc2b) |
967 | if (enc2b) |
977 | { |
968 | { |
978 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
969 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
979 | |
970 | |
980 | if (bg == Color_bg && !slow) |
971 | if (bg == Color_bg && !slow) |
981 | { |
972 | { |
982 | v.background = r->pix_colors[bg]; |
973 | v.background = term->pix_colors[bg]; |
983 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
974 | XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v); |
984 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
975 | XDrawImageString16 (disp, d, gc, x, y + base, xc, len); |
985 | } |
976 | } |
986 | else |
977 | else |
987 | { |
978 | { |
988 | clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); |
979 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
989 | |
980 | |
990 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
981 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
991 | |
982 | |
992 | if (slow) |
983 | if (slow) |
993 | { |
984 | { |
994 | do |
985 | do |
995 | { |
986 | { |
996 | if (xc->byte1 || xc->byte2) |
987 | if (xc->byte1 || xc->byte2) |
997 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
988 | XDrawString16 (disp, d, gc, x, y + base, xc, 1); |
998 | |
989 | |
999 | x += r->fwidth; |
990 | x += term->fwidth; |
1000 | xc++; len--; |
991 | xc++; len--; |
1001 | } |
992 | } |
1002 | while (len); |
993 | while (len); |
1003 | } |
994 | } |
1004 | else |
995 | else |
1005 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); |
996 | XDrawString16 (disp, d, gc, x, y + base, xc, len); |
1006 | } |
997 | } |
1007 | } |
998 | } |
1008 | else |
999 | else |
1009 | { |
1000 | { |
1010 | const char *xc = enc_char (text, len, cs, slow); |
1001 | const char *xc = enc_char (text, len, cs, slow); |
1011 | |
1002 | |
1012 | if (bg == Color_bg && !slow) |
1003 | if (bg == Color_bg && !slow) |
1013 | { |
1004 | { |
1014 | v.background = r->pix_colors[bg]; |
1005 | v.background = term->pix_colors[bg]; |
1015 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
1006 | XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v); |
1016 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
1007 | XDrawImageString (disp, d, gc, x, y + base, xc, len); |
1017 | } |
1008 | } |
1018 | else |
1009 | else |
1019 | { |
1010 | { |
1020 | clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); |
1011 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1021 | |
1012 | |
1022 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
1013 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1023 | |
1014 | |
1024 | if (slow) |
1015 | if (slow) |
1025 | { |
1016 | { |
1026 | do |
1017 | do |
1027 | { |
1018 | { |
1028 | if (*xc) |
1019 | if (*xc) |
1029 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
1020 | XDrawString (disp, d, gc, x, y + base, xc, 1); |
1030 | |
1021 | |
1031 | x += r->fwidth; |
1022 | x += term->fwidth; |
1032 | xc++; len--; |
1023 | xc++; len--; |
1033 | } |
1024 | } |
1034 | while (len); |
1025 | while (len); |
1035 | } |
1026 | } |
1036 | else |
1027 | else |
1037 | XDrawString (d.display->display, d, TGC, x, y + base, xc, len); |
1028 | XDrawString (disp, d, gc, x, y + base, xc, len); |
1038 | } |
1029 | } |
1039 | } |
1030 | } |
1040 | } |
1031 | } |
1041 | |
1032 | |
1042 | ///////////////////////////////////////////////////////////////////////////// |
1033 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
1054 | |
1045 | |
1055 | void draw (rxvt_drawable &d, int x, int y, |
1046 | void draw (rxvt_drawable &d, int x, int y, |
1056 | const text_t *text, int len, |
1047 | const text_t *text, int len, |
1057 | int fg, int bg); |
1048 | int fg, int bg); |
1058 | |
1049 | |
1059 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); |
1050 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; |
1060 | |
1051 | |
1061 | protected: |
1052 | protected: |
1062 | XftFont *f; |
1053 | XftFont *f; |
1063 | }; |
1054 | }; |
1064 | |
1055 | |
1065 | void |
1056 | void |
1066 | rxvt_font_xft::clear () |
1057 | rxvt_font_xft::clear () |
1067 | { |
1058 | { |
1068 | if (f) |
1059 | if (f) |
1069 | { |
1060 | { |
1070 | XftFontClose (DISPLAY, f); |
1061 | XftFontClose (term->dpy, f); |
1071 | f = 0; |
1062 | f = 0; |
1072 | } |
1063 | } |
1073 | } |
1064 | } |
1074 | |
1065 | |
1075 | rxvt_fontprop |
1066 | rxvt_fontprop |
… | |
… | |
1093 | } |
1084 | } |
1094 | |
1085 | |
1095 | bool |
1086 | bool |
1096 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1087 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1097 | { |
1088 | { |
1098 | Display *disp = DISPLAY; |
1089 | dTermDisplay; |
1099 | |
1090 | |
1100 | clear (); |
1091 | clear (); |
1101 | |
1092 | |
1102 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
1093 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
1103 | |
1094 | |
… | |
… | |
1130 | |
1121 | |
1131 | // store generated name so iso14755 view gives better results |
1122 | // store generated name so iso14755 view gives better results |
1132 | set_name ((char *)FcNameUnparse (p)); |
1123 | set_name ((char *)FcNameUnparse (p)); |
1133 | |
1124 | |
1134 | XftResult result; |
1125 | XftResult result; |
1135 | FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); |
1126 | FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result); |
1136 | |
1127 | |
1137 | FcPatternDestroy (p); |
1128 | FcPatternDestroy (p); |
1138 | |
1129 | |
1139 | if (!match) |
1130 | if (!match) |
1140 | return false; |
1131 | return false; |
… | |
… | |
1182 | XGlyphInfo g; |
1173 | XGlyphInfo g; |
1183 | XftTextExtents16 (disp, f, &ch, 1, &g); |
1174 | XftTextExtents16 (disp, f, &ch, 1, &g); |
1184 | |
1175 | |
1185 | g.width -= g.x; |
1176 | g.width -= g.x; |
1186 | |
1177 | |
1187 | int wcw = wcwidth (ch); |
1178 | int wcw = WCWIDTH (ch); |
1188 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
1179 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
1189 | |
1180 | |
1190 | if (width < g.width ) width = g.width; |
1181 | if (width < g.width ) width = g.width; |
1191 | if (height < g.height ) height = g.height; |
1182 | if (height < g.height ) height = g.height; |
1192 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
1183 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
… | |
… | |
1238 | |
1229 | |
1239 | return success; |
1230 | return success; |
1240 | } |
1231 | } |
1241 | |
1232 | |
1242 | bool |
1233 | bool |
1243 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
1234 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1244 | { |
1235 | { |
1245 | careful = false; |
1236 | careful = false; |
1246 | |
1237 | |
1247 | if (!XftCharExists (DISPLAY, f, unicode)) |
1238 | if (!XftCharExists (term->dpy, f, unicode)) |
1248 | return false; |
1239 | return false; |
1249 | |
1240 | |
1250 | if (!prop || prop->width == rxvt_fontprop::unset) |
1241 | if (!prop || prop->width == rxvt_fontprop::unset) |
1251 | return true; |
1242 | return true; |
1252 | |
1243 | |
1253 | // check character against base font bounding box |
1244 | // check character against base font bounding box |
1254 | FcChar32 ch = unicode; |
1245 | FcChar32 ch = unicode; |
1255 | XGlyphInfo g; |
1246 | XGlyphInfo g; |
1256 | XftTextExtents32 (DISPLAY, f, &ch, 1, &g); |
1247 | XftTextExtents32 (term->dpy, f, &ch, 1, &g); |
1257 | |
1248 | |
1258 | int w = g.width - g.x; |
1249 | int w = g.width - g.x; |
1259 | int wcw = wcwidth (unicode); |
1250 | int wcw = max (WCWIDTH (unicode), 1); |
1260 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
|
|
1261 | |
1251 | |
1262 | careful = w > prop->width; |
1252 | careful = g.x > 0 || w > prop->width * wcw; |
1263 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
1253 | |
|
|
1254 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
|
|
1255 | return false; |
|
|
1256 | |
|
|
1257 | // this weeds out _totally_ broken fonts, or glyphs |
|
|
1258 | if (!OVERLAP_OK (g.xOff, wcw, prop)) |
1264 | return false; |
1259 | return false; |
1265 | |
1260 | |
1266 | return true; |
1261 | return true; |
1267 | } |
1262 | } |
1268 | |
1263 | |
1269 | void |
1264 | void |
1270 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1265 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1271 | const text_t *text, int len, |
1266 | const text_t *text, int len, |
1272 | int fg, int bg) |
1267 | int fg, int bg) |
1273 | { |
1268 | { |
1274 | clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); |
|
|
1275 | |
|
|
1276 | int base = ascent; // should be fbase, but that is incorrect |
|
|
1277 | |
|
|
1278 | XGlyphInfo extents; |
1269 | XGlyphInfo extents; |
1279 | FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); |
1270 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1280 | FcChar32 *ep = enc; |
1271 | XftGlyphSpec *ep = enc; |
1281 | int ewidth = 0; |
1272 | |
|
|
1273 | dTermDisplay; |
|
|
1274 | dTermGC; |
|
|
1275 | |
|
|
1276 | int w = term->fwidth * len; |
|
|
1277 | int h = term->fheight; |
|
|
1278 | |
|
|
1279 | bool buffered = 0 |
|
|
1280 | #if defined(XPM_BACKGROUND) || defined(TRANSPARENT) |
|
|
1281 | || !term->am_transparent // we aren't transparent |
|
|
1282 | || term->am_pixmap_trans // we have a pixmap |
|
|
1283 | #endif |
|
|
1284 | || bg >= 0; // we don't use a transparent bg |
|
|
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; |
1282 | |
1292 | |
1283 | while (len) |
1293 | while (len) |
1284 | { |
1294 | { |
1285 | int cwidth = r->fwidth; |
1295 | int cwidth = term->fwidth; |
1286 | FcChar32 fc = *text++; len--; |
1296 | FcChar32 fc = *text++; len--; |
1287 | |
1297 | |
1288 | while (len && *text == NOCHAR) |
1298 | while (len && *text == NOCHAR) |
1289 | text++, len--, cwidth += r->fwidth; |
1299 | text++, len--, cwidth += term->fwidth; |
1290 | |
1300 | |
1291 | 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 | |
1292 | x += cwidth; |
1316 | x_ += cwidth; |
1293 | else |
1317 | } |
1294 | { |
|
|
1295 | FT_UInt gl = XftCharIndex (d.display->display, f, fc); |
|
|
1296 | XftGlyphExtents (d.display->display, f, &gl, 1, &extents); |
|
|
1297 | |
1318 | |
1298 | if (extents.xOff != cwidth) |
1319 | if (buffered) |
|
|
1320 | { |
|
|
1321 | if (ep != enc) |
|
|
1322 | { |
|
|
1323 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
|
|
1324 | |
|
|
1325 | #if defined(XPM_BACKGROUND) || defined(TRANSPARENT) |
|
|
1326 | if (bg < 0 && term->am_pixmap_trans) |
|
|
1327 | XCopyArea (disp, term->pixmap, d2, gc, x, y, w, h, 0, 0); |
|
|
1328 | else if (bg < 0 && term->bgPixmap.pixmap) |
1299 | { |
1329 | { |
1300 | if (ewidth) |
1330 | XGCValues gcv; |
1301 | { |
|
|
1302 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
|
|
1303 | x, y + base, enc, ep - enc); |
|
|
1304 | x += ewidth; |
|
|
1305 | |
1331 | |
1306 | ep = enc; |
1332 | gcv.fill_style = FillTiled; |
1307 | ewidth = 0; |
1333 | gcv.tile = term->pixmap; |
1308 | } |
1334 | gcv.ts_x_origin = -x; |
|
|
1335 | gcv.ts_y_origin = -y; |
1309 | |
1336 | |
1310 | if (extents.xOff > cwidth) |
1337 | GC gc2 = XCreateGC (disp, d2, |
1311 | extents.xOff = cwidth; |
1338 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1312 | |
|
|
1313 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
|
|
1314 | x + (cwidth - extents.xOff >> 1), |
|
|
1315 | y + base, &gl, 1); |
1339 | &gcv); |
1316 | x += cwidth; |
1340 | |
|
|
1341 | XFillRectangle (disp, d2, gc2, 0, 0, w, h); |
|
|
1342 | |
|
|
1343 | XFreeGC (disp, gc2); |
1317 | } |
1344 | } |
1318 | else |
1345 | else |
1319 | { |
1346 | #endif |
1320 | *ep++ = gl; |
1347 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
1321 | ewidth += cwidth; |
1348 | |
|
|
1349 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
|
|
1350 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1322 | } |
1351 | } |
1323 | } |
1352 | else |
|
|
1353 | clear_rect (d, x, y, w, h, bg); |
|
|
1354 | } |
|
|
1355 | else |
1324 | } |
1356 | { |
1325 | |
1357 | clear_rect (d, x, y, w, h, bg); |
1326 | if (ep != enc) |
|
|
1327 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
1358 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
1328 | x, y + base, enc, ep - enc); |
1359 | } |
1329 | } |
1360 | } |
|
|
1361 | |
1330 | #endif |
1362 | #endif |
1331 | |
1363 | |
1332 | ///////////////////////////////////////////////////////////////////////////// |
1364 | ///////////////////////////////////////////////////////////////////////////// |
1333 | |
1365 | |
1334 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
1366 | rxvt_fontset::rxvt_fontset (rxvt_term *term) |
1335 | : fontdesc (0), r (r) |
1367 | : fontdesc (0), term (term) |
1336 | { |
1368 | { |
1337 | clear (); |
1369 | clear (); |
1338 | } |
1370 | } |
1339 | |
1371 | |
1340 | rxvt_fontset::~rxvt_fontset () |
1372 | rxvt_fontset::~rxvt_fontset () |
… | |
… | |
1384 | f = new rxvt_font_x11; |
1416 | f = new rxvt_font_x11; |
1385 | } |
1417 | } |
1386 | else |
1418 | else |
1387 | f = new rxvt_font_x11; |
1419 | f = new rxvt_font_x11; |
1388 | |
1420 | |
1389 | f->set_term (r); |
1421 | f->set_term (term); |
1390 | f->set_name (strdup (name)); |
1422 | f->set_name (strdup (name)); |
1391 | |
1423 | |
1392 | f->cs = cs; |
1424 | f->cs = cs; |
1393 | f->loaded = false; |
1425 | f->loaded = false; |
1394 | |
1426 | |
… | |
… | |
1577 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1609 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1578 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1610 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1579 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1611 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1580 | |
1612 | |
1581 | XftResult result; |
1613 | XftResult result; |
1582 | FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); |
1614 | FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result); |
1583 | |
1615 | |
1584 | FcPatternDestroy (p); |
1616 | FcPatternDestroy (p); |
1585 | |
1617 | |
1586 | if (match) |
1618 | if (match) |
1587 | { |
1619 | { |