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.77 by root, Wed Jan 4 20:43:38 2006 UTC vs.
Revision 1.123 by ayin, Sat Nov 24 10:32:33 2007 UTC

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

Diff Legend

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