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.79 by root, Sun Jan 8 01:02:15 2006 UTC vs.
Revision 1.134 by root, Wed Jan 23 09:42:02 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-2006 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
… …
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 bool done = false;
242
243# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && !term->pix_colors[color].is_opaque ())
245 {
246 Picture dst = XftDrawPicture (d);
247
248 if (dst != 0)
249 {
250 XClearArea (disp, d, x, y, w, h, false);
251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
252 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
253 done = true;
254 }
255 }
256# endif
257 if (!done)
258 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 258 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
259
259#else 260#else
260 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 261 XSetForeground (disp, gc, term->pix_colors[color]);
261 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 262 XFillRectangle (disp, d, gc, x, y, w, h);
262#endif 263#endif
263 } 264 }
264} 265}
265 266
266#include "table/linedraw.h" 267/////////////////////////////////////////////////////////////////////////////
267 268
268struct rxvt_font_default : rxvt_font { 269struct rxvt_font_default : rxvt_font {
269 struct rxvt_fontset *fs; 270 struct rxvt_fontset *fs;
270 271
271 rxvt_font_default (rxvt_fontset *fs) 272 rxvt_font_default (rxvt_fontset *fs)
… …
284 p.slant = rxvt_fontprop::roman; 285 p.slant = rxvt_fontprop::roman;
285 286
286 return p; 287 return p;
287 } 288 }
288 289
289 bool load (const rxvt_fontprop &prop) 290 bool load (const rxvt_fontprop &prop, bool force_prop)
290 { 291 {
291 width = 1; height = 1; 292 width = 1; height = 1;
292 ascent = 1; descent = 0; 293 ascent = 1; descent = 0;
293 294
294 set_name (strdup ("built-in support font")); 295 set_name (strdup ("built-in support font"));
295 296
296 return true; 297 return true;
297 } 298 }
298 299
299 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 300 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
300 { 301 {
301 careful = false; 302 careful = false;
302 303
303 if (unicode <= 0x001f) 304 if (unicode <= 0x001f)
304 return true; 305 return true;
… …
307 return false; 308 return false;
308 309
309 if (unicode <= 0x009f) 310 if (unicode <= 0x009f)
310 return true; 311 return true;
311 312
313#ifdef BUILTIN_GLYPHS
312 if (unicode >= 0x2500 && unicode <= 0x259f && 314 if (unicode >= 0x2500 && unicode <= 0x259f &&
313 !r->option (Opt_skipBuiltinGlyphs)) 315 !term->option (Opt_skipBuiltinGlyphs))
314 return true; 316 return true;
317#endif
315 318
316 if (IS_COMPOSE (unicode)) 319 if (IS_COMPOSE (unicode))
317 return true; 320 return true;
318 321
319 switch (unicode) 322 switch (unicode)
… …
334void 337void
335rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 338rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
336 const text_t *text, int len, 339 const text_t *text, int len,
337 int fg, int bg) 340 int fg, int bg)
338{ 341{
339 Display *disp = d.display->display; 342 dTermDisplay;
343 dTermGC;
340 344
341 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 345 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
342 346
343 XSetForeground (disp, TGC, r->pix_colors[fg]); 347 XSetForeground (disp, gc, term->pix_colors[fg]);
344 348
345 while (len) 349 while (len)
346 { 350 {
347#if ENABLE_COMBINING 351#if ENABLE_COMBINING
348 compose_char *cc; 352 compose_char *cc;
… …
352 356
353 while (++text, --len && *text == NOCHAR) 357 while (++text, --len && *text == NOCHAR)
354 ; 358 ;
355 359
356 int width = text - tp; 360 int width = text - tp;
357 int fwidth = r->fwidth * width; 361 int fwidth = term->fwidth * width;
358 362
363#ifdef BUILTIN_GLYPHS
359 if (0x2500 <= t && t <= 0x259f) 364 if (0x2500 <= t && t <= 0x259f)
360 { 365 {
366# include "table/linedraw.h"
361 uint16_t offs = linedraw_offs[t - 0x2500]; 367 uint16_t offs = linedraw_offs[t - 0x2500];
362 uint32_t *a = linedraw_command + (offs >> 4); 368 uint32_t *a = linedraw_command + (offs >> 4);
363 uint32_t *b = a + (offs & 15); 369 uint32_t *b = a + (offs & 15);
364 370
365 int W = fwidth; 371 int W = fwidth;
366 int H = r->fheight; 372 int H = term->fheight;
367 373
368 int x_[16]; 374 int x_[16];
369 int y_[16]; 375 int y_[16];
370 376
371 for (int i = 0; i <= 8; i++) 377 for (int i = 0; i <= 8; i++)
… …
379 385
380 XGCValues gcv; 386 XGCValues gcv;
381 387
382 gcv.cap_style = CapButt; 388 gcv.cap_style = CapButt;
383 gcv.line_width = 0; 389 gcv.line_width = 0;
384 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 390 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
385 391
386 while (a < b) 392 while (a < b)
387 { 393 {
388 uint32_t command = *a++; 394 uint32_t command = *a++;
389 395
… …
396 int y2 = y_[(command >> 0) & 15]; 402 int y2 = y_[(command >> 0) & 15];
397 403
398 switch (op) 404 switch (op)
399 { 405 {
400 case 0: // line 406 case 0: // line
401 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 407 XDrawLine (disp, d, gc, x1, y1, x2, y2);
402 break; 408 break;
403 409
404 case 1: // rectangle, possibly stippled 410 case 1: // rectangle, possibly stippled
405 if (a) 411 if (a)
406 { 412 {
407 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 413 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
408 414
409 gcv.fill_style = FillStippled; 415 gcv.fill_style = FillStippled;
410 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 416 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
411 gcv.ts_x_origin = x; 417 gcv.ts_x_origin = x;
412 gcv.ts_y_origin = y; 418 gcv.ts_y_origin = y;
413 419
414 XChangeGC (disp, TGC, 420 XChangeGC (disp, gc,
415 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 421 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
416 &gcv); 422 &gcv);
417 } 423 }
418 424
419 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 425 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
420 426
421 if (a) 427 if (a)
422 { 428 {
423 XFreePixmap (disp, gcv.stipple); 429 XFreePixmap (disp, gcv.stipple);
424 gcv.stipple = 0; 430 gcv.stipple = 0;
425 gcv.fill_style = FillSolid; 431 gcv.fill_style = FillSolid;
426 XChangeGC (disp, TGC, GCFillStyle, &gcv); 432 XChangeGC (disp, gc, GCFillStyle, &gcv);
427 } 433 }
428 break; 434 break;
429 case 2: // arc 435 case 2: // arc
430 XDrawArc (disp, d, TGC, 436 XDrawArc (disp, d, gc,
431 x1 - W/2, y1 - H/2, W-1, H-1, 437 x1 - W/2, y1 - H/2, W-1, H-1,
432 (a - 1) * 90*64, (b - 1) * 90*64); 438 (a - 1) * 90*64, (b - 1) * 90*64);
433 break; 439 break;
434 } 440 }
435 } 441 }
436 } 442 }
443#else
444 if (0)
445 ;
446#endif
437#if ENABLE_COMBINING 447#if ENABLE_COMBINING
438 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 448 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
439 { 449 {
450 min_it (width, 2); // we only support wcwidth up to 2
451
440 text_t chrs[2]; 452 text_t chrs[2];
441 width = min (2, width);
442 chrs [1] = NOCHAR; 453 chrs [1] = NOCHAR;
443 454
444 *chrs = cc->c1; 455 *chrs = cc->c1;
445 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 456 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
446 f1->draw (d, x, y, chrs, width, fg, bg); 457 f1->draw (d, x, y, chrs, width, fg, bg);
… …
453 *chrs = cc->c2; 464 *chrs = cc->c2;
454 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 465 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
455 ? f1 466 ? f1
456 : (*fs)[fs->find_font (cc->c2)]; 467 : (*fs)[fs->find_font (cc->c2)];
457 468
458 f2->draw (d, x, y, chrs, width, fg, -1); 469 f2->draw (d, x, y, chrs, width, fg, Color_none);
459 } 470 }
460 } 471 }
461#endif 472#endif
462 else 473 else
463 switch (t) 474 switch (t)
… …
466 case ZERO_WIDTH_CHAR: 477 case ZERO_WIDTH_CHAR:
467 case NOCHAR: 478 case NOCHAR:
468 break; 479 break;
469 480
470 default: 481 default:
471 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 482 XDrawRectangle (disp, d, gc, x + 2, y + 2,
472 fwidth - 4, r->fheight - 4); 483 fwidth - 4, term->fheight - 4);
473 } 484 }
474 485
475 x += fwidth; 486 x += fwidth;
476 } 487 }
477} 488}
… …
483 494
484 void clear (); 495 void clear ();
485 496
486 rxvt_fontprop properties (); 497 rxvt_fontprop properties ();
487 498
488 bool load (const rxvt_fontprop &prop); 499 bool load (const rxvt_fontprop &prop, bool force_prop);
489 500
490 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 501 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
491 502
492 void draw (rxvt_drawable &d, int x, int y, 503 void draw (rxvt_drawable &d, int x, int y,
493 const text_t *text, int len, 504 const text_t *text, int len,
494 int fg, int bg); 505 int fg, int bg);
495 506
496 bool slow; // wether this is a proportional font or has other funny characteristics 507 bool slow; // wether this is a proportional font or has other funny characteristics
497 XFontStruct *f; 508 XFontStruct *f;
498 codeset cs;
499 bool enc2b, encm; 509 bool enc2b, encm;
500 510
501 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 511 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); 512 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); 513 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
504 bool set_properties (rxvt_fontprop &p, const char *name); 514 bool set_properties (rxvt_fontprop &p, const char *name);
505}; 515};
506 516
507char * 517char *
508rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 518rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
509{ 519{
510 unsigned long value; 520 unsigned long value;
511 521
512 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 522 if (XGetFontProperty (f, property, &value))
513 return XGetAtomName (DISPLAY, value); 523 return XGetAtomName (term->dpy, value);
514 else 524 else
515 return rxvt_strdup (repl); 525 return repl ? strdup (repl) : 0;
516} 526}
517 527
518rxvt_fontprop 528rxvt_fontprop
519rxvt_font_x11::properties () 529rxvt_font_x11::properties ()
520{ 530{
… …
524} 534}
525 535
526bool 536bool
527rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 537rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
528{ 538{
529 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 539 p.width = width != rxvt_fontprop::unset ? width
540 : avgwidth ? (avgwidth + 1) / 10
541 : (height + 1) / 2;
530 p.height = height; 542 p.height = height;
531 p.ascent = rxvt_fontprop::unset; 543 p.ascent = rxvt_fontprop::unset;
532 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 544 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; 545 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
534 546
… …
539rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 551rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
540{ 552{
541 unsigned long height; 553 unsigned long height;
542 554
543#if 0 555#if 0
544 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 556 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
545 return false; 557 return false;
546#else 558#else
547 height = f->ascent + f->descent; 559 height = f->ascent + f->descent;
548#endif 560#endif
549 561
550 unsigned long avgwidth; 562 unsigned long avgwidth;
551 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 563 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
552 avgwidth = 0; 564 avgwidth = 0;
553 565
554 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 566 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
555 char *slant = get_property (f, "SLANT", "r"); 567 char *slant = get_property (f, term->xa [XA_SLANT], "r");
556 568
557 set_properties (p, height, weight, slant, avgwidth); 569 set_properties (p, height, weight, slant, avgwidth);
558 570
559 free (weight); 571 free (weight);
560 free (slant); 572 free (slant);
… …
565} 577}
566 578
567bool 579bool
568rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 580rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
569{ 581{
582 dTermDisplay;
570 int slashes = 0; 583 int slashes = 0;
571 const char *comp[13]; 584 const char *comp[13];
572 585
573 for (const char *c = name; *c; c++) 586 for (const char *c = name; *c; c++)
574 if (*c == '-') 587 if (*c == '-')
… …
582 if (slashes >= 13 595 if (slashes >= 13
583 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 596 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
584 && (*comp[11] >= '0' && *comp[11] <= '9')) 597 && (*comp[11] >= '0' && *comp[11] <= '9'))
585 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 598 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
586 599
587 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 600 XFontStruct *f = XLoadQueryFont (disp, name);
588 601
589 if (f) 602 if (f)
590 { 603 {
591 // the font should really exist now. if not, we have a problem 604 // 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). 605 // (e.g. if the user did xset fp rehash just when we were searching fonts).
593 // in that case, just return garbage. 606 // in that case, just return garbage.
594 bool ret = set_properties (p, f); 607 bool ret = set_properties (p, f);
595 XFreeFont (DISPLAY, f); 608 XFreeFont (disp, f);
596 return ret; 609 return ret;
597 } 610 }
598 else 611 else
599 return false; 612 return false;
600} 613}
601 614
602// fix the size of scalable fonts 615// fix the size of scalable fonts
603static bool 616static bool
604replace_field (char *buf, const char *name, int index, const char old, const char *replace) 617replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
605{ 618{
606 int slashes = 0; 619 int slashes = 0;
607 const char *field, *end; 620 const char *field, *end;
608 621
609 for (const char *c = name; *c; c++) 622 for (const char *c = name; *c; c++)
… …
619 break; 632 break;
620 } 633 }
621 634
622 if (slashes >= 13 && (!old || *field == old)) 635 if (slashes >= 13 && (!old || *field == old))
623 { 636 {
624 // TODO: check for overflow in font-name 637 size_t len = field - name;
625 strncpy (buf, name, field - name); 638 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
626 buf += field - name; 639 memcpy (*ptr, name, len);
627 strcpy (buf, replace); 640 strcpy (*ptr + len, replace);
628 strcat (buf, end); 641 strcat (*ptr, end);
629 642
630 return true; 643 return true;
631 } 644 }
632 else 645 else
633 { 646 {
634 strcpy (buf, name); 647 *ptr = strdup (name);
635 648
636 return false; 649 return false;
637 } 650 }
638} 651}
639 652
640bool 653bool
641rxvt_font_x11::load (const rxvt_fontprop &prop) 654rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
642{ 655{
643 Display *disp = DISPLAY; 656 dTermDisplay;
644 657
645 clear (); 658 clear ();
646 659
647 char field_str[64]; // enough for 128 bits 660 char field_str[64]; // enough for 128 bits
648 661
649 // first morph the font if required 662 // first morph the font if required
650 if (prop.weight != rxvt_fontprop::unset 663 if (force_prop)
651 || prop.slant != rxvt_fontprop::unset)
652 { 664 {
653 char fname[1024]; 665 char *fname;
654 666
655 if (name[0] != '-') 667 if (name[0] != '-')
656 { 668 {
657 f = XLoadQueryFont (disp, name); 669 f = XLoadQueryFont (disp, name);
658 670
659 if (!f) 671 if (!f)
660 return false; 672 return false;
661 673
662 char *new_name = get_property (f, "FONT", name); 674 char *new_name = get_property (f, XA_FONT, name);
663 675
664 if (new_name) 676 if (new_name)
665 set_name (new_name); 677 set_name (new_name);
666 else 678 else
667 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 679 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
670 f = 0; 682 f = 0;
671 } 683 }
672 684
673 if (prop.weight != rxvt_fontprop::unset) 685 if (prop.weight != rxvt_fontprop::unset)
674 { 686 {
675 replace_field (fname, name, 2, 0, 687 replace_field (&fname, name, 2, 0,
676 prop.weight < rxvt_fontprop::bold 688 prop.weight < rxvt_fontprop::bold
677 ? "medium" : "bold"); 689 ? "medium" : "bold");
678 set_name (strdup (fname)); 690 set_name (fname);
679 } 691 }
680 692
681 if (prop.slant != rxvt_fontprop::unset) 693 if (prop.slant != rxvt_fontprop::unset)
682 { 694 {
683 replace_field (fname, name, 3, 0, 695 replace_field (&fname, name, 3, 0,
684 prop.slant < rxvt_fontprop::italic 696 prop.slant < rxvt_fontprop::italic
685 ? "r" : "i"); // TODO: handle "o"blique, too 697 ? "r" : "i"); // TODO: handle "o"blique, too
686 set_name (strdup (fname)); 698 set_name (fname);
687 } 699 }
688 } 700 }
689 701
690 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 702 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
691 ? 0 : prop.height); 703 ? 0 : prop.height);
… …
716 font_weight *fonts = new font_weight[count]; 728 font_weight *fonts = new font_weight[count];
717 729
718 for (int i = 0; i < count; i++) 730 for (int i = 0; i < count; i++)
719 { 731 {
720 rxvt_fontprop p; 732 rxvt_fontprop p;
721 char fname[1024]; 733 char *fname;
722 734
723 int diff = 0; 735 int diff = 0;
724 736
725 if (replace_field (fname, list[i], 6, '0', field_str)) 737 if (replace_field (&fname, list[i], 6, '0', field_str))
726 diff += 10; // slightly penalize scalable fonts 738 diff += 10; // slightly penalize scalable fonts
739 else
740 {
741 free (fname);
727 else if (replace_field (fname, list[i], 11, '0', "0")) 742 if (replace_field (&fname, list[i], 11, '0', "0"))
728 diff += 300; // more heavily penalize what looks like scaled bitmap fotns 743 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
744 }
729 745
730 if (!set_properties (p, fname)) 746 if (!set_properties (p, fname))
731 continue; 747 continue;
732 748
733 if (prop.height != rxvt_fontprop::unset 749 if (prop.height != rxvt_fontprop::unset
… …
737 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 753 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
738 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 754 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
739 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 755 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
740 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 756 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
741 757
742 fonts[i].name = strdup (fname); 758 fonts[i].name = fname;
743 fonts[i].diff = diff; 759 fonts[i].diff = diff;
744 } 760 }
745 761
746 XFreeFontNames (list); 762 XFreeFontNames (list);
747 763
… …
776 delete [] fonts; 792 delete [] fonts;
777 793
778 if (!f) 794 if (!f)
779 return false; 795 return false;
780 796
781 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 797 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
782 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 798 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
783 799
784 if (registry && encoding) 800 if (registry && encoding)
785 { 801 {
786 char charset[64]; 802 char charset[64];
787 snprintf (charset, 64, "%s-%s", registry, encoding); 803 snprintf (charset, 64, "%s-%s", registry, encoding);
788 804
789 cs = codeset_from_name (charset); 805 cs = codeset_from_name (charset);
790 } 806 }
791 else 807 else
792 { 808 {
793 const char *charset = get_property (f, "FONT", 0); 809 const char *charset = get_property (f, XA_FONT, 0);
794 810
795 if (!charset) 811 if (!charset)
796 charset = name; 812 charset = name;
797 813
798 int count = 13; 814 int count = 13;
… …
813 enc2b = encm || f->max_char_or_byte2 > 255; 829 enc2b = encm || f->max_char_or_byte2 > 255;
814 830
815 slow = false; 831 slow = false;
816 832
817#if 1 // only used for slow detection, TODO optimize 833#if 1 // only used for slow detection, TODO optimize
818 if (f->min_bounds.width == f->max_bounds.width) 834 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; 835 width = f->max_bounds.width;
822 else 836 else
823 { 837 {
824 slow = true; 838 slow = true;
825 839
826 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 840 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
827 841
828 if (encm) 842 if (encm)
829 N += (f->max_byte1 - f->min_byte1) 843 N += (f->max_byte1 - f->min_byte1)
830 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 844 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
831 845
832 while (N) 846 while (N)
833 { 847 {
834 if (f->per_char[N].width > width) 848 if (f->per_char[N].width > width)
835 width = f->per_char[N].width; 849 width = f->per_char[N].width;
836 850
… …
841 855
842 width = 1; 856 width = 1;
843 857
844 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 858 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
845 { 859 {
846 if (cs != CS_UNICODE
847 && *t > 0x100
848 && FROM_UNICODE (cs, *t) == NOCHAR) 860 if (FROM_UNICODE (cs, *t) == NOCHAR)
849 continue; 861 continue;
850 862
851 // ignore characters we wouldn't use anyways 863 // ignore characters we wouldn't use anyways
852 bool careful; 864 bool careful;
853 if (!has_char (*t, &prop, careful)) 865 if (!has_char (*t, &prop, careful))
… …
857 869
858 XCharStruct g; 870 XCharStruct g;
859 int dir_ret, asc_ret, des_ret; 871 int dir_ret, asc_ret, des_ret;
860 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 872 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
861 873
874 int wcw = WCWIDTH (*t);
862 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 875 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
863 876
864 if (width < g.width) width = g.width; 877 if (width < g.width) width = g.width;
865 } 878 }
866 879
867 if (cs == CS_UNKNOWN) 880 if (cs == CS_UNKNOWN)
868 { 881 {
869 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 882 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
886void 899void
887rxvt_font_x11::clear () 900rxvt_font_x11::clear ()
888{ 901{
889 if (f) 902 if (f)
890 { 903 {
891 XFreeFont (DISPLAY, f); 904 XFreeFont (term->dpy, f);
892 f = 0; 905 f = 0;
893 } 906 }
894} 907}
895 908
896bool 909bool
897rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 910rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
898{ 911{
899 uint32_t ch = FROM_UNICODE (cs, unicode); 912 uint32_t ch = FROM_UNICODE (cs, unicode);
900 913
901 if (ch == NOCHAR) 914 if (ch == NOCHAR)
902 return false; 915 return false;
… …
939 return false; 952 return false;
940 953
941 if (!prop || prop->width == rxvt_fontprop::unset) 954 if (!prop || prop->width == rxvt_fontprop::unset)
942 return true; 955 return true;
943 956
944 // check character against base font bounding box 957 // check wether character overlaps previous/next character
945 int w = xcs->width; 958 int w = xcs->rbearing - xcs->lbearing;
946 int wcw = wcwidth (unicode); 959 int wcw = max (WCWIDTH (unicode), 1);
947 if (wcw > 0) w = (w + wcw - 1) / wcw;
948 960
949 careful = w > prop->width; 961 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
950 if (careful && w > prop->width * MAX_OVERLAP >> 2) 962
963 if (careful && !OVERLAP_OK (w, wcw, prop))
951 return false; 964 return false;
952 965
953 return true; 966 return true;
954} 967}
955 968
… …
961 // this looks like a mess /. 974 // this looks like a mess /.
962 // and it is a mess /. 975 // and it is a mess /.
963 // yet we are trying to be perfect /. 976 // yet we are trying to be perfect /.
964 // but the result still isn't perfect /. 977 // but the result still isn't perfect /.
965 978
979 dTermDisplay;
980 dTermGC;
981
966 bool slow = this->slow 982 bool slow = this->slow
967 || width != r->fwidth 983 || width != term->fwidth
968 || height != r->fheight; 984 || height != term->fheight;
969 985
970 int base = ascent; // sorry, incorrect: r->fbase; 986 int base = ascent; // sorry, incorrect: term->fbase;
971 987
972 XGCValues v; 988 XGCValues v;
973 v.foreground = r->pix_colors[fg]; 989 v.foreground = term->pix_colors[fg];
974 v.font = f->fid; 990 v.font = f->fid;
975 991
976 if (enc2b) 992 if (enc2b)
977 { 993 {
978 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 994 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
979 995
980 if (bg == Color_bg && !slow) 996 if (bg == Color_bg && !slow)
981 { 997 {
982 v.background = r->pix_colors[bg]; 998 v.background = term->pix_colors[bg];
983 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 999 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
984 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 1000 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
985 } 1001 }
986 else 1002 else
987 { 1003 {
988 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1004 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
989 1005
990 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1006 XChangeGC (disp, gc, GCForeground | GCFont, &v);
991 1007
992 if (slow) 1008 if (slow)
993 { 1009 {
994 do 1010 do
995 { 1011 {
996 if (xc->byte1 || xc->byte2) 1012 if (xc->byte1 || xc->byte2)
997 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1013 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
998 1014
999 x += r->fwidth; 1015 x += term->fwidth;
1000 xc++; len--; 1016 xc++; len--;
1001 } 1017 }
1002 while (len); 1018 while (len);
1003 } 1019 }
1004 else 1020 else
1005 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1021 XDrawString16 (disp, d, gc, x, y + base, xc, len);
1006 } 1022 }
1007 } 1023 }
1008 else 1024 else
1009 { 1025 {
1010 const char *xc = enc_char (text, len, cs, slow); 1026 const char *xc = enc_char (text, len, cs, slow);
1011 1027
1012 if (bg == Color_bg && !slow) 1028 if (bg == Color_bg && !slow)
1013 { 1029 {
1014 v.background = r->pix_colors[bg]; 1030 v.background = term->pix_colors[bg];
1015 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1031 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1016 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1032 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1017 } 1033 }
1018 else 1034 else
1019 { 1035 {
1020 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1036 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1021 1037
1022 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1038 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1023 1039
1024 if (slow) 1040 if (slow)
1025 { 1041 {
1026 do 1042 do
1027 { 1043 {
1028 if (*xc) 1044 if (*xc)
1029 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1045 XDrawString (disp, d, gc, x, y + base, xc, 1);
1030 1046
1031 x += r->fwidth; 1047 x += term->fwidth;
1032 xc++; len--; 1048 xc++; len--;
1033 } 1049 }
1034 while (len); 1050 while (len);
1035 } 1051 }
1036 else 1052 else
1037 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1053 XDrawString (disp, d, gc, x, y + base, xc, len);
1038 } 1054 }
1039 } 1055 }
1040} 1056}
1041 1057
1042///////////////////////////////////////////////////////////////////////////// 1058/////////////////////////////////////////////////////////////////////////////
… …
1048 1064
1049 void clear (); 1065 void clear ();
1050 1066
1051 rxvt_fontprop properties (); 1067 rxvt_fontprop properties ();
1052 1068
1053 bool load (const rxvt_fontprop &prop); 1069 bool load (const rxvt_fontprop &prop, bool force_prop);
1054 1070
1055 void draw (rxvt_drawable &d, int x, int y, 1071 void draw (rxvt_drawable &d, int x, int y,
1056 const text_t *text, int len, 1072 const text_t *text, int len,
1057 int fg, int bg); 1073 int fg, int bg);
1058 1074
1059 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1075 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1060 1076
1061protected: 1077protected:
1062 XftFont *f; 1078 XftFont *f;
1063}; 1079};
1064 1080
1065void 1081void
1066rxvt_font_xft::clear () 1082rxvt_font_xft::clear ()
1067{ 1083{
1068 if (f) 1084 if (f)
1069 { 1085 {
1070 XftFontClose (DISPLAY, f); 1086 XftFontClose (term->dpy, f);
1071 f = 0; 1087 f = 0;
1072 } 1088 }
1073} 1089}
1074 1090
1075rxvt_fontprop 1091rxvt_fontprop
… …
1091 1107
1092 return p; 1108 return p;
1093} 1109}
1094 1110
1095bool 1111bool
1096rxvt_font_xft::load (const rxvt_fontprop &prop) 1112rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1097{ 1113{
1098 Display *disp = DISPLAY; 1114 dTermDisplay;
1099 1115
1100 clear (); 1116 clear ();
1101 1117
1102 FcPattern *p = FcNameParse ((FcChar8 *) name); 1118 FcPattern *p = FcNameParse ((FcChar8 *) name);
1103 1119
… …
1110 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1126 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1111 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1127 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1112 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1128 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1113 1129
1114 if (prop.weight != rxvt_fontprop::unset 1130 if (prop.weight != rxvt_fontprop::unset
1115 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1131 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1116 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1132 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1117 1133
1118 if (prop.slant != rxvt_fontprop::unset 1134 if (prop.slant != rxvt_fontprop::unset
1119 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1135 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1120 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1136 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1121 1137
1122#if 0 // clipping unfortunately destroys our precious double-width-characters 1138#if 0 // clipping unfortunately destroys our precious double-width-characters
1123 // clip width, we can't do better, or can we? 1139 // clip width, we can't do better, or can we?
1124 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1140 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1130 1146
1131 // store generated name so iso14755 view gives better results 1147 // store generated name so iso14755 view gives better results
1132 set_name ((char *)FcNameUnparse (p)); 1148 set_name ((char *)FcNameUnparse (p));
1133 1149
1134 XftResult result; 1150 XftResult result;
1135 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1151 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1136 1152
1137 FcPatternDestroy (p); 1153 FcPatternDestroy (p);
1138 1154
1139 if (!match) 1155 if (!match)
1140 return false; 1156 return false;
… …
1182 XGlyphInfo g; 1198 XGlyphInfo g;
1183 XftTextExtents16 (disp, f, &ch, 1, &g); 1199 XftTextExtents16 (disp, f, &ch, 1, &g);
1184 1200
1185 g.width -= g.x; 1201 g.width -= g.x;
1186 1202
1187 int wcw = wcwidth (ch); 1203 int wcw = WCWIDTH (ch);
1188 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1204 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1189 1205
1190 if (width < g.width ) width = g.width; 1206 if (width < g.width ) width = g.width;
1191 if (height < g.height ) height = g.height; 1207 if (height < g.height ) height = g.height;
1192 if (glheight < g.height - g.y) glheight = g.height - g.y; 1208 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1238 1254
1239 return success; 1255 return success;
1240} 1256}
1241 1257
1242bool 1258bool
1243rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1259rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1244{ 1260{
1245 careful = false; 1261 careful = false;
1246 1262
1247 if (!XftCharExists (DISPLAY, f, unicode)) 1263 if (!XftCharExists (term->dpy, f, unicode))
1248 return false; 1264 return false;
1249 1265
1250 if (!prop || prop->width == rxvt_fontprop::unset) 1266 if (!prop || prop->width == rxvt_fontprop::unset)
1251 return true; 1267 return true;
1252 1268
1253 // check character against base font bounding box 1269 // check character against base font bounding box
1254 FcChar32 ch = unicode; 1270 FcChar32 ch = unicode;
1255 XGlyphInfo g; 1271 XGlyphInfo g;
1256 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1272 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1257 1273
1258 int w = g.width - g.x; 1274 int w = g.width - g.x;
1259 int wcw = wcwidth (unicode); 1275 int wcw = max (WCWIDTH (unicode), 1);
1260 if (wcw > 0) w = (w + wcw - 1) / wcw;
1261 1276
1262 careful = w > prop->width; 1277 careful = g.x > 0 || w > prop->width * wcw;
1263 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1278
1279 if (careful && !OVERLAP_OK (w, wcw, prop))
1280 return false;
1281
1282 // this weeds out _totally_ broken fonts, or glyphs
1283 if (!OVERLAP_OK (g.xOff, wcw, prop))
1264 return false; 1284 return false;
1265 1285
1266 return true; 1286 return true;
1267} 1287}
1268 1288
1269void 1289void
1270rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1290rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1271 const text_t *text, int len, 1291 const text_t *text, int len,
1272 int fg, int bg) 1292 int fg, int bg)
1273{ 1293{
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; 1294 XGlyphInfo extents;
1279 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1295 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1280 FcChar32 *ep = enc; 1296 XftGlyphSpec *ep = enc;
1281 int ewidth = 0; 1297
1298 dTermDisplay;
1299 dTermGC;
1300
1301 int w = term->fwidth * len;
1302 int h = term->fheight;
1303
1304 /*
1305 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1306 * good idea from the perspective of packaging for wide variety of user configs.
1307 */
1308 bool buffered = bg >= Color_transparent;
1309#ifdef FORCE_UNBUFFERED_XFT
1310 buffered = false;
1311#endif
1312
1313 // cut trailing spaces
1314 while (len && text [len - 1] == ' ')
1315 len--;
1316
1317 int x_ = buffered ? 0 : x;
1318 int y_ = buffered ? 0 : y;
1282 1319
1283 while (len) 1320 while (len)
1284 { 1321 {
1285 int cwidth = r->fwidth; 1322 int cwidth = term->fwidth;
1286 FcChar32 fc = *text++; len--; 1323 FcChar32 fc = *text++; len--;
1287 1324
1288 while (len && *text == NOCHAR) 1325 while (len && *text == NOCHAR)
1289 text++, len--, cwidth += r->fwidth; 1326 text++, len--, cwidth += term->fwidth;
1327
1328 if (fc != ' ') // skip spaces
1290 1329 {
1291 if (fc == ' ' && ep == enc) // skip leading spaces 1330 FT_UInt glyph = XftCharIndex (disp, f, fc);
1331 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1332
1333 ep->glyph = glyph;
1334 ep->x = x_ + (cwidth - extents.xOff >> 1);
1335 ep->y = y_ + ascent;
1336
1337 if (extents.xOff == 0)
1338 ep->x = x_ + cwidth;
1339
1340 ep++;
1341 }
1342
1292 x += cwidth; 1343 x_ += cwidth;
1344 }
1345
1346 if (buffered)
1347 {
1348 if (ep != enc)
1349 {
1350 bool back_rendered = false;
1351 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1352
1353#ifdef HAVE_BG_PIXMAP
1354
1355 if (term->bgPixmap.pixmap
1356 && !(bg >= 0 && term->pix_colors[bg].is_opaque ()))
1357 {
1358 Picture dst = XftDrawPicture (d2);
1359
1360 int src_x = x, src_y = y;
1361
1362 if (term->bgPixmap.is_parentOrigin ())
1363 {
1364 src_x += term->window_vt_x;
1365 src_y += term->window_vt_y;
1366 }
1367
1368 if (term->bgPixmap.pmap_width >= src_x+w
1369 && term->bgPixmap.pmap_height >= src_y+h)
1370 {
1371 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1372 src_x, src_y, w, h, 0, 0);
1373 }
1374 else
1375 {
1376 XGCValues gcv;
1377
1378 gcv.fill_style = FillTiled;
1379 gcv.tile = term->bgPixmap.pixmap;
1380 gcv.ts_x_origin = -src_x;
1381 gcv.ts_y_origin = -src_y;
1382
1383 XChangeGC (disp, gc,
1384 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1385 &gcv);
1386
1387 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1388
1389 gcv.fill_style = FillSolid;
1390 XChangeGC (disp, gc, GCFillStyle, &gcv);
1391 }
1392
1393 if (bg >= 0 && dst) // colour must be (and is) non-opaque here
1394 {
1395 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1396 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1397 }
1398
1399 back_rendered = true;
1400 }
1401#endif
1402
1403 if (!back_rendered)
1404 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h);
1405
1406 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1407 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1408 }
1293 else 1409 else
1294 { 1410 clear_rect (d, x, y, w, h, bg);
1295 FT_UInt gl = XftCharIndex (d.display->display, f, fc); 1411 }
1296 XftGlyphExtents (d.display->display, f, &gl, 1, &extents); 1412 else
1297
1298 if (extents.xOff != cwidth)
1299 {
1300 if (ewidth)
1301 {
1302 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1303 x, y + base, enc, ep - enc);
1304 x += ewidth;
1305
1306 ep = enc;
1307 ewidth = 0;
1308 }
1309
1310 if (extents.xOff > cwidth)
1311 extents.xOff = cwidth;
1312
1313 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1314 x + (cwidth - extents.xOff >> 1),
1315 y + base, &gl, 1);
1316 x += cwidth;
1317 }
1318 else
1319 {
1320 *ep++ = gl;
1321 ewidth += cwidth;
1322 }
1323 }
1324 } 1413 {
1325 1414 clear_rect (d, x, y, w, h, bg);
1326 if (ep != enc)
1327 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1415 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1328 x, y + base, enc, ep - enc); 1416 }
1329} 1417}
1418
1330#endif 1419#endif
1331 1420
1332///////////////////////////////////////////////////////////////////////////// 1421/////////////////////////////////////////////////////////////////////////////
1333 1422
1334rxvt_fontset::rxvt_fontset (rxvt_t r) 1423rxvt_fontset::rxvt_fontset (rxvt_term *term)
1335: fontdesc (0), r (r) 1424: fontdesc (0), term (term)
1336{ 1425{
1337 clear (); 1426 clear ();
1338} 1427}
1339 1428
1340rxvt_fontset::~rxvt_fontset () 1429rxvt_fontset::~rxvt_fontset ()
… …
1345void 1434void
1346rxvt_fontset::clear () 1435rxvt_fontset::clear ()
1347{ 1436{
1348 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1437 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1349 = rxvt_fontprop::unset; 1438 = rxvt_fontprop::unset;
1439 force_prop = false;
1350 1440
1351 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1441 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1352 FONT_UNREF (*i); 1442 FONT_UNREF (*i);
1353 1443
1354 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1444 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1363 1453
1364rxvt_font * 1454rxvt_font *
1365rxvt_fontset::new_font (const char *name, codeset cs) 1455rxvt_fontset::new_font (const char *name, codeset cs)
1366{ 1456{
1367 rxvt_font *f; 1457 rxvt_font *f;
1368 1458
1369 if (!name || !*name) 1459 if (!name || !*name)
1370 { 1460 {
1371 name = ""; 1461 name = "";
1372 f = new rxvt_font_default (this); 1462 f = new rxvt_font_default (this);
1373 } 1463 }
… …
1384 f = new rxvt_font_x11; 1474 f = new rxvt_font_x11;
1385 } 1475 }
1386 else 1476 else
1387 f = new rxvt_font_x11; 1477 f = new rxvt_font_x11;
1388 1478
1389 f->set_term (r); 1479 f->set_term (term);
1390 f->set_name (strdup (name)); 1480 f->set_name (strdup (name));
1391 1481
1392 f->cs = cs; 1482 f->cs = cs;
1393 f->loaded = false; 1483 f->loaded = false;
1394 1484
… …
1441 if (!end) 1531 if (!end)
1442 end = desc + strlen (desc); 1532 end = desc + strlen (desc);
1443 1533
1444 if (end - desc < 511) 1534 if (end - desc < 511)
1445 { 1535 {
1446 strncpy (buf, desc, end - desc); 1536 memcpy (buf, desc, end - desc);
1447 buf[end - desc] = 0; 1537 buf[end - desc] = 0;
1448 1538
1449 fonts.push_back (new_font (buf, cs)); 1539 fonts.push_back (new_font (buf, cs));
1450 } 1540 }
1451 else 1541 else
… …
1466 if (fonts[i]->loaded) 1556 if (fonts[i]->loaded)
1467 return true; 1557 return true;
1468 1558
1469 fonts[i]->loaded = true; 1559 fonts[i]->loaded = true;
1470 1560
1471 if (!fonts[i]->load (prop)) 1561 if (!fonts[i]->load (prop, force_prop))
1472 { 1562 {
1473 fonts[i]->cs = CS_UNKNOWN; 1563 fonts[i]->cs = CS_UNKNOWN;
1474 return false; 1564 return false;
1475 } 1565 }
1476 1566
… …
1577 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1667 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1578 FcPatternAddBool (p, FC_MINSPACE, 1); 1668 FcPatternAddBool (p, FC_MINSPACE, 1);
1579 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1669 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1580 1670
1581 XftResult result; 1671 XftResult result;
1582 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1672 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1583 1673
1584 FcPatternDestroy (p); 1674 FcPatternDestroy (p);
1585 1675
1586 if (match) 1676 if (match)
1587 { 1677 {
… …
1592 if (find_font (font) < 0) 1682 if (find_font (font) < 0)
1593 { 1683 {
1594 char fontname[4096]; 1684 char fontname[4096];
1595 sprintf (fontname, "xft:%-.4090s", font); 1685 sprintf (fontname, "xft:%-.4090s", font);
1596 1686
1597 fonts.push_back (new_font (fontname, CS_UNICODE)); 1687 fonts.push_back (new_font (fontname, CS_UNICODE));
1598 } 1688 }
1599 1689
1600 free (font); 1690 free (font);
1601 } 1691 }
1602#endif 1692#endif

Diff Legend

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