ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtfont.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.78 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.145 by root, Fri Jan 25 16:04:57 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <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
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
25#include "rxvtutil.h" 24#include "rxvtutil.h"
26#include "rxvtfont.h" 25#include "rxvtfont.h"
27 26
28#include <cstdlib> 27#include <cstdlib>
29#include <wchar.h> 28
30#include <inttypes.h> 29#include <inttypes.h>
31 30
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 31#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
32#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
33
34#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
35 (prop)->slant >= rxvt_fontprop::italic \
36 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
37 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
38 ))
36 39
37const struct rxvt_fallback_font { 40const struct rxvt_fallback_font {
38 codeset cs; 41 codeset cs;
39 const char *name; 42 const char *name;
40} fallback_fonts[] = { 43} fallback_fonts[] = {
41 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 44 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
42 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 45 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
43 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
44 47
45#if ENCODING_EU 48#if ENCODING_EU
46 // cyrillic 49 // cyrillic
47 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 50 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
48 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 51 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
49 52
50 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 53 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
51 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 54 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
52 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 55 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
53 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 56 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
54 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 57 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
60 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 63 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
61 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 64 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
62 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 65 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
63 66
64# if XFT 67# if XFT
65 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 68 { CS_KOI8_U, "xft::lang=ru" },
66 69
67 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 70 { CS_ISO8859_5, "xft::lang=ru" },
68 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 71 { CS_ISO8859_6, "xft::lang=ar" },
69 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 72 { CS_ISO8859_7, "xft::lang=el" },
70 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 73 { CS_ISO8859_8, "xft::lang=he" },
71 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 74 { CS_ISO8859_9, "xft::lang=tr" },
72 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 75 { CS_ISO8859_10, "xft::lang=se" },
73 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 76 { CS_ISO8859_11, "xft::lang=th" },
74# endif 77# endif
75#endif 78#endif
76 79
77 // japanese 80 // japanese
78#if ENCODING_JP || ENCODING_JP_EXT 81#if ENCODING_JP || ENCODING_JP_EXT
79# if XFT 82# if XFT
80 // prefer xft for complex scripts 83 // prefer xft for complex scripts
81 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 84 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
82 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, 85 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
83 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 86 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
84 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 87 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
85# endif 88# endif
86 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 89 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
87 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 90 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
88 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 91 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
89 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 92 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
… …
93 96
94#if ENCODING_ZH || ENCODING_ZH_EXT 97#if ENCODING_ZH || ENCODING_ZH_EXT
95# if XFT 98# if XFT
96 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 99 { CS_GBK_0, "xft:AR PL KaitiM GB" },
97 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 100 { CS_GBK_0, "xft:AR PL SungtiL GB" },
98 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 101 { CS_GBK_0, "xft::lang=zh" },
99 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 102 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
100 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
101 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 104 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
102 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
103 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 106 { CS_GB2312_1980_0, "xft::lang=zh" },
104# endif 107# endif
105 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 108 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
106 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 109 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
107 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 110 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
108 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 111 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
121#if ENCODING_KR 124#if ENCODING_KR
122 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 125 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
123 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 126 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
124# if XFT 127# if XFT
125 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 128 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
126 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
127# endif 130# endif
128#endif 131#endif
129 132
130 // generic font fallback
131 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 133 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
132 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 134 //{ 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 135#if XFT
136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 137 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
138 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 138 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
139 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 139 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
140 140
141 // FreeMono is usually uglier than x fonts, so try last only. 141 // FreeMono is usually uglier than x fonts, so try after the others
142 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 142 { CS_UNICODE, "xft:FreeMono:autohint=true" },
143#endif 143#endif
144 144
145 // generic font fallback, put this last, as many iso10646 fonts have extents
146 // specified for all glyphs in the range they cover, but most are simply empty
147 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
148 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
145 { CS_UNKNOWN, 0 } 149 { CS_UNKNOWN, 0 }
146}; 150};
147 151
148// these characters are used to guess the font height and width 152// these characters are used to guess the font height and width
149// pango uses a similar algorithm and doesn't trust the font either. 153// pango uses a similar algorithm and doesn't trust the font either.
… …
153 0x304c, 0x672c, // が本 157 0x304c, 0x672c, // が本
154}; 158};
155 159
156#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
157 161
162#define dTermDisplay Display *disp = term->dpy
163#define dTermGC GC gc = term->gc
164
158///////////////////////////////////////////////////////////////////////////// 165/////////////////////////////////////////////////////////////////////////////
159
160#if XFT
161rxvt_drawable::~rxvt_drawable ()
162{
163 if (xftdrawable)
164 XftDrawDestroy (xftdrawable);
165}
166
167rxvt_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
178static void *enc_buf;
179static uint32_t enc_len;
180
181static inline void *
182get_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 166
194static const char * 167static const char *
195enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 168enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
196{ 169{
197 uint8_t *buf = (uint8_t *)get_enc_buf (len); 170 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
171 uint8_t *res = buf;
198 172
199 while (len--) 173 while (len--)
200 { 174 {
201 uint32_t c = FROM_UNICODE (cs, *text++); 175 uint32_t c = FROM_UNICODE (cs, *text++);
202 176
… …
207 } 181 }
208 182
209 *buf++ = c; 183 *buf++ = c;
210 } 184 }
211 185
212 return (const char *)enc_buf; 186 return (const char *)res;
213} 187}
214 188
215static const XChar2b * 189static const XChar2b *
216enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 190enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
217{ 191{
218 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 192 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
193 XChar2b *res = buf;
219 194
220 while (len--) 195 while (len--)
221 { 196 {
222 uint32_t c = FROM_UNICODE (cs, *text++); 197 uint32_t c = FROM_UNICODE (cs, *text++);
223 198
… …
230 buf->byte1 = c >> 8; 205 buf->byte1 = c >> 8;
231 buf->byte2 = c; 206 buf->byte2 = c;
232 buf++; 207 buf++;
233 } 208 }
234 209
235 return (XChar2b *)enc_buf; 210 return res;
236} 211}
237 212
238///////////////////////////////////////////////////////////////////////////// 213/////////////////////////////////////////////////////////////////////////////
214
215rxvt_font::rxvt_font ()
216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217{
218}
239 219
240void 220void
241rxvt_font::set_name (char *name) 221rxvt_font::set_name (char *name)
242{ 222{
243 if (this->name == name) 223 if (this->name == name)
… …
246 if (this->name) free (this->name); // let the compiler optimize 226 if (this->name) free (this->name); // let the compiler optimize
247 this->name = name; 227 this->name = name;
248} 228}
249 229
250void 230void
251rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) 231rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
252{ 232{
253 if (color == Color_bg) 233 dTermDisplay;
254 XClearArea (d.display->display, d, x, y, w, h, FALSE); 234 dTermGC;
235
236 if (color == Color_bg || color == Color_transparent)
237 XClearArea (disp, d, x, y, w, h, false);
255 else if (color >= 0) 238 else if (color >= 0)
256 { 239 {
257#if XFT 240#if XFT
241 Picture dst;
242
243# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap
245 && !term->pix_colors[color].is_opaque ()
246 && ((dst = XftDrawPicture (d))))
247 {
248 XClearArea (disp, d, x, y, w, h, false);
249
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
251 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 }
253 else
254# endif
258 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 255 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
256
259#else 257#else
260 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 258 XSetForeground (disp, gc, term->pix_colors[color]);
261 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 259 XFillRectangle (disp, d, gc, x, y, w, h);
262#endif 260#endif
263 } 261 }
264} 262}
265 263
266#include "table/linedraw.h" 264/////////////////////////////////////////////////////////////////////////////
267 265
268struct rxvt_font_default : rxvt_font { 266struct rxvt_font_default : rxvt_font {
269 struct rxvt_fontset *fs; 267 struct rxvt_fontset *fs;
270 268
271 rxvt_font_default (rxvt_fontset *fs) 269 rxvt_font_default (rxvt_fontset *fs)
… …
284 p.slant = rxvt_fontprop::roman; 282 p.slant = rxvt_fontprop::roman;
285 283
286 return p; 284 return p;
287 } 285 }
288 286
289 bool load (const rxvt_fontprop &prop) 287 bool load (const rxvt_fontprop &prop, bool force_prop)
290 { 288 {
291 width = 1; height = 1; 289 width = 1; height = 1;
292 ascent = 1; descent = 0; 290 ascent = 1; descent = 0;
293 291
294 set_name (strdup ("built-in support font")); 292 set_name (strdup ("built-in support font"));
295 293
296 return true; 294 return true;
297 } 295 }
298 296
299 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 297 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
300 { 298 {
301 careful = false; 299 careful = false;
302 300
303 if (unicode <= 0x001f) 301 if (unicode <= 0x001f)
304 return true; 302 return true;
… …
307 return false; 305 return false;
308 306
309 if (unicode <= 0x009f) 307 if (unicode <= 0x009f)
310 return true; 308 return true;
311 309
310#ifdef BUILTIN_GLYPHS
312 if (unicode >= 0x2500 && unicode <= 0x259f && 311 if (unicode >= 0x2500 && unicode <= 0x259f &&
313 ! OPTION_R (Opt_skipBuiltinGlyphs)) 312 !term->option (Opt_skipBuiltinGlyphs))
314 return true; 313 return true;
314#endif
315 315
316 if (IS_COMPOSE (unicode)) 316 if (IS_COMPOSE (unicode))
317 return true; 317 return true;
318 318
319 switch (unicode) 319 switch (unicode)
… …
334void 334void
335rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 335rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
336 const text_t *text, int len, 336 const text_t *text, int len,
337 int fg, int bg) 337 int fg, int bg)
338{ 338{
339 Display *disp = d.display->display; 339 dTermDisplay;
340 dTermGC;
340 341
341 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 342 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
342 343
343 XSetForeground (disp, TGC, r->pix_colors[fg]); 344 XSetForeground (disp, gc, term->pix_colors[fg]);
344 345
345 while (len) 346 while (len)
346 { 347 {
347#if ENABLE_COMBINING 348#if ENABLE_COMBINING
348 compose_char *cc; 349 compose_char *cc;
… …
352 353
353 while (++text, --len && *text == NOCHAR) 354 while (++text, --len && *text == NOCHAR)
354 ; 355 ;
355 356
356 int width = text - tp; 357 int width = text - tp;
357 int fwidth = r->fwidth * width; 358 int fwidth = term->fwidth * width;
358 359
360#ifdef BUILTIN_GLYPHS
359 if (0x2500 <= t && t <= 0x259f && 361 if (0x2500 <= t && t <= 0x259f)
360 ! OPTION_R (Opt_skipBuiltinGlyphs))
361 { 362 {
363# include "table/linedraw.h"
362 uint16_t offs = linedraw_offs[t - 0x2500]; 364 uint16_t offs = linedraw_offs[t - 0x2500];
363 uint32_t *a = linedraw_command + (offs >> 4); 365 uint32_t *a = linedraw_command + (offs >> 4);
364 uint32_t *b = a + (offs & 15); 366 uint32_t *b = a + (offs & 15);
365 367
366 int W = fwidth; 368 int W = fwidth;
367 int H = r->fheight; 369 int H = term->fheight;
368 370
369 int x_[16]; 371 int x_[16];
370 int y_[16]; 372 int y_[16];
371 373
372 for (int i = 0; i <= 8; i++) 374 for (int i = 0; i <= 8; i++)
… …
380 382
381 XGCValues gcv; 383 XGCValues gcv;
382 384
383 gcv.cap_style = CapButt; 385 gcv.cap_style = CapButt;
384 gcv.line_width = 0; 386 gcv.line_width = 0;
385 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 387 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
386 388
387 while (a < b) 389 while (a < b)
388 { 390 {
389 uint32_t command = *a++; 391 uint32_t command = *a++;
390 392
… …
397 int y2 = y_[(command >> 0) & 15]; 399 int y2 = y_[(command >> 0) & 15];
398 400
399 switch (op) 401 switch (op)
400 { 402 {
401 case 0: // line 403 case 0: // line
402 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 404 XDrawLine (disp, d, gc, x1, y1, x2, y2);
403 break; 405 break;
404 406
405 case 1: // rectangle, possibly stippled 407 case 1: // rectangle, possibly stippled
406 if (a) 408 if (a)
407 { 409 {
408 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 410 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
409 411
410 gcv.fill_style = FillStippled; 412 gcv.fill_style = FillStippled;
411 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 413 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
412 gcv.ts_x_origin = x; 414 gcv.ts_x_origin = x;
413 gcv.ts_y_origin = y; 415 gcv.ts_y_origin = y;
414 416
415 XChangeGC (disp, TGC, 417 XChangeGC (disp, gc,
416 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 418 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
417 &gcv); 419 &gcv);
418 } 420 }
419 421
420 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 422 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
421 423
422 if (a) 424 if (a)
423 { 425 {
424 XFreePixmap (disp, gcv.stipple); 426 XFreePixmap (disp, gcv.stipple);
425 gcv.stipple = 0; 427 gcv.stipple = 0;
426 gcv.fill_style = FillSolid; 428 gcv.fill_style = FillSolid;
427 XChangeGC (disp, TGC, GCFillStyle, &gcv); 429 XChangeGC (disp, gc, GCFillStyle, &gcv);
428 } 430 }
429 break; 431 break;
430 case 2: // arc 432 case 2: // arc
431 XDrawArc (disp, d, TGC, 433 XDrawArc (disp, d, gc,
432 x1 - W/2, y1 - H/2, W-1, H-1, 434 x1 - W/2, y1 - H/2, W-1, H-1,
433 (a - 1) * 90*64, (b - 1) * 90*64); 435 (a - 1) * 90*64, (b - 1) * 90*64);
434 break; 436 break;
435 } 437 }
436 } 438 }
437 } 439 }
440#else
441 if (0)
442 ;
443#endif
438#if ENABLE_COMBINING 444#if ENABLE_COMBINING
439 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
440 { 446 {
447 min_it (width, 2); // we only support wcwidth up to 2
448
441 text_t chrs[2]; 449 text_t chrs[2];
442 width = min (2, width);
443 chrs [1] = NOCHAR; 450 chrs [1] = NOCHAR;
444 451
445 *chrs = cc->c1; 452 *chrs = cc->c1;
446 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 453 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
447 f1->draw (d, x, y, chrs, width, fg, bg); 454 f1->draw (d, x, y, chrs, width, fg, bg);
… …
454 *chrs = cc->c2; 461 *chrs = cc->c2;
455 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
456 ? f1 463 ? f1
457 : (*fs)[fs->find_font (cc->c2)]; 464 : (*fs)[fs->find_font (cc->c2)];
458 465
459 f2->draw (d, x, y, chrs, width, fg, -1); 466 f2->draw (d, x, y, chrs, width, fg, Color_none);
460 } 467 }
461 } 468 }
462#endif 469#endif
463 else 470 else
464 switch (t) 471 switch (t)
… …
467 case ZERO_WIDTH_CHAR: 474 case ZERO_WIDTH_CHAR:
468 case NOCHAR: 475 case NOCHAR:
469 break; 476 break;
470 477
471 default: 478 default:
472 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 479 XDrawRectangle (disp, d, gc, x + 2, y + 2,
473 fwidth - 4, r->fheight - 4); 480 fwidth - 4, term->fheight - 4);
474 } 481 }
475 482
476 x += fwidth; 483 x += fwidth;
477 } 484 }
478} 485}
… …
484 491
485 void clear (); 492 void clear ();
486 493
487 rxvt_fontprop properties (); 494 rxvt_fontprop properties ();
488 495
489 bool load (const rxvt_fontprop &prop); 496 bool load (const rxvt_fontprop &prop, bool force_prop);
490 497
491 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 498 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
492 499
493 void draw (rxvt_drawable &d, int x, int y, 500 void draw (rxvt_drawable &d, int x, int y,
494 const text_t *text, int len, 501 const text_t *text, int len,
495 int fg, int bg); 502 int fg, int bg);
496 503
497 bool slow; // wether this is a proportional font or has other funny characteristics 504 bool slow; // wether this is a proportional font or has other funny characteristics
498 XFontStruct *f; 505 XFontStruct *f;
499 codeset cs;
500 bool enc2b, encm; 506 bool enc2b, encm;
501 507
502 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 508 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); 509 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); 510 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
505 bool set_properties (rxvt_fontprop &p, const char *name); 511 bool set_properties (rxvt_fontprop &p, const char *name);
506}; 512};
507 513
508char * 514char *
509rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 515rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
510{ 516{
511 unsigned long value; 517 unsigned long value;
512 518
513 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 519 if (XGetFontProperty (f, property, &value))
514 return XGetAtomName (DISPLAY, value); 520 return XGetAtomName (term->dpy, value);
515 else 521 else
516 return rxvt_strdup (repl); 522 return repl ? strdup (repl) : 0;
517} 523}
518 524
519rxvt_fontprop 525rxvt_fontprop
520rxvt_font_x11::properties () 526rxvt_font_x11::properties ()
521{ 527{
… …
525} 531}
526 532
527bool 533bool
528rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 534rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
529{ 535{
530 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 536 p.width = width != rxvt_fontprop::unset ? width
537 : avgwidth ? (avgwidth + 1) / 10
538 : (height + 1) / 2;
531 p.height = height; 539 p.height = height;
532 p.ascent = rxvt_fontprop::unset; 540 p.ascent = rxvt_fontprop::unset;
533 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 541 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; 542 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
535 543
… …
540rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 548rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
541{ 549{
542 unsigned long height; 550 unsigned long height;
543 551
544#if 0 552#if 0
545 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 553 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
546 return false; 554 return false;
547#else 555#else
548 height = f->ascent + f->descent; 556 height = f->ascent + f->descent;
549#endif 557#endif
550 558
551 unsigned long avgwidth; 559 unsigned long avgwidth;
552 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 560 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
553 avgwidth = 0; 561 avgwidth = 0;
554 562
555 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 563 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
556 char *slant = get_property (f, "SLANT", "r"); 564 char *slant = get_property (f, term->xa [XA_SLANT], "r");
557 565
558 set_properties (p, height, weight, slant, avgwidth); 566 set_properties (p, height, weight, slant, avgwidth);
559 567
560 free (weight); 568 free (weight);
561 free (slant); 569 free (slant);
… …
566} 574}
567 575
568bool 576bool
569rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 577rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
570{ 578{
579 dTermDisplay;
571 int slashes = 0; 580 int slashes = 0;
572 const char *comp[13]; 581 const char *comp[13];
573 582
574 for (const char *c = name; *c; c++) 583 for (const char *c = name; *c; c++)
575 if (*c == '-') 584 if (*c == '-')
… …
583 if (slashes >= 13 592 if (slashes >= 13
584 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 593 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
585 && (*comp[11] >= '0' && *comp[11] <= '9')) 594 && (*comp[11] >= '0' && *comp[11] <= '9'))
586 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 595 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
587 596
588 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 597 XFontStruct *f = XLoadQueryFont (disp, name);
589 598
590 if (f) 599 if (f)
591 { 600 {
592 // the font should really exist now. if not, we have a problem 601 // 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). 602 // (e.g. if the user did xset fp rehash just when we were searching fonts).
594 // in that case, just return garbage. 603 // in that case, just return garbage.
595 bool ret = set_properties (p, f); 604 bool ret = set_properties (p, f);
596 XFreeFont (DISPLAY, f); 605 XFreeFont (disp, f);
597 return ret; 606 return ret;
598 } 607 }
599 else 608 else
600 return false; 609 return false;
601} 610}
602 611
603// fix the size of scalable fonts 612// fix the size of scalable fonts
604static bool 613static bool
605replace_field (char *buf, const char *name, int index, const char old, const char *replace) 614replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
606{ 615{
607 int slashes = 0; 616 int slashes = 0;
608 const char *field, *end; 617 const char *field, *end;
609 618
610 for (const char *c = name; *c; c++) 619 for (const char *c = name; *c; c++)
… …
620 break; 629 break;
621 } 630 }
622 631
623 if (slashes >= 13 && (!old || *field == old)) 632 if (slashes >= 13 && (!old || *field == old))
624 { 633 {
625 // TODO: check for overflow in font-name 634 size_t len = field - name;
626 strncpy (buf, name, field - name); 635 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
627 buf += field - name; 636 memcpy (*ptr, name, len);
628 strcpy (buf, replace); 637 strcpy (*ptr + len, replace);
629 strcat (buf, end); 638 strcat (*ptr, end);
630 639
631 return true; 640 return true;
632 } 641 }
633 else 642 else
634 { 643 {
635 strcpy (buf, name); 644 *ptr = strdup (name);
636 645
637 return false; 646 return false;
638 } 647 }
639} 648}
640 649
641bool 650bool
642rxvt_font_x11::load (const rxvt_fontprop &prop) 651rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
643{ 652{
644 Display *disp = DISPLAY; 653 dTermDisplay;
645 654
646 clear (); 655 clear ();
647 656
648 char field_str[64]; // enough for 128 bits 657 char field_str[64]; // enough for 128 bits
649 658
650 // first morph the font if required 659 // first morph the font if required
651 if (prop.weight != rxvt_fontprop::unset 660 if (force_prop)
652 || prop.slant != rxvt_fontprop::unset)
653 { 661 {
654 char fname[1024]; 662 char *fname;
655 663
656 if (name[0] != '-') 664 if (name[0] != '-')
657 { 665 {
658 f = XLoadQueryFont (disp, name); 666 f = XLoadQueryFont (disp, name);
659 667
660 if (!f) 668 if (!f)
661 return false; 669 return false;
662 670
663 char *new_name = get_property (f, "FONT", name); 671 char *new_name = get_property (f, XA_FONT, name);
664 672
665 if (new_name) 673 if (new_name)
666 set_name (new_name); 674 set_name (new_name);
667 else 675 else
668 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
671 f = 0; 679 f = 0;
672 } 680 }
673 681
674 if (prop.weight != rxvt_fontprop::unset) 682 if (prop.weight != rxvt_fontprop::unset)
675 { 683 {
676 replace_field (fname, name, 2, 0, 684 replace_field (&fname, name, 2, 0,
677 prop.weight < rxvt_fontprop::bold 685 prop.weight < rxvt_fontprop::bold
678 ? "medium" : "bold"); 686 ? "medium" : "bold");
679 set_name (strdup (fname)); 687 set_name (fname);
680 } 688 }
681 689
682 if (prop.slant != rxvt_fontprop::unset) 690 if (prop.slant != rxvt_fontprop::unset)
683 { 691 {
684 replace_field (fname, name, 3, 0, 692 replace_field (&fname, name, 3, 0,
685 prop.slant < rxvt_fontprop::italic 693 prop.slant < rxvt_fontprop::italic
686 ? "r" : "i"); // TODO: handle "o"blique, too 694 ? "r" : "i"); // TODO: handle "o"blique, too
687 set_name (strdup (fname)); 695 set_name (fname);
688 } 696 }
689 } 697 }
690 698
691 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 699 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
692 ? 0 : prop.height); 700 ? 0 : prop.height);
… …
717 font_weight *fonts = new font_weight[count]; 725 font_weight *fonts = new font_weight[count];
718 726
719 for (int i = 0; i < count; i++) 727 for (int i = 0; i < count; i++)
720 { 728 {
721 rxvt_fontprop p; 729 rxvt_fontprop p;
722 char fname[1024]; 730 char *fname;
723 731
724 int diff = 0; 732 int diff = 0;
725 733
726 if (replace_field (fname, list[i], 6, '0', field_str)) 734 if (replace_field (&fname, list[i], 6, '0', field_str))
727 diff += 10; // slightly penalize scalable fonts 735 diff += 10; // slightly penalize scalable fonts
736 else
737 {
738 free (fname);
728 else if (replace_field (fname, list[i], 11, '0', "0")) 739 if (replace_field (&fname, list[i], 11, '0', "0"))
729 diff += 300; // more heavily penalize what looks like scaled bitmap fotns 740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 }
730 742
731 if (!set_properties (p, fname)) 743 if (!set_properties (p, fname))
732 continue; 744 continue;
733 745
734 if (prop.height != rxvt_fontprop::unset 746 if (prop.height != rxvt_fontprop::unset
… …
738 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 750 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
739 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 751 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
740 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 752 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
741 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 753 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
742 754
743 fonts[i].name = strdup (fname); 755 fonts[i].name = fname;
744 fonts[i].diff = diff; 756 fonts[i].diff = diff;
745 } 757 }
746 758
747 XFreeFontNames (list); 759 XFreeFontNames (list);
748 760
… …
777 delete [] fonts; 789 delete [] fonts;
778 790
779 if (!f) 791 if (!f)
780 return false; 792 return false;
781 793
782 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
783 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
784 796
785 if (registry && encoding) 797 if (registry && encoding)
786 { 798 {
787 char charset[64]; 799 char charset[64];
788 snprintf (charset, 64, "%s-%s", registry, encoding); 800 snprintf (charset, 64, "%s-%s", registry, encoding);
789 801
790 cs = codeset_from_name (charset); 802 cs = codeset_from_name (charset);
791 } 803 }
792 else 804 else
793 { 805 {
794 const char *charset = get_property (f, "FONT", 0); 806 const char *charset = get_property (f, XA_FONT, 0);
795 807
796 if (!charset) 808 if (!charset)
797 charset = name; 809 charset = name;
798 810
799 int count = 13; 811 int count = 13;
… …
814 enc2b = encm || f->max_char_or_byte2 > 255; 826 enc2b = encm || f->max_char_or_byte2 > 255;
815 827
816 slow = false; 828 slow = false;
817 829
818#if 1 // only used for slow detection, TODO optimize 830#if 1 // only used for slow detection, TODO optimize
819 if (f->min_bounds.width == f->max_bounds.width) 831 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; 832 width = f->max_bounds.width;
823 else 833 else
824 { 834 {
825 slow = true; 835 slow = true;
826 836
827 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 837 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
828 838
829 if (encm) 839 if (encm)
830 N += (f->max_byte1 - f->min_byte1) 840 N += (f->max_byte1 - f->min_byte1)
831 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 841 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
832 842
833 while (N) 843 while (N)
834 { 844 {
835 if (f->per_char[N].width > width) 845 if (f->per_char[N].width > width)
836 width = f->per_char[N].width; 846 width = f->per_char[N].width;
837 847
… …
842 852
843 width = 1; 853 width = 1;
844 854
845 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 855 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
846 { 856 {
847 if (cs != CS_UNICODE
848 && *t > 0x100
849 && FROM_UNICODE (cs, *t) == NOCHAR) 857 if (FROM_UNICODE (cs, *t) == NOCHAR)
850 continue; 858 continue;
851 859
852 // ignore characters we wouldn't use anyways 860 // ignore characters we wouldn't use anyways
853 bool careful; 861 bool careful;
854 if (!has_char (*t, &prop, careful)) 862 if (!has_char (*t, &prop, careful))
… …
858 866
859 XCharStruct g; 867 XCharStruct g;
860 int dir_ret, asc_ret, des_ret; 868 int dir_ret, asc_ret, des_ret;
861 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 869 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
862 870
871 int wcw = WCWIDTH (*t);
863 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 872 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
864 873
865 if (width < g.width) width = g.width; 874 if (width < g.width) width = g.width;
866 } 875 }
867 876
868 if (cs == CS_UNKNOWN) 877 if (cs == CS_UNKNOWN)
869 { 878 {
870 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 879 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
887void 896void
888rxvt_font_x11::clear () 897rxvt_font_x11::clear ()
889{ 898{
890 if (f) 899 if (f)
891 { 900 {
892 XFreeFont (DISPLAY, f); 901 XFreeFont (term->dpy, f);
893 f = 0; 902 f = 0;
894 } 903 }
895} 904}
896 905
897bool 906bool
898rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 907rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
899{ 908{
900 uint32_t ch = FROM_UNICODE (cs, unicode); 909 uint32_t ch = FROM_UNICODE (cs, unicode);
901 910
902 if (ch == NOCHAR) 911 if (ch == NOCHAR)
903 return false; 912 return false;
… …
940 return false; 949 return false;
941 950
942 if (!prop || prop->width == rxvt_fontprop::unset) 951 if (!prop || prop->width == rxvt_fontprop::unset)
943 return true; 952 return true;
944 953
945 // check character against base font bounding box 954 // check wether character overlaps previous/next character
946 int w = xcs->width; 955 int w = xcs->rbearing - xcs->lbearing;
947 int wcw = wcwidth (unicode); 956 int wcw = max (WCWIDTH (unicode), 1);
948 if (wcw > 0) w = (w + wcw - 1) / wcw;
949 957
950 careful = w > prop->width; 958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
951 if (careful && w > prop->width * MAX_OVERLAP >> 2) 959
960 if (careful && !OVERLAP_OK (w, wcw, prop))
952 return false; 961 return false;
953 962
954 return true; 963 return true;
955} 964}
956 965
… …
962 // this looks like a mess /. 971 // this looks like a mess /.
963 // and it is a mess /. 972 // and it is a mess /.
964 // yet we are trying to be perfect /. 973 // yet we are trying to be perfect /.
965 // but the result still isn't perfect /. 974 // but the result still isn't perfect /.
966 975
976 dTermDisplay;
977 dTermGC;
978
967 bool slow = this->slow 979 bool slow = this->slow
968 || width != r->fwidth 980 || width != term->fwidth
969 || height != r->fheight; 981 || height != term->fheight;
970 982
971 int base = ascent; // sorry, incorrect: r->fbase; 983 int base = ascent; // sorry, incorrect: term->fbase;
972 984
973 XGCValues v; 985 XGCValues v;
974 v.foreground = r->pix_colors[fg]; 986 v.foreground = term->pix_colors[fg];
975 v.font = f->fid; 987 v.font = f->fid;
976 988
977 if (enc2b) 989 if (enc2b)
978 { 990 {
979 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 991 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
980 992
981 if (bg == Color_bg && !slow) 993 if (bg == Color_bg && !slow)
982 { 994 {
983 v.background = r->pix_colors[bg]; 995 v.background = term->pix_colors[bg];
984 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 996 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
985 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 997 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
986 } 998 }
987 else 999 else
988 { 1000 {
989 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1001 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
990 1002
991 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1003 XChangeGC (disp, gc, GCForeground | GCFont, &v);
992 1004
993 if (slow) 1005 if (slow)
994 { 1006 {
995 do 1007 do
996 { 1008 {
997 if (xc->byte1 || xc->byte2) 1009 if (xc->byte1 || xc->byte2)
998 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1010 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
999 1011
1000 x += r->fwidth; 1012 x += term->fwidth;
1001 xc++; len--; 1013 xc++; len--;
1002 } 1014 }
1003 while (len); 1015 while (len);
1004 } 1016 }
1005 else 1017 else
1006 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1018 XDrawString16 (disp, d, gc, x, y + base, xc, len);
1007 } 1019 }
1008 } 1020 }
1009 else 1021 else
1010 { 1022 {
1011 const char *xc = enc_char (text, len, cs, slow); 1023 const char *xc = enc_char (text, len, cs, slow);
1012 1024
1013 if (bg == Color_bg && !slow) 1025 if (bg == Color_bg && !slow)
1014 { 1026 {
1015 v.background = r->pix_colors[bg]; 1027 v.background = term->pix_colors[bg];
1016 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1028 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1017 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1029 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1018 } 1030 }
1019 else 1031 else
1020 { 1032 {
1021 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1033 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1022 1034
1023 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1035 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1024 1036
1025 if (slow) 1037 if (slow)
1026 { 1038 {
1027 do 1039 do
1028 { 1040 {
1029 if (*xc) 1041 if (*xc)
1030 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1042 XDrawString (disp, d, gc, x, y + base, xc, 1);
1031 1043
1032 x += r->fwidth; 1044 x += term->fwidth;
1033 xc++; len--; 1045 xc++; len--;
1034 } 1046 }
1035 while (len); 1047 while (len);
1036 } 1048 }
1037 else 1049 else
1038 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1050 XDrawString (disp, d, gc, x, y + base, xc, len);
1039 } 1051 }
1040 } 1052 }
1041} 1053}
1042 1054
1043///////////////////////////////////////////////////////////////////////////// 1055/////////////////////////////////////////////////////////////////////////////
… …
1049 1061
1050 void clear (); 1062 void clear ();
1051 1063
1052 rxvt_fontprop properties (); 1064 rxvt_fontprop properties ();
1053 1065
1054 bool load (const rxvt_fontprop &prop); 1066 bool load (const rxvt_fontprop &prop, bool force_prop);
1055 1067
1056 void draw (rxvt_drawable &d, int x, int y, 1068 void draw (rxvt_drawable &d, int x, int y,
1057 const text_t *text, int len, 1069 const text_t *text, int len,
1058 int fg, int bg); 1070 int fg, int bg);
1059 1071
1060 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1072 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1061 1073
1062protected: 1074protected:
1063 XftFont *f; 1075 XftFont *f;
1064}; 1076};
1065 1077
1066void 1078void
1067rxvt_font_xft::clear () 1079rxvt_font_xft::clear ()
1068{ 1080{
1069 if (f) 1081 if (f)
1070 { 1082 {
1071 XftFontClose (DISPLAY, f); 1083 XftFontClose (term->dpy, f);
1072 f = 0; 1084 f = 0;
1073 } 1085 }
1074} 1086}
1075 1087
1076rxvt_fontprop 1088rxvt_fontprop
… …
1092 1104
1093 return p; 1105 return p;
1094} 1106}
1095 1107
1096bool 1108bool
1097rxvt_font_xft::load (const rxvt_fontprop &prop) 1109rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1098{ 1110{
1099 Display *disp = DISPLAY; 1111 dTermDisplay;
1100 1112
1101 clear (); 1113 clear ();
1102 1114
1103 FcPattern *p = FcNameParse ((FcChar8 *) name); 1115 FcPattern *p = FcNameParse ((FcChar8 *) name);
1104 1116
… …
1111 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1123 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1112 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1124 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1113 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1125 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1114 1126
1115 if (prop.weight != rxvt_fontprop::unset 1127 if (prop.weight != rxvt_fontprop::unset
1116 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1128 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1117 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1129 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1118 1130
1119 if (prop.slant != rxvt_fontprop::unset 1131 if (prop.slant != rxvt_fontprop::unset
1120 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1132 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1121 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1133 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1122 1134
1123#if 0 // clipping unfortunately destroys our precious double-width-characters 1135#if 0 // clipping unfortunately destroys our precious double-width-characters
1124 // clip width, we can't do better, or can we? 1136 // clip width, we can't do better, or can we?
1125 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1131 1143
1132 // store generated name so iso14755 view gives better results 1144 // store generated name so iso14755 view gives better results
1133 set_name ((char *)FcNameUnparse (p)); 1145 set_name ((char *)FcNameUnparse (p));
1134 1146
1135 XftResult result; 1147 XftResult result;
1136 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1148 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1137 1149
1138 FcPatternDestroy (p); 1150 FcPatternDestroy (p);
1139 1151
1140 if (!match) 1152 if (!match)
1141 return false; 1153 return false;
… …
1183 XGlyphInfo g; 1195 XGlyphInfo g;
1184 XftTextExtents16 (disp, f, &ch, 1, &g); 1196 XftTextExtents16 (disp, f, &ch, 1, &g);
1185 1197
1186 g.width -= g.x; 1198 g.width -= g.x;
1187 1199
1188 int wcw = wcwidth (ch); 1200 int wcw = WCWIDTH (ch);
1189 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1201 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1190 1202
1191 if (width < g.width ) width = g.width; 1203 if (width < g.width ) width = g.width;
1192 if (height < g.height ) height = g.height; 1204 if (height < g.height ) height = g.height;
1193 if (glheight < g.height - g.y) glheight = g.height - g.y; 1205 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1239 1251
1240 return success; 1252 return success;
1241} 1253}
1242 1254
1243bool 1255bool
1244rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1256rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1245{ 1257{
1246 careful = false; 1258 careful = false;
1247 1259
1248 if (!XftCharExists (DISPLAY, f, unicode)) 1260 if (!XftCharExists (term->dpy, f, unicode))
1249 return false; 1261 return false;
1250 1262
1251 if (!prop || prop->width == rxvt_fontprop::unset) 1263 if (!prop || prop->width == rxvt_fontprop::unset)
1252 return true; 1264 return true;
1253 1265
1254 // check character against base font bounding box 1266 // check character against base font bounding box
1255 FcChar32 ch = unicode; 1267 FcChar32 ch = unicode;
1256 XGlyphInfo g; 1268 XGlyphInfo g;
1257 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1269 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1258 1270
1259 int w = g.width - g.x; 1271 int w = g.width - g.x;
1260 int wcw = wcwidth (unicode); 1272 int wcw = max (WCWIDTH (unicode), 1);
1261 if (wcw > 0) w = (w + wcw - 1) / wcw;
1262 1273
1263 careful = w > prop->width; 1274 careful = g.x > 0 || w > prop->width * wcw;
1264 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1275
1276 if (careful && !OVERLAP_OK (w, wcw, prop))
1277 return false;
1278
1279 // this weeds out _totally_ broken fonts, or glyphs
1280 if (!OVERLAP_OK (g.xOff, wcw, prop))
1265 return false; 1281 return false;
1266 1282
1267 return true; 1283 return true;
1268} 1284}
1269 1285
1270void 1286void
1271rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1272 const text_t *text, int len, 1288 const text_t *text, int len,
1273 int fg, int bg) 1289 int fg, int bg)
1274{ 1290{
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; 1291 XGlyphInfo extents;
1280 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1281 FcChar32 *ep = enc; 1293 XftGlyphSpec *ep = enc;
1282 int ewidth = 0; 1294
1295 dTermDisplay;
1296 dTermGC;
1297
1298 int w = term->fwidth * len;
1299 int h = term->fheight;
1300
1301 /*
1302 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1303 * good idea from the perspective of packaging for wide variety of user configs.
1304 */
1305 bool buffered = bg >= Color_transparent;
1306#ifdef FORCE_UNBUFFERED_XFT
1307 buffered = false;
1308#endif
1309
1310 // cut trailing spaces
1311 while (len && text [len - 1] == ' ')
1312 len--;
1313
1314 int x_ = buffered ? 0 : x;
1315 int y_ = buffered ? 0 : y;
1283 1316
1284 while (len) 1317 while (len)
1285 { 1318 {
1286 int cwidth = r->fwidth; 1319 int cwidth = term->fwidth;
1287 FcChar32 fc = *text++; len--; 1320 FcChar32 fc = *text++; len--;
1288 1321
1289 while (len && *text == NOCHAR) 1322 while (len && *text == NOCHAR)
1290 text++, len--, cwidth += r->fwidth; 1323 text++, len--, cwidth += term->fwidth;
1324
1325 if (fc != ' ') // skip spaces
1291 1326 {
1292 if (fc == ' ' && ep == enc) // skip leading spaces 1327 FT_UInt glyph = XftCharIndex (disp, f, fc);
1328 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1329
1330 ep->glyph = glyph;
1331 ep->x = x_ + (cwidth - extents.xOff >> 1);
1332 ep->y = y_ + ascent;
1333
1334 if (extents.xOff == 0)
1335 ep->x = x_ + cwidth;
1336
1337 ep++;
1338 }
1339
1293 x += cwidth; 1340 x_ += cwidth;
1294 else 1341 }
1295 {
1296 FT_UInt gl = XftCharIndex (d.display->display, f, fc);
1297 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1298 1342
1299 if (extents.xOff != cwidth) 1343 if (buffered)
1344 {
1345 if (ep != enc)
1346 {
1347 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1348
1349#ifdef HAVE_BG_PIXMAP
1350 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1351
1352 if (term->bgPixmap.pixmap
1353 && (bg == Color_transparent || bg == Color_bg
1354 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1300 { 1355 {
1301 if (ewidth) 1356 int src_x = x, src_y = y;
1357
1358 if (term->bgPixmap.is_parentOrigin ())
1302 { 1359 {
1303 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1304 x, y + base, enc, ep - enc);
1305 x += ewidth; 1360 src_x += term->window_vt_x;
1306 1361 src_y += term->window_vt_y;
1307 ep = enc;
1308 ewidth = 0;
1309 } 1362 }
1310 1363
1311 if (extents.xOff > cwidth) 1364 if (term->bgPixmap.pmap_width >= src_x + w
1312 extents.xOff = cwidth; 1365 && term->bgPixmap.pmap_height >= src_y + h)
1366 {
1367 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1368 src_x, src_y, w, h, 0, 0);
1369 }
1370 else
1371 {
1372 XGCValues gcv;
1313 1373
1314 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1374 gcv.fill_style = FillTiled;
1315 x + (cwidth - extents.xOff >> 1), 1375 gcv.tile = term->bgPixmap.pixmap;
1376 gcv.ts_x_origin = -src_x;
1377 gcv.ts_y_origin = -src_y;
1378
1379 XChangeGC (disp, gc,
1380 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1316 y + base, &gl, 1); 1381 &gcv);
1317 x += cwidth; 1382
1383 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1384
1385 gcv.fill_style = FillSolid;
1386 XChangeGC (disp, gc, GCFillStyle, &gcv);
1387 }
1388
1389 if (dst)
1390 {
1391 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1392
1393 // dst can only be set when bg >= 0
1394 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1395 }
1318 } 1396 }
1319 else 1397 else
1320 { 1398#endif
1321 *ep++ = gl; 1399 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1322 ewidth += cwidth; 1400
1401 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1402 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1323 } 1403 }
1324 } 1404 else
1405 clear_rect (d, x, y, w, h, bg);
1406 }
1407 else
1325 } 1408 {
1326 1409 clear_rect (d, x, y, w, h, bg);
1327 if (ep != enc)
1328 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1410 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1329 x, y + base, enc, ep - enc); 1411 }
1330} 1412}
1413
1331#endif 1414#endif
1332 1415
1333///////////////////////////////////////////////////////////////////////////// 1416/////////////////////////////////////////////////////////////////////////////
1334 1417
1335rxvt_fontset::rxvt_fontset (rxvt_t r) 1418rxvt_fontset::rxvt_fontset (rxvt_term *term)
1336: fontdesc (0), r (r) 1419: fontdesc (0), term (term)
1337{ 1420{
1338 clear (); 1421 clear ();
1339} 1422}
1340 1423
1341rxvt_fontset::~rxvt_fontset () 1424rxvt_fontset::~rxvt_fontset ()
… …
1346void 1429void
1347rxvt_fontset::clear () 1430rxvt_fontset::clear ()
1348{ 1431{
1349 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1432 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1350 = rxvt_fontprop::unset; 1433 = rxvt_fontprop::unset;
1434 force_prop = false;
1351 1435
1352 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1436 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1353 FONT_UNREF (*i); 1437 FONT_UNREF (*i);
1354 1438
1355 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1439 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1364 1448
1365rxvt_font * 1449rxvt_font *
1366rxvt_fontset::new_font (const char *name, codeset cs) 1450rxvt_fontset::new_font (const char *name, codeset cs)
1367{ 1451{
1368 rxvt_font *f; 1452 rxvt_font *f;
1369 1453
1370 if (!name || !*name) 1454 if (!name || !*name)
1371 { 1455 {
1372 name = ""; 1456 name = "";
1373 f = new rxvt_font_default (this); 1457 f = new rxvt_font_default (this);
1374 } 1458 }
… …
1385 f = new rxvt_font_x11; 1469 f = new rxvt_font_x11;
1386 } 1470 }
1387 else 1471 else
1388 f = new rxvt_font_x11; 1472 f = new rxvt_font_x11;
1389 1473
1390 f->set_term (r); 1474 f->set_term (term);
1391 f->set_name (strdup (name)); 1475 f->set_name (strdup (name));
1392 1476
1393 f->cs = cs; 1477 f->cs = cs;
1394 f->loaded = false; 1478 f->loaded = false;
1395 1479
… …
1442 if (!end) 1526 if (!end)
1443 end = desc + strlen (desc); 1527 end = desc + strlen (desc);
1444 1528
1445 if (end - desc < 511) 1529 if (end - desc < 511)
1446 { 1530 {
1447 strncpy (buf, desc, end - desc); 1531 memcpy (buf, desc, end - desc);
1448 buf[end - desc] = 0; 1532 buf[end - desc] = 0;
1449 1533
1450 fonts.push_back (new_font (buf, cs)); 1534 fonts.push_back (new_font (buf, cs));
1451 } 1535 }
1452 else 1536 else
… …
1467 if (fonts[i]->loaded) 1551 if (fonts[i]->loaded)
1468 return true; 1552 return true;
1469 1553
1470 fonts[i]->loaded = true; 1554 fonts[i]->loaded = true;
1471 1555
1472 if (!fonts[i]->load (prop)) 1556 if (!fonts[i]->load (prop, force_prop))
1473 { 1557 {
1474 fonts[i]->cs = CS_UNKNOWN; 1558 fonts[i]->cs = CS_UNKNOWN;
1475 return false; 1559 return false;
1476 } 1560 }
1477 1561
… …
1578 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1662 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1579 FcPatternAddBool (p, FC_MINSPACE, 1); 1663 FcPatternAddBool (p, FC_MINSPACE, 1);
1580 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1664 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1581 1665
1582 XftResult result; 1666 XftResult result;
1583 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1667 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1584 1668
1585 FcPatternDestroy (p); 1669 FcPatternDestroy (p);
1586 1670
1587 if (match) 1671 if (match)
1588 { 1672 {
… …
1593 if (find_font (font) < 0) 1677 if (find_font (font) < 0)
1594 { 1678 {
1595 char fontname[4096]; 1679 char fontname[4096];
1596 sprintf (fontname, "xft:%-.4090s", font); 1680 sprintf (fontname, "xft:%-.4090s", font);
1597 1681
1598 fonts.push_back (new_font (fontname, CS_UNICODE)); 1682 fonts.push_back (new_font (fontname, CS_UNICODE));
1599 } 1683 }
1600 1684
1601 free (font); 1685 free (font);
1602 } 1686 }
1603#endif 1687#endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines