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.83 by root, Mon Jan 9 07:35:23 2006 UTC vs.
Revision 1.143 by root, Wed Jan 23 15:00:21 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 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 !r->option (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 { 362 {
363# include "table/linedraw.h"
361 uint16_t offs = linedraw_offs[t - 0x2500]; 364 uint16_t offs = linedraw_offs[t - 0x2500];
362 uint32_t *a = linedraw_command + (offs >> 4); 365 uint32_t *a = linedraw_command + (offs >> 4);
363 uint32_t *b = a + (offs & 15); 366 uint32_t *b = a + (offs & 15);
364 367
365 int W = fwidth; 368 int W = fwidth;
366 int H = r->fheight; 369 int H = term->fheight;
367 370
368 int x_[16]; 371 int x_[16];
369 int y_[16]; 372 int y_[16];
370 373
371 for (int i = 0; i <= 8; i++) 374 for (int i = 0; i <= 8; i++)
… …
379 382
380 XGCValues gcv; 383 XGCValues gcv;
381 384
382 gcv.cap_style = CapButt; 385 gcv.cap_style = CapButt;
383 gcv.line_width = 0; 386 gcv.line_width = 0;
384 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 387 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
385 388
386 while (a < b) 389 while (a < b)
387 { 390 {
388 uint32_t command = *a++; 391 uint32_t command = *a++;
389 392
… …
396 int y2 = y_[(command >> 0) & 15]; 399 int y2 = y_[(command >> 0) & 15];
397 400
398 switch (op) 401 switch (op)
399 { 402 {
400 case 0: // line 403 case 0: // line
401 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 404 XDrawLine (disp, d, gc, x1, y1, x2, y2);
402 break; 405 break;
403 406
404 case 1: // rectangle, possibly stippled 407 case 1: // rectangle, possibly stippled
405 if (a) 408 if (a)
406 { 409 {
407 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 410 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
408 411
409 gcv.fill_style = FillStippled; 412 gcv.fill_style = FillStippled;
410 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 413 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
411 gcv.ts_x_origin = x; 414 gcv.ts_x_origin = x;
412 gcv.ts_y_origin = y; 415 gcv.ts_y_origin = y;
413 416
414 XChangeGC (disp, TGC, 417 XChangeGC (disp, gc,
415 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 418 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
416 &gcv); 419 &gcv);
417 } 420 }
418 421
419 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);
420 423
421 if (a) 424 if (a)
422 { 425 {
423 XFreePixmap (disp, gcv.stipple); 426 XFreePixmap (disp, gcv.stipple);
424 gcv.stipple = 0; 427 gcv.stipple = 0;
425 gcv.fill_style = FillSolid; 428 gcv.fill_style = FillSolid;
426 XChangeGC (disp, TGC, GCFillStyle, &gcv); 429 XChangeGC (disp, gc, GCFillStyle, &gcv);
427 } 430 }
428 break; 431 break;
429 case 2: // arc 432 case 2: // arc
430 XDrawArc (disp, d, TGC, 433 XDrawArc (disp, d, gc,
431 x1 - W/2, y1 - H/2, W-1, H-1, 434 x1 - W/2, y1 - H/2, W-1, H-1,
432 (a - 1) * 90*64, (b - 1) * 90*64); 435 (a - 1) * 90*64, (b - 1) * 90*64);
433 break; 436 break;
434 } 437 }
435 } 438 }
436 } 439 }
440#else
441 if (0)
442 ;
443#endif
437#if ENABLE_COMBINING 444#if ENABLE_COMBINING
438 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
439 { 446 {
447 min_it (width, 2); // we only support wcwidth up to 2
448
440 text_t chrs[2]; 449 text_t chrs[2];
441 width = min (2, width);
442 chrs [1] = NOCHAR; 450 chrs [1] = NOCHAR;
443 451
444 *chrs = cc->c1; 452 *chrs = cc->c1;
445 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 453 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
446 f1->draw (d, x, y, chrs, width, fg, bg); 454 f1->draw (d, x, y, chrs, width, fg, bg);
… …
453 *chrs = cc->c2; 461 *chrs = cc->c2;
454 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
455 ? f1 463 ? f1
456 : (*fs)[fs->find_font (cc->c2)]; 464 : (*fs)[fs->find_font (cc->c2)];
457 465
458 f2->draw (d, x, y, chrs, width, fg, -1); 466 f2->draw (d, x, y, chrs, width, fg, Color_none);
459 } 467 }
460 } 468 }
461#endif 469#endif
462 else 470 else
463 switch (t) 471 switch (t)
… …
466 case ZERO_WIDTH_CHAR: 474 case ZERO_WIDTH_CHAR:
467 case NOCHAR: 475 case NOCHAR:
468 break; 476 break;
469 477
470 default: 478 default:
471 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 479 XDrawRectangle (disp, d, gc, x + 2, y + 2,
472 fwidth - 4, r->fheight - 4); 480 fwidth - 4, term->fheight - 4);
473 } 481 }
474 482
475 x += fwidth; 483 x += fwidth;
476 } 484 }
477} 485}
… …
483 491
484 void clear (); 492 void clear ();
485 493
486 rxvt_fontprop properties (); 494 rxvt_fontprop properties ();
487 495
488 bool load (const rxvt_fontprop &prop); 496 bool load (const rxvt_fontprop &prop, bool force_prop);
489 497
490 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;
491 499
492 void draw (rxvt_drawable &d, int x, int y, 500 void draw (rxvt_drawable &d, int x, int y,
493 const text_t *text, int len, 501 const text_t *text, int len,
494 int fg, int bg); 502 int fg, int bg);
495 503
496 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
497 XFontStruct *f; 505 XFontStruct *f;
498 codeset cs;
499 bool enc2b, encm; 506 bool enc2b, encm;
500 507
501 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 508 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); 509 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); 510 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
504 bool set_properties (rxvt_fontprop &p, const char *name); 511 bool set_properties (rxvt_fontprop &p, const char *name);
505}; 512};
506 513
507char * 514char *
508rxvt_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
509{ 516{
510 unsigned long value; 517 unsigned long value;
511 518
512 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 519 if (XGetFontProperty (f, property, &value))
513 return XGetAtomName (DISPLAY, value); 520 return XGetAtomName (term->dpy, value);
514 else 521 else
515 return rxvt_strdup (repl); 522 return repl ? strdup (repl) : 0;
516} 523}
517 524
518rxvt_fontprop 525rxvt_fontprop
519rxvt_font_x11::properties () 526rxvt_font_x11::properties ()
520{ 527{
… …
524} 531}
525 532
526bool 533bool
527rxvt_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)
528{ 535{
529 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;
530 p.height = height; 539 p.height = height;
531 p.ascent = rxvt_fontprop::unset; 540 p.ascent = rxvt_fontprop::unset;
532 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;
533 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;
534 543
… …
539rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 548rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
540{ 549{
541 unsigned long height; 550 unsigned long height;
542 551
543#if 0 552#if 0
544 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 553 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
545 return false; 554 return false;
546#else 555#else
547 height = f->ascent + f->descent; 556 height = f->ascent + f->descent;
548#endif 557#endif
549 558
550 unsigned long avgwidth; 559 unsigned long avgwidth;
551 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 560 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
552 avgwidth = 0; 561 avgwidth = 0;
553 562
554 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 563 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
555 char *slant = get_property (f, "SLANT", "r"); 564 char *slant = get_property (f, term->xa [XA_SLANT], "r");
556 565
557 set_properties (p, height, weight, slant, avgwidth); 566 set_properties (p, height, weight, slant, avgwidth);
558 567
559 free (weight); 568 free (weight);
560 free (slant); 569 free (slant);
… …
565} 574}
566 575
567bool 576bool
568rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 577rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
569{ 578{
579 dTermDisplay;
570 int slashes = 0; 580 int slashes = 0;
571 const char *comp[13]; 581 const char *comp[13];
572 582
573 for (const char *c = name; *c; c++) 583 for (const char *c = name; *c; c++)
574 if (*c == '-') 584 if (*c == '-')
… …
582 if (slashes >= 13 592 if (slashes >= 13
583 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 593 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
584 && (*comp[11] >= '0' && *comp[11] <= '9')) 594 && (*comp[11] >= '0' && *comp[11] <= '9'))
585 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]));
586 596
587 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 597 XFontStruct *f = XLoadQueryFont (disp, name);
588 598
589 if (f) 599 if (f)
590 { 600 {
591 // 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
592 // (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).
593 // in that case, just return garbage. 603 // in that case, just return garbage.
594 bool ret = set_properties (p, f); 604 bool ret = set_properties (p, f);
595 XFreeFont (DISPLAY, f); 605 XFreeFont (disp, f);
596 return ret; 606 return ret;
597 } 607 }
598 else 608 else
599 return false; 609 return false;
600} 610}
601 611
602// fix the size of scalable fonts 612// fix the size of scalable fonts
603static bool 613static bool
604replace_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)
605{ 615{
606 int slashes = 0; 616 int slashes = 0;
607 const char *field, *end; 617 const char *field, *end;
608 618
609 for (const char *c = name; *c; c++) 619 for (const char *c = name; *c; c++)
… …
619 break; 629 break;
620 } 630 }
621 631
622 if (slashes >= 13 && (!old || *field == old)) 632 if (slashes >= 13 && (!old || *field == old))
623 { 633 {
624 // TODO: check for overflow in font-name 634 size_t len = field - name;
625 strncpy (buf, name, field - name); 635 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
626 buf += field - name; 636 memcpy (*ptr, name, len);
627 strcpy (buf, replace); 637 strcpy (*ptr + len, replace);
628 strcat (buf, end); 638 strcat (*ptr, end);
629 639
630 return true; 640 return true;
631 } 641 }
632 else 642 else
633 { 643 {
634 strcpy (buf, name); 644 *ptr = strdup (name);
635 645
636 return false; 646 return false;
637 } 647 }
638} 648}
639 649
640bool 650bool
641rxvt_font_x11::load (const rxvt_fontprop &prop) 651rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
642{ 652{
643 Display *disp = DISPLAY; 653 dTermDisplay;
644 654
645 clear (); 655 clear ();
646 656
647 char field_str[64]; // enough for 128 bits 657 char field_str[64]; // enough for 128 bits
648 658
649 // first morph the font if required 659 // first morph the font if required
650 if (prop.weight != rxvt_fontprop::unset 660 if (force_prop)
651 || prop.slant != rxvt_fontprop::unset)
652 { 661 {
653 char fname[1024]; 662 char *fname;
654 663
655 if (name[0] != '-') 664 if (name[0] != '-')
656 { 665 {
657 f = XLoadQueryFont (disp, name); 666 f = XLoadQueryFont (disp, name);
658 667
659 if (!f) 668 if (!f)
660 return false; 669 return false;
661 670
662 char *new_name = get_property (f, "FONT", name); 671 char *new_name = get_property (f, XA_FONT, name);
663 672
664 if (new_name) 673 if (new_name)
665 set_name (new_name); 674 set_name (new_name);
666 else 675 else
667 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
670 f = 0; 679 f = 0;
671 } 680 }
672 681
673 if (prop.weight != rxvt_fontprop::unset) 682 if (prop.weight != rxvt_fontprop::unset)
674 { 683 {
675 replace_field (fname, name, 2, 0, 684 replace_field (&fname, name, 2, 0,
676 prop.weight < rxvt_fontprop::bold 685 prop.weight < rxvt_fontprop::bold
677 ? "medium" : "bold"); 686 ? "medium" : "bold");
678 set_name (strdup (fname)); 687 set_name (fname);
679 } 688 }
680 689
681 if (prop.slant != rxvt_fontprop::unset) 690 if (prop.slant != rxvt_fontprop::unset)
682 { 691 {
683 replace_field (fname, name, 3, 0, 692 replace_field (&fname, name, 3, 0,
684 prop.slant < rxvt_fontprop::italic 693 prop.slant < rxvt_fontprop::italic
685 ? "r" : "i"); // TODO: handle "o"blique, too 694 ? "r" : "i"); // TODO: handle "o"blique, too
686 set_name (strdup (fname)); 695 set_name (fname);
687 } 696 }
688 } 697 }
689 698
690 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 699 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
691 ? 0 : prop.height); 700 ? 0 : prop.height);
… …
716 font_weight *fonts = new font_weight[count]; 725 font_weight *fonts = new font_weight[count];
717 726
718 for (int i = 0; i < count; i++) 727 for (int i = 0; i < count; i++)
719 { 728 {
720 rxvt_fontprop p; 729 rxvt_fontprop p;
721 char fname[1024]; 730 char *fname;
722 731
723 int diff = 0; 732 int diff = 0;
724 733
725 if (replace_field (fname, list[i], 6, '0', field_str)) 734 if (replace_field (&fname, list[i], 6, '0', field_str))
726 diff += 10; // slightly penalize scalable fonts 735 diff += 10; // slightly penalize scalable fonts
736 else
737 {
738 free (fname);
727 else if (replace_field (fname, list[i], 11, '0', "0")) 739 if (replace_field (&fname, list[i], 11, '0', "0"))
728 diff += 300; // more heavily penalize what looks like scaled bitmap fotns 740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 }
729 742
730 if (!set_properties (p, fname)) 743 if (!set_properties (p, fname))
731 continue; 744 continue;
732 745
733 if (prop.height != rxvt_fontprop::unset 746 if (prop.height != rxvt_fontprop::unset
… …
737 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;
738 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);
739 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);
740 //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);
741 754
742 fonts[i].name = strdup (fname); 755 fonts[i].name = fname;
743 fonts[i].diff = diff; 756 fonts[i].diff = diff;
744 } 757 }
745 758
746 XFreeFontNames (list); 759 XFreeFontNames (list);
747 760
… …
776 delete [] fonts; 789 delete [] fonts;
777 790
778 if (!f) 791 if (!f)
779 return false; 792 return false;
780 793
781 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
782 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
783 796
784 if (registry && encoding) 797 if (registry && encoding)
785 { 798 {
786 char charset[64]; 799 char charset[64];
787 snprintf (charset, 64, "%s-%s", registry, encoding); 800 snprintf (charset, 64, "%s-%s", registry, encoding);
788 801
789 cs = codeset_from_name (charset); 802 cs = codeset_from_name (charset);
790 } 803 }
791 else 804 else
792 { 805 {
793 const char *charset = get_property (f, "FONT", 0); 806 const char *charset = get_property (f, XA_FONT, 0);
794 807
795 if (!charset) 808 if (!charset)
796 charset = name; 809 charset = name;
797 810
798 int count = 13; 811 int count = 13;
… …
813 enc2b = encm || f->max_char_or_byte2 > 255; 826 enc2b = encm || f->max_char_or_byte2 > 255;
814 827
815 slow = false; 828 slow = false;
816 829
817#if 1 // only used for slow detection, TODO optimize 830#if 1 // only used for slow detection, TODO optimize
818 if (f->min_bounds.width == f->max_bounds.width) 831 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; 832 width = f->max_bounds.width;
822 else 833 else
823 { 834 {
824 slow = true; 835 slow = true;
825 836
826 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;
827 838
828 if (encm) 839 if (encm)
829 N += (f->max_byte1 - f->min_byte1) 840 N += (f->max_byte1 - f->min_byte1)
830 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 841 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
831 842
832 while (N) 843 while (N)
833 { 844 {
834 if (f->per_char[N].width > width) 845 if (f->per_char[N].width > width)
835 width = f->per_char[N].width; 846 width = f->per_char[N].width;
836 847
… …
841 852
842 width = 1; 853 width = 1;
843 854
844 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; )
845 { 856 {
846 if (cs != CS_UNICODE
847 && *t > 0x100
848 && FROM_UNICODE (cs, *t) == NOCHAR) 857 if (FROM_UNICODE (cs, *t) == NOCHAR)
849 continue; 858 continue;
850 859
851 // ignore characters we wouldn't use anyways 860 // ignore characters we wouldn't use anyways
852 bool careful; 861 bool careful;
853 if (!has_char (*t, &prop, careful)) 862 if (!has_char (*t, &prop, careful))
… …
857 866
858 XCharStruct g; 867 XCharStruct g;
859 int dir_ret, asc_ret, des_ret; 868 int dir_ret, asc_ret, des_ret;
860 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 869 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
861 870
871 int wcw = WCWIDTH (*t);
862 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;
863 873
864 if (width < g.width) width = g.width; 874 if (width < g.width) width = g.width;
865 } 875 }
866 876
867 if (cs == CS_UNKNOWN) 877 if (cs == CS_UNKNOWN)
868 { 878 {
869 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 879 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
886void 896void
887rxvt_font_x11::clear () 897rxvt_font_x11::clear ()
888{ 898{
889 if (f) 899 if (f)
890 { 900 {
891 XFreeFont (DISPLAY, f); 901 XFreeFont (term->dpy, f);
892 f = 0; 902 f = 0;
893 } 903 }
894} 904}
895 905
896bool 906bool
897rxvt_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
898{ 908{
899 uint32_t ch = FROM_UNICODE (cs, unicode); 909 uint32_t ch = FROM_UNICODE (cs, unicode);
900 910
901 if (ch == NOCHAR) 911 if (ch == NOCHAR)
902 return false; 912 return false;
… …
939 return false; 949 return false;
940 950
941 if (!prop || prop->width == rxvt_fontprop::unset) 951 if (!prop || prop->width == rxvt_fontprop::unset)
942 return true; 952 return true;
943 953
944 // check character against base font bounding box 954 // check wether character overlaps previous/next character
945 int w = xcs->width; 955 int w = xcs->rbearing - xcs->lbearing;
946 int wcw = wcwidth (unicode); 956 int wcw = max (WCWIDTH (unicode), 1);
947 if (wcw > 0) w = (w + wcw - 1) / wcw;
948 957
949 careful = w > prop->width; 958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
950 if (careful && w > prop->width * MAX_OVERLAP >> 2) 959
960 if (careful && !OVERLAP_OK (w, wcw, prop))
951 return false; 961 return false;
952 962
953 return true; 963 return true;
954} 964}
955 965
… …
961 // this looks like a mess /. 971 // this looks like a mess /.
962 // and it is a mess /. 972 // and it is a mess /.
963 // yet we are trying to be perfect /. 973 // yet we are trying to be perfect /.
964 // but the result still isn't perfect /. 974 // but the result still isn't perfect /.
965 975
976 dTermDisplay;
977 dTermGC;
978
966 bool slow = this->slow 979 bool slow = this->slow
967 || width != r->fwidth 980 || width != term->fwidth
968 || height != r->fheight; 981 || height != term->fheight;
969 982
970 int base = ascent; // sorry, incorrect: r->fbase; 983 int base = ascent; // sorry, incorrect: term->fbase;
971 984
972 XGCValues v; 985 XGCValues v;
973 v.foreground = r->pix_colors[fg]; 986 v.foreground = term->pix_colors[fg];
974 v.font = f->fid; 987 v.font = f->fid;
975 988
976 if (enc2b) 989 if (enc2b)
977 { 990 {
978 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 991 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
979 992
980 if (bg == Color_bg && !slow) 993 if (bg == Color_bg && !slow)
981 { 994 {
982 v.background = r->pix_colors[bg]; 995 v.background = term->pix_colors[bg];
983 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 996 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
984 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 997 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
985 } 998 }
986 else 999 else
987 { 1000 {
988 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1001 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
989 1002
990 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1003 XChangeGC (disp, gc, GCForeground | GCFont, &v);
991 1004
992 if (slow) 1005 if (slow)
993 { 1006 {
994 do 1007 do
995 { 1008 {
996 if (xc->byte1 || xc->byte2) 1009 if (xc->byte1 || xc->byte2)
997 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1010 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
998 1011
999 x += r->fwidth; 1012 x += term->fwidth;
1000 xc++; len--; 1013 xc++; len--;
1001 } 1014 }
1002 while (len); 1015 while (len);
1003 } 1016 }
1004 else 1017 else
1005 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1018 XDrawString16 (disp, d, gc, x, y + base, xc, len);
1006 } 1019 }
1007 } 1020 }
1008 else 1021 else
1009 { 1022 {
1010 const char *xc = enc_char (text, len, cs, slow); 1023 const char *xc = enc_char (text, len, cs, slow);
1011 1024
1012 if (bg == Color_bg && !slow) 1025 if (bg == Color_bg && !slow)
1013 { 1026 {
1014 v.background = r->pix_colors[bg]; 1027 v.background = term->pix_colors[bg];
1015 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1028 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1016 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1029 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1017 } 1030 }
1018 else 1031 else
1019 { 1032 {
1020 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1033 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1021 1034
1022 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1035 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1023 1036
1024 if (slow) 1037 if (slow)
1025 { 1038 {
1026 do 1039 do
1027 { 1040 {
1028 if (*xc) 1041 if (*xc)
1029 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1042 XDrawString (disp, d, gc, x, y + base, xc, 1);
1030 1043
1031 x += r->fwidth; 1044 x += term->fwidth;
1032 xc++; len--; 1045 xc++; len--;
1033 } 1046 }
1034 while (len); 1047 while (len);
1035 } 1048 }
1036 else 1049 else
1037 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1050 XDrawString (disp, d, gc, x, y + base, xc, len);
1038 } 1051 }
1039 } 1052 }
1040} 1053}
1041 1054
1042///////////////////////////////////////////////////////////////////////////// 1055/////////////////////////////////////////////////////////////////////////////
… …
1048 1061
1049 void clear (); 1062 void clear ();
1050 1063
1051 rxvt_fontprop properties (); 1064 rxvt_fontprop properties ();
1052 1065
1053 bool load (const rxvt_fontprop &prop); 1066 bool load (const rxvt_fontprop &prop, bool force_prop);
1054 1067
1055 void draw (rxvt_drawable &d, int x, int y, 1068 void draw (rxvt_drawable &d, int x, int y,
1056 const text_t *text, int len, 1069 const text_t *text, int len,
1057 int fg, int bg); 1070 int fg, int bg);
1058 1071
1059 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;
1060 1073
1061protected: 1074protected:
1062 XftFont *f; 1075 XftFont *f;
1063}; 1076};
1064 1077
1065void 1078void
1066rxvt_font_xft::clear () 1079rxvt_font_xft::clear ()
1067{ 1080{
1068 if (f) 1081 if (f)
1069 { 1082 {
1070 XftFontClose (DISPLAY, f); 1083 XftFontClose (term->dpy, f);
1071 f = 0; 1084 f = 0;
1072 } 1085 }
1073} 1086}
1074 1087
1075rxvt_fontprop 1088rxvt_fontprop
… …
1091 1104
1092 return p; 1105 return p;
1093} 1106}
1094 1107
1095bool 1108bool
1096rxvt_font_xft::load (const rxvt_fontprop &prop) 1109rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1097{ 1110{
1098 Display *disp = DISPLAY; 1111 dTermDisplay;
1099 1112
1100 clear (); 1113 clear ();
1101 1114
1102 FcPattern *p = FcNameParse ((FcChar8 *) name); 1115 FcPattern *p = FcNameParse ((FcChar8 *) name);
1103 1116
… …
1110 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1123 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1111 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1124 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1112 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1125 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1113 1126
1114 if (prop.weight != rxvt_fontprop::unset 1127 if (prop.weight != rxvt_fontprop::unset
1115 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1128 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1116 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1129 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1117 1130
1118 if (prop.slant != rxvt_fontprop::unset 1131 if (prop.slant != rxvt_fontprop::unset
1119 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1132 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1120 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1133 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1121 1134
1122#if 0 // clipping unfortunately destroys our precious double-width-characters 1135#if 0 // clipping unfortunately destroys our precious double-width-characters
1123 // clip width, we can't do better, or can we? 1136 // clip width, we can't do better, or can we?
1124 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1130 1143
1131 // store generated name so iso14755 view gives better results 1144 // store generated name so iso14755 view gives better results
1132 set_name ((char *)FcNameUnparse (p)); 1145 set_name ((char *)FcNameUnparse (p));
1133 1146
1134 XftResult result; 1147 XftResult result;
1135 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1148 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1136 1149
1137 FcPatternDestroy (p); 1150 FcPatternDestroy (p);
1138 1151
1139 if (!match) 1152 if (!match)
1140 return false; 1153 return false;
… …
1182 XGlyphInfo g; 1195 XGlyphInfo g;
1183 XftTextExtents16 (disp, f, &ch, 1, &g); 1196 XftTextExtents16 (disp, f, &ch, 1, &g);
1184 1197
1185 g.width -= g.x; 1198 g.width -= g.x;
1186 1199
1187 int wcw = wcwidth (ch); 1200 int wcw = WCWIDTH (ch);
1188 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1201 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1189 1202
1190 if (width < g.width ) width = g.width; 1203 if (width < g.width ) width = g.width;
1191 if (height < g.height ) height = g.height; 1204 if (height < g.height ) height = g.height;
1192 if (glheight < g.height - g.y) glheight = g.height - g.y; 1205 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1238 1251
1239 return success; 1252 return success;
1240} 1253}
1241 1254
1242bool 1255bool
1243rxvt_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
1244{ 1257{
1245 careful = false; 1258 careful = false;
1246 1259
1247 if (!XftCharExists (DISPLAY, f, unicode)) 1260 if (!XftCharExists (term->dpy, f, unicode))
1248 return false; 1261 return false;
1249 1262
1250 if (!prop || prop->width == rxvt_fontprop::unset) 1263 if (!prop || prop->width == rxvt_fontprop::unset)
1251 return true; 1264 return true;
1252 1265
1253 // check character against base font bounding box 1266 // check character against base font bounding box
1254 FcChar32 ch = unicode; 1267 FcChar32 ch = unicode;
1255 XGlyphInfo g; 1268 XGlyphInfo g;
1256 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1269 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1257 1270
1258 int w = g.width - g.x; 1271 int w = g.width - g.x;
1259 int wcw = wcwidth (unicode); 1272 int wcw = max (WCWIDTH (unicode), 1);
1260 if (wcw > 0) w = (w + wcw - 1) / wcw;
1261 1273
1262 careful = w > prop->width; 1274 careful = g.x > 0 || w > prop->width * wcw;
1263 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))
1264 return false; 1281 return false;
1265 1282
1266 return true; 1283 return true;
1267} 1284}
1268 1285
… …
1270rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1271 const text_t *text, int len, 1288 const text_t *text, int len,
1272 int fg, int bg) 1289 int fg, int bg)
1273{ 1290{
1274 XGlyphInfo extents; 1291 XGlyphInfo extents;
1275 XftGlyphSpec *enc = (XftGlyphSpec *)get_enc_buf (len * sizeof (XftGlyphSpec)); 1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1276 XftGlyphSpec *ep = enc; 1293 XftGlyphSpec *ep = enc;
1277 1294
1278 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 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
1279 1309
1280 // cut trailing spaces 1310 // cut trailing spaces
1281 while (len && text [len - 1] == ' ') 1311 while (len && text [len - 1] == ' ')
1282 len--; 1312 len--;
1283 1313
1314 int x_ = buffered ? 0 : x;
1315 int y_ = buffered ? 0 : y;
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;
1291 1324
1292 if (fc != ' ') // skip spaces 1325 if (fc != ' ') // skip spaces
1293 { 1326 {
1294 FT_UInt glyph = XftCharIndex (d.display->display, f, fc); 1327 FT_UInt glyph = XftCharIndex (disp, f, fc);
1295 XftGlyphExtents (d.display->display, f, &glyph, 1, &extents); 1328 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1296 1329
1297 ep->glyph = glyph; 1330 ep->glyph = glyph;
1298 ep->x = x + (cwidth - extents.xOff >> 1); 1331 ep->x = x_ + (cwidth - extents.xOff >> 1);
1299 ep->y = y + ascent; 1332 ep->y = y_ + ascent;
1333
1334 if (extents.xOff == 0)
1335 ep->x = x_ + cwidth;
1336
1300 ep++; 1337 ep++;
1301 } 1338 }
1302 1339
1303 x += cwidth; 1340 x_ += cwidth;
1341 }
1342
1343 if (buffered)
1304 } 1344 {
1305
1306 if (ep != enc) 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;
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))))))
1355 {
1356 int src_x = x, src_y = y;
1357
1358 if (term->bgPixmap.is_parentOrigin ())
1359 {
1360 src_x += term->window_vt_x;
1361 src_y += term->window_vt_y;
1362 }
1363
1364 if (term->bgPixmap.pmap_width >= src_x + w
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;
1373
1374 gcv.fill_style = FillTiled;
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,
1381 &gcv);
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 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1394 }
1395 }
1396 else
1397#endif
1398 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1399
1400 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1401 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1402 }
1403 else
1404 clear_rect (d, x, y, w, h, bg);
1405 }
1406 else
1407 {
1408 clear_rect (d, x, y, w, h, bg);
1307 XftDrawGlyphSpec (d, &r->pix_colors[fg].c, f, enc, ep - enc); 1409 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1410 }
1308} 1411}
1412
1309#endif 1413#endif
1310 1414
1311///////////////////////////////////////////////////////////////////////////// 1415/////////////////////////////////////////////////////////////////////////////
1312 1416
1313rxvt_fontset::rxvt_fontset (rxvt_t r) 1417rxvt_fontset::rxvt_fontset (rxvt_term *term)
1314: fontdesc (0), r (r) 1418: fontdesc (0), term (term)
1315{ 1419{
1316 clear (); 1420 clear ();
1317} 1421}
1318 1422
1319rxvt_fontset::~rxvt_fontset () 1423rxvt_fontset::~rxvt_fontset ()
… …
1324void 1428void
1325rxvt_fontset::clear () 1429rxvt_fontset::clear ()
1326{ 1430{
1327 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1431 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1328 = rxvt_fontprop::unset; 1432 = rxvt_fontprop::unset;
1433 force_prop = false;
1329 1434
1330 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1435 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1331 FONT_UNREF (*i); 1436 FONT_UNREF (*i);
1332 1437
1333 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1438 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1342 1447
1343rxvt_font * 1448rxvt_font *
1344rxvt_fontset::new_font (const char *name, codeset cs) 1449rxvt_fontset::new_font (const char *name, codeset cs)
1345{ 1450{
1346 rxvt_font *f; 1451 rxvt_font *f;
1347 1452
1348 if (!name || !*name) 1453 if (!name || !*name)
1349 { 1454 {
1350 name = ""; 1455 name = "";
1351 f = new rxvt_font_default (this); 1456 f = new rxvt_font_default (this);
1352 } 1457 }
… …
1363 f = new rxvt_font_x11; 1468 f = new rxvt_font_x11;
1364 } 1469 }
1365 else 1470 else
1366 f = new rxvt_font_x11; 1471 f = new rxvt_font_x11;
1367 1472
1368 f->set_term (r); 1473 f->set_term (term);
1369 f->set_name (strdup (name)); 1474 f->set_name (strdup (name));
1370 1475
1371 f->cs = cs; 1476 f->cs = cs;
1372 f->loaded = false; 1477 f->loaded = false;
1373 1478
… …
1420 if (!end) 1525 if (!end)
1421 end = desc + strlen (desc); 1526 end = desc + strlen (desc);
1422 1527
1423 if (end - desc < 511) 1528 if (end - desc < 511)
1424 { 1529 {
1425 strncpy (buf, desc, end - desc); 1530 memcpy (buf, desc, end - desc);
1426 buf[end - desc] = 0; 1531 buf[end - desc] = 0;
1427 1532
1428 fonts.push_back (new_font (buf, cs)); 1533 fonts.push_back (new_font (buf, cs));
1429 } 1534 }
1430 else 1535 else
… …
1445 if (fonts[i]->loaded) 1550 if (fonts[i]->loaded)
1446 return true; 1551 return true;
1447 1552
1448 fonts[i]->loaded = true; 1553 fonts[i]->loaded = true;
1449 1554
1450 if (!fonts[i]->load (prop)) 1555 if (!fonts[i]->load (prop, force_prop))
1451 { 1556 {
1452 fonts[i]->cs = CS_UNKNOWN; 1557 fonts[i]->cs = CS_UNKNOWN;
1453 return false; 1558 return false;
1454 } 1559 }
1455 1560
… …
1556 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1661 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1557 FcPatternAddBool (p, FC_MINSPACE, 1); 1662 FcPatternAddBool (p, FC_MINSPACE, 1);
1558 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1663 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1559 1664
1560 XftResult result; 1665 XftResult result;
1561 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1666 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1562 1667
1563 FcPatternDestroy (p); 1668 FcPatternDestroy (p);
1564 1669
1565 if (match) 1670 if (match)
1566 { 1671 {
… …
1571 if (find_font (font) < 0) 1676 if (find_font (font) < 0)
1572 { 1677 {
1573 char fontname[4096]; 1678 char fontname[4096];
1574 sprintf (fontname, "xft:%-.4090s", font); 1679 sprintf (fontname, "xft:%-.4090s", font);
1575 1680
1576 fonts.push_back (new_font (fontname, CS_UNICODE)); 1681 fonts.push_back (new_font (fontname, CS_UNICODE));
1577 } 1682 }
1578 1683
1579 free (font); 1684 free (font);
1580 } 1685 }
1581#endif 1686#endif

Diff Legend

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