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.64 by root, Tue Jan 11 05:45:57 2005 UTC vs.
Revision 1.142 by root, Wed Jan 23 14:54:52 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: defaultfont.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
… …
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 15 * GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 "rxvtutil.h" 24#include "rxvtutil.h"
25#include "rxvtfont.h" 25#include "rxvtfont.h"
26 26
27#include <cstdlib> 27#include <cstdlib>
28#include <wchar.h> 28
29#include <inttypes.h> 29#include <inttypes.h>
30 30
31#define DISPLAY r->display->display
32#define TGC r->TermWin.gc
33
34#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 ))
35 39
36const struct rxvt_fallback_font { 40const struct rxvt_fallback_font {
37 codeset cs; 41 codeset cs;
38 const char *name; 42 const char *name;
39} fallback_fonts[] = { 43} fallback_fonts[] = {
40 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 44 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
41 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 45 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
42 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
43 47
44#if ENCODING_EU 48#if ENCODING_EU
45 // cyrillic 49 // cyrillic
46 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 50 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
47 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 51 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
48 52
49 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 53 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
50 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 54 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
51 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 55 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
52 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 56 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
53 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 57 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
59 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 63 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
60 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 64 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
61 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 65 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
62 66
63# if XFT 67# if XFT
64 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 68 { CS_KOI8_U, "xft::lang=ru" },
65 69
66 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 70 { CS_ISO8859_5, "xft::lang=ru" },
67 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 71 { CS_ISO8859_6, "xft::lang=ar" },
68 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 72 { CS_ISO8859_7, "xft::lang=el" },
69 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 73 { CS_ISO8859_8, "xft::lang=he" },
70 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 74 { CS_ISO8859_9, "xft::lang=tr" },
71 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 75 { CS_ISO8859_10, "xft::lang=se" },
72 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 76 { CS_ISO8859_11, "xft::lang=th" },
73# endif 77# endif
74#endif 78#endif
75 79
76 // japanese 80 // japanese
77#if ENCODING_JP || ENCODING_JP_EXT 81#if ENCODING_JP || ENCODING_JP_EXT
78# if XFT 82# if XFT
79 // prefer xft for complex scripts 83 // prefer xft for complex scripts
80 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 84 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
81 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, 85 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
82 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 86 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
83 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 87 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
84# endif 88# endif
85 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 89 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
86 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 90 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
87 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 91 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
88 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 92 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
… …
92 96
93#if ENCODING_ZH || ENCODING_ZH_EXT 97#if ENCODING_ZH || ENCODING_ZH_EXT
94# if XFT 98# if XFT
95 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 99 { CS_GBK_0, "xft:AR PL KaitiM GB" },
96 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 100 { CS_GBK_0, "xft:AR PL SungtiL GB" },
97 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 101 { CS_GBK_0, "xft::lang=zh" },
98 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 102 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
99 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
100 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 104 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
101 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
102 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 106 { CS_GB2312_1980_0, "xft::lang=zh" },
103# endif 107# endif
104 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 108 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
105 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 109 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
106 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 110 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
107 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 111 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
120#if ENCODING_KR 124#if ENCODING_KR
121 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 125 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
122 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 126 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
123# if XFT 127# if XFT
124 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 128 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
125 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
126# endif 130# endif
127#endif 131#endif
128 132
129 // generic font fallback
130 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 133 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
131 { 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.
132 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
133 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
134#if XFT 135#if XFT
135 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"}, 136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
136 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 137 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Andale Mono:antialias=false" }, 138 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
138 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, 139 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
139 140
140 // FreeMono is usually uglier than x fonts, so try last only. 141 // FreeMono is usually uglier than x fonts, so try after the others
141 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 142 { CS_UNICODE, "xft:FreeMono:autohint=true" },
142#endif 143#endif
143 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" },
144 { CS_UNKNOWN, 0 } 149 { CS_UNKNOWN, 0 }
145}; 150};
146 151
147// these characters are used to guess the font height and width 152// these characters are used to guess the font height and width
148// 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.
… …
152 0x304c, 0x672c, // が本 157 0x304c, 0x672c, // が本
153}; 158};
154 159
155#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]))
156 161
162#define dTermDisplay Display *disp = term->dpy
163#define dTermGC GC gc = term->gc
164
157///////////////////////////////////////////////////////////////////////////// 165/////////////////////////////////////////////////////////////////////////////
158
159#if XFT
160rxvt_drawable::~rxvt_drawable ()
161{
162 if (xftdrawable)
163 XftDrawDestroy (xftdrawable);
164}
165
166rxvt_drawable::operator XftDraw *()
167{
168 if (!xftdrawable)
169 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
170
171 return xftdrawable;
172}
173#endif
174
175/////////////////////////////////////////////////////////////////////////////
176
177static void *enc_buf;
178static uint32_t enc_len;
179
180static inline void *
181get_enc_buf (uint32_t len)
182{
183 if (len > enc_len)
184 {
185 free (enc_buf);
186 enc_buf = malloc (len);
187 enc_len = len;
188 }
189
190 return enc_buf;
191}
192 166
193static const char * 167static const char *
194enc_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)
195{ 169{
196 uint8_t *buf = (uint8_t *)get_enc_buf (len); 170 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
171 uint8_t *res = buf;
197 172
198 while (len--) 173 while (len--)
199 { 174 {
200 uint32_t c = FROM_UNICODE (cs, *text++); 175 uint32_t c = FROM_UNICODE (cs, *text++);
201 176
… …
206 } 181 }
207 182
208 *buf++ = c; 183 *buf++ = c;
209 } 184 }
210 185
211 return (const char *)enc_buf; 186 return (const char *)res;
212} 187}
213 188
214static const XChar2b * 189static const XChar2b *
215enc_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)
216{ 191{
217 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 192 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
193 XChar2b *res = buf;
218 194
219 while (len--) 195 while (len--)
220 { 196 {
221 uint32_t c = FROM_UNICODE (cs, *text++); 197 uint32_t c = FROM_UNICODE (cs, *text++);
222 198
… …
229 buf->byte1 = c >> 8; 205 buf->byte1 = c >> 8;
230 buf->byte2 = c; 206 buf->byte2 = c;
231 buf++; 207 buf++;
232 } 208 }
233 209
234 return (XChar2b *)enc_buf; 210 return res;
235} 211}
236 212
237///////////////////////////////////////////////////////////////////////////// 213/////////////////////////////////////////////////////////////////////////////
214
215rxvt_font::rxvt_font ()
216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217{
218}
238 219
239void 220void
240rxvt_font::set_name (char *name) 221rxvt_font::set_name (char *name)
241{ 222{
242 if (this->name == name) 223 if (this->name == name)
… …
245 if (this->name) free (this->name); // let the compiler optimize 226 if (this->name) free (this->name); // let the compiler optimize
246 this->name = name; 227 this->name = name;
247} 228}
248 229
249void 230void
250rxvt_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
251{ 232{
252 if (color == Color_bg) 233 dTermDisplay;
253 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);
254 else if (color >= 0) 238 else if (color >= 0)
255 { 239 {
256#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
257 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 255 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
256
258#else 257#else
259 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 258 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 259 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 260#endif
262 } 261 }
263} 262}
264 263
265#include "table/linedraw.h" 264/////////////////////////////////////////////////////////////////////////////
266 265
267struct rxvt_font_default : rxvt_font { 266struct rxvt_font_default : rxvt_font {
268 struct rxvt_fontset *fs; 267 struct rxvt_fontset *fs;
269 268
270 rxvt_font_default (rxvt_fontset *fs) 269 rxvt_font_default (rxvt_fontset *fs)
… …
276 rxvt_fontprop properties () 275 rxvt_fontprop properties ()
277 { 276 {
278 rxvt_fontprop p; 277 rxvt_fontprop p;
279 278
280 p.width = p.height = 1; 279 p.width = p.height = 1;
280 p.ascent = rxvt_fontprop::unset;
281 p.weight = rxvt_fontprop::medium; 281 p.weight = rxvt_fontprop::medium;
282 p.slant = rxvt_fontprop::roman; 282 p.slant = rxvt_fontprop::roman;
283 283
284 return p; 284 return p;
285 } 285 }
286 286
287 bool load (const rxvt_fontprop &prop) 287 bool load (const rxvt_fontprop &prop, bool force_prop)
288 { 288 {
289 width = 1; height = 1; 289 width = 1; height = 1;
290 ascent = 1; descent = 0; 290 ascent = 1; descent = 0;
291 291
292 set_name (strdup ("built-in support font")); 292 set_name (strdup ("built-in support font"));
293 293
294 return true; 294 return true;
295 } 295 }
296 296
297 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
298 { 298 {
299 careful = false; 299 careful = false;
300 300
301 if (unicode <= 0x001f) 301 if (unicode <= 0x001f)
302 return true; 302 return true;
… …
305 return false; 305 return false;
306 306
307 if (unicode <= 0x009f) 307 if (unicode <= 0x009f)
308 return true; 308 return true;
309 309
310#ifdef BUILTIN_GLYPHS
310 if (unicode >= 0x2500 && unicode <= 0x259f) 311 if (unicode >= 0x2500 && unicode <= 0x259f &&
312 !term->option (Opt_skipBuiltinGlyphs))
311 return true; 313 return true;
314#endif
312 315
313 if (IS_COMPOSE (unicode)) 316 if (IS_COMPOSE (unicode))
314 return true; 317 return true;
315 318
316 switch (unicode) 319 switch (unicode)
… …
331void 334void
332rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 335rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
333 const text_t *text, int len, 336 const text_t *text, int len,
334 int fg, int bg) 337 int fg, int bg)
335{ 338{
339 dTermDisplay;
340 dTermGC;
341
336 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 342 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
337 343
338 XSetForeground (d.display->display, TGC, r->pix_colors[fg]); 344 XSetForeground (disp, gc, term->pix_colors[fg]);
339 345
340 while (len) 346 while (len)
341 { 347 {
342#if ENABLE_COMBINING 348#if ENABLE_COMBINING
343 compose_char *cc; 349 compose_char *cc;
… …
347 353
348 while (++text, --len && *text == NOCHAR) 354 while (++text, --len && *text == NOCHAR)
349 ; 355 ;
350 356
351 int width = text - tp; 357 int width = text - tp;
352 int fwidth = r->TermWin.fwidth * width; 358 int fwidth = term->fwidth * width;
353 359
360#ifdef BUILTIN_GLYPHS
354 if (0x2500 <= t && t <= 0x259f) 361 if (0x2500 <= t && t <= 0x259f)
355 { 362 {
363# include "table/linedraw.h"
356 uint16_t offs = linedraw_offs[t - 0x2500]; 364 uint16_t offs = linedraw_offs[t - 0x2500];
357 uint32_t *a = linedraw_command + (offs >> 4); 365 uint32_t *a = linedraw_command + (offs >> 4);
358 uint32_t *b = a + (offs & 15); 366 uint32_t *b = a + (offs & 15);
359 367
360 int W = fwidth; 368 int W = fwidth;
361 int H = r->TermWin.fheight; 369 int H = term->fheight;
362 370
363 int x_[16]; 371 int x_[16];
364 int y_[16]; 372 int y_[16];
365 373
366 for (int i = 0; i <= 8; i++) 374 for (int i = 0; i <= 8; i++)
… …
374 382
375 XGCValues gcv; 383 XGCValues gcv;
376 384
377 gcv.cap_style = CapButt; 385 gcv.cap_style = CapButt;
378 gcv.line_width = 0; 386 gcv.line_width = 0;
379 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 387 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
380 388
381 while (a < b) 389 while (a < b)
382 { 390 {
383 uint32_t command = *a++; 391 uint32_t command = *a++;
384 392
… …
391 int y2 = y_[(command >> 0) & 15]; 399 int y2 = y_[(command >> 0) & 15];
392 400
393 switch (op) 401 switch (op)
394 { 402 {
395 case 0: // line 403 case 0: // line
396 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 404 XDrawLine (disp, d, gc, x1, y1, x2, y2);
397 break; 405 break;
398 406
399 case 1: // rectangle, possibly stippled 407 case 1: // rectangle, possibly stippled
400 if (a) 408 if (a)
401 { 409 {
402 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 410 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
403 411
404 gcv.fill_style = FillStippled; 412 gcv.fill_style = FillStippled;
405 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 413 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
406 gcv.ts_x_origin = x; 414 gcv.ts_x_origin = x;
407 gcv.ts_y_origin = y; 415 gcv.ts_y_origin = y;
408 416
409 XChangeGC (d.display->display, TGC, 417 XChangeGC (disp, gc,
410 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 418 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
411 &gcv); 419 &gcv);
412 } 420 }
413 421
414 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 422 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
415 423
416 if (a) 424 if (a)
417 { 425 {
418 XFreePixmap (d.display->display, gcv.stipple); 426 XFreePixmap (disp, gcv.stipple);
419 gcv.stipple = 0; 427 gcv.stipple = 0;
420 gcv.fill_style = FillSolid; 428 gcv.fill_style = FillSolid;
421 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 429 XChangeGC (disp, gc, GCFillStyle, &gcv);
422 } 430 }
423 break; 431 break;
424 case 2: // arc 432 case 2: // arc
425 XDrawArc (d.display->display, d, TGC, 433 XDrawArc (disp, d, gc,
426 x1 - W/2, y1 - H/2, W-1, H-1, 434 x1 - W/2, y1 - H/2, W-1, H-1,
427 (a - 1) * 90*64, (b - 1) * 90*64); 435 (a - 1) * 90*64, (b - 1) * 90*64);
428 break; 436 break;
429 } 437 }
430 } 438 }
431 } 439 }
440#else
441 if (0)
442 ;
443#endif
432#if ENABLE_COMBINING 444#if ENABLE_COMBINING
433 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
434 { 446 {
447 min_it (width, 2); // we only support wcwidth up to 2
448
435 text_t chrs[2]; 449 text_t chrs[2];
436 width = min (2, width);
437 chrs [1] = NOCHAR; 450 chrs [1] = NOCHAR;
438 451
439 *chrs = cc->c1; 452 *chrs = cc->c1;
440 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 453 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
441 f1->draw (d, x, y, chrs, width, fg, bg); 454 f1->draw (d, x, y, chrs, width, fg, bg);
… …
448 *chrs = cc->c2; 461 *chrs = cc->c2;
449 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
450 ? f1 463 ? f1
451 : (*fs)[fs->find_font (cc->c2)]; 464 : (*fs)[fs->find_font (cc->c2)];
452 465
453 f2->draw (d, x, y, chrs, width, fg, -1); 466 f2->draw (d, x, y, chrs, width, fg, Color_none);
454 } 467 }
455 } 468 }
456#endif 469#endif
457 else 470 else
458 switch (t) 471 switch (t)
… …
461 case ZERO_WIDTH_CHAR: 474 case ZERO_WIDTH_CHAR:
462 case NOCHAR: 475 case NOCHAR:
463 break; 476 break;
464 477
465 default: 478 default:
466 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, 479 XDrawRectangle (disp, d, gc, x + 2, y + 2,
467 fwidth - 4, r->TermWin.fheight - 4); 480 fwidth - 4, term->fheight - 4);
468 } 481 }
469 482
470 x += fwidth; 483 x += fwidth;
471 } 484 }
472} 485}
… …
478 491
479 void clear (); 492 void clear ();
480 493
481 rxvt_fontprop properties (); 494 rxvt_fontprop properties ();
482 495
483 bool load (const rxvt_fontprop &prop); 496 bool load (const rxvt_fontprop &prop, bool force_prop);
484 497
485 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;
486 499
487 void draw (rxvt_drawable &d, int x, int y, 500 void draw (rxvt_drawable &d, int x, int y,
488 const text_t *text, int len, 501 const text_t *text, int len,
489 int fg, int bg); 502 int fg, int bg);
490 503
491 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
492 XFontStruct *f; 505 XFontStruct *f;
493 codeset cs;
494 bool enc2b, encm; 506 bool enc2b, encm;
495 507
496 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 508 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
497 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);
498 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 510 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
499 bool set_properties (rxvt_fontprop &p, const char *name); 511 bool set_properties (rxvt_fontprop &p, const char *name);
500}; 512};
501 513
502char * 514char *
503rxvt_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
504{ 516{
505 unsigned long value; 517 unsigned long value;
506 518
507 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 519 if (XGetFontProperty (f, property, &value))
508 return XGetAtomName (DISPLAY, value); 520 return XGetAtomName (term->dpy, value);
509 else 521 else
510 return rxvt_strdup (repl); 522 return repl ? strdup (repl) : 0;
511} 523}
512 524
513rxvt_fontprop 525rxvt_fontprop
514rxvt_font_x11::properties () 526rxvt_font_x11::properties ()
515{ 527{
… …
519} 531}
520 532
521bool 533bool
522rxvt_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)
523{ 535{
524 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;
525 p.height = height; 539 p.height = height;
540 p.ascent = rxvt_fontprop::unset;
526 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;
527 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;
528 543
529 return true; 544 return true;
530} 545}
… …
533rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 548rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
534{ 549{
535 unsigned long height; 550 unsigned long height;
536 551
537#if 0 552#if 0
538 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 553 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
539 return false; 554 return false;
540#else 555#else
541 height = f->ascent + f->descent; 556 height = f->ascent + f->descent;
542#endif 557#endif
543 558
544 unsigned long avgwidth; 559 unsigned long avgwidth;
545 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 560 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
546 avgwidth = 0; 561 avgwidth = 0;
547 562
548 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 563 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
549 char *slant = get_property (f, "SLANT", "r"); 564 char *slant = get_property (f, term->xa [XA_SLANT], "r");
550 565
551 set_properties (p, height, weight, slant, avgwidth); 566 set_properties (p, height, weight, slant, avgwidth);
552 567
553 free (weight); 568 free (weight);
554 free (slant); 569 free (slant);
555 570
571 p.ascent = f->ascent;
572
556 return true; 573 return true;
557} 574}
558 575
559bool 576bool
560rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 577rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
561{ 578{
579 dTermDisplay;
562 int slashes = 0; 580 int slashes = 0;
563 const char *comp[13]; 581 const char *comp[13];
564 582
565 for (const char *c = name; *c; c++) 583 for (const char *c = name; *c; c++)
566 if (*c == '-') 584 if (*c == '-')
… …
574 if (slashes >= 13 592 if (slashes >= 13
575 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 593 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
576 && (*comp[11] >= '0' && *comp[11] <= '9')) 594 && (*comp[11] >= '0' && *comp[11] <= '9'))
577 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]));
578 596
579 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 597 XFontStruct *f = XLoadQueryFont (disp, name);
580 598
581 if (f) 599 if (f)
582 { 600 {
583 // 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
584 // (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).
585 // in that case, just return garbage. 603 // in that case, just return garbage.
586 bool ret = set_properties (p, f); 604 bool ret = set_properties (p, f);
587 XFreeFont (DISPLAY, f); 605 XFreeFont (disp, f);
588 return ret; 606 return ret;
589 } 607 }
590 else 608 else
591 return false; 609 return false;
592} 610}
593 611
594// fix the size of scalable fonts 612// fix the size of scalable fonts
595static bool 613static bool
596replace_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)
597{ 615{
598 int slashes = 0; 616 int slashes = 0;
599 const char *field, *end; 617 const char *field, *end;
600 618
601 for (const char *c = name; *c; c++) 619 for (const char *c = name; *c; c++)
… …
611 break; 629 break;
612 } 630 }
613 631
614 if (slashes >= 13 && (!old || *field == old)) 632 if (slashes >= 13 && (!old || *field == old))
615 { 633 {
616 // TODO: check for overflow in font-name 634 size_t len = field - name;
617 strncpy (buf, name, field - name); 635 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
618 buf += field - name; 636 memcpy (*ptr, name, len);
619 strcpy (buf, replace); 637 strcpy (*ptr + len, replace);
620 strcat (buf, end); 638 strcat (*ptr, end);
621 639
622 return true; 640 return true;
623 } 641 }
624 else 642 else
625 { 643 {
626 strcpy (buf, name); 644 *ptr = strdup (name);
627 645
628 return false; 646 return false;
629 } 647 }
630} 648}
631 649
632bool 650bool
633rxvt_font_x11::load (const rxvt_fontprop &prop) 651rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
634{ 652{
653 dTermDisplay;
654
635 clear (); 655 clear ();
636 656
637 char field_str[64]; // enough for 128 bits 657 char field_str[64]; // enough for 128 bits
638 658
639 // first morph the font if required 659 // first morph the font if required
640 if (prop.weight != rxvt_fontprop::unset 660 if (force_prop)
641 || prop.slant != rxvt_fontprop::unset)
642 { 661 {
643 char fname[1024]; 662 char *fname;
644 663
645 if (name[0] != '-') 664 if (name[0] != '-')
646 { 665 {
647 f = XLoadQueryFont (DISPLAY, name); 666 f = XLoadQueryFont (disp, name);
648 667
649 if (!f) 668 if (!f)
650 return false; 669 return false;
651 670
652 char *new_name = get_property (f, "FONT", name); 671 char *new_name = get_property (f, XA_FONT, name);
653 672
654 if (new_name) 673 if (new_name)
655 set_name (new_name); 674 set_name (new_name);
656 else 675 else
657 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
658 677
659 XFreeFont (DISPLAY, f); 678 XFreeFont (disp, f);
660 f = 0; 679 f = 0;
661 } 680 }
662 681
663 if (prop.weight != rxvt_fontprop::unset) 682 if (prop.weight != rxvt_fontprop::unset)
664 { 683 {
665 replace_field (fname, name, 2, 0, 684 replace_field (&fname, name, 2, 0,
666 prop.weight < rxvt_fontprop::bold 685 prop.weight < rxvt_fontprop::bold
667 ? "medium" : "bold"); 686 ? "medium" : "bold");
668 set_name (strdup (fname)); 687 set_name (fname);
669 } 688 }
670 689
671 if (prop.slant != rxvt_fontprop::unset) 690 if (prop.slant != rxvt_fontprop::unset)
672 { 691 {
673 replace_field (fname, name, 3, 0, 692 replace_field (&fname, name, 3, 0,
674 prop.slant < rxvt_fontprop::italic 693 prop.slant < rxvt_fontprop::italic
675 ? "r" : "i"); // TODO: handle "o"blique, too 694 ? "r" : "i"); // TODO: handle "o"blique, too
676 set_name (strdup (fname)); 695 set_name (fname);
677 } 696 }
678 } 697 }
679 698
680 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 699 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
681 ? 0 : prop.height); 700 ? 0 : prop.height);
… …
694 ~font_weight () { free (name); } 713 ~font_weight () { free (name); }
695 }; 714 };
696 715
697 char **list; 716 char **list;
698 int count; 717 int count;
699 list = XListFonts (DISPLAY, name, 4000, &count); 718 list = XListFonts (disp, name, 4000, &count);
700 719
701 set_name (0); 720 set_name (0);
702 721
703 if (!list) 722 if (!list)
704 return false; 723 return false;
… …
706 font_weight *fonts = new font_weight[count]; 725 font_weight *fonts = new font_weight[count];
707 726
708 for (int i = 0; i < count; i++) 727 for (int i = 0; i < count; i++)
709 { 728 {
710 rxvt_fontprop p; 729 rxvt_fontprop p;
711 char fname[1024]; 730 char *fname;
712 731
713 int diff = 0; 732 int diff = 0;
714 733
715 if (replace_field (fname, list[i], 6, '0', field_str)) 734 if (replace_field (&fname, list[i], 6, '0', field_str))
716 diff += 10; // slightly penalize scalable fonts 735 diff += 10; // slightly penalize scalable fonts
736 else
737 {
738 free (fname);
739 if (replace_field (&fname, list[i], 11, '0', "0"))
740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 }
717 742
718 if (!set_properties (p, fname)) 743 if (!set_properties (p, fname))
719 continue; 744 continue;
720 745
721 if (prop.height != rxvt_fontprop::unset 746 if (prop.height != rxvt_fontprop::unset
… …
725 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;
726 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);
727 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);
728 //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);
729 754
730 fonts[i].name = strdup (fname); 755 fonts[i].name = fname;
731 fonts[i].diff = diff; 756 fonts[i].diff = diff;
732 } 757 }
733 758
734 XFreeFontNames (list); 759 XFreeFontNames (list);
735 760
… …
737 for (;;) 762 for (;;)
738 { 763 {
739 font_weight *best = fonts + count - 1; 764 font_weight *best = fonts + count - 1;
740 765
741 for (font_weight *w = best; w-- > fonts; ) 766 for (font_weight *w = best; w-- > fonts; )
742 if (w->diff < best->diff) 767 if (w->diff <= best->diff)
743 best = w; 768 best = w;
744 769
745 if (!best->name 770 if (!best->name
746 || !(f = XLoadQueryFont (DISPLAY, best->name))) 771 || !(f = XLoadQueryFont (disp, best->name)))
747 break; 772 break;
748 773
749 set_name (best->name); 774 set_name (best->name);
750 best->clear (); 775 best->clear ();
751 776
… …
764 delete [] fonts; 789 delete [] fonts;
765 790
766 if (!f) 791 if (!f)
767 return false; 792 return false;
768 793
769 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
770 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
771 796
772 if (registry && encoding) 797 if (registry && encoding)
773 { 798 {
774 char charset[64]; 799 char charset[64];
775 snprintf (charset, 64, "%s-%s", registry, encoding); 800 snprintf (charset, 64, "%s-%s", registry, encoding);
776 801
777 cs = codeset_from_name (charset); 802 cs = codeset_from_name (charset);
778 } 803 }
779 else 804 else
780 { 805 {
781 const char *charset = get_property (f, "FONT", 0); 806 const char *charset = get_property (f, XA_FONT, 0);
782 807
783 if (!charset) 808 if (!charset)
784 charset = name; 809 charset = name;
785 810
786 int count = 13; 811 int count = 13;
… …
801 enc2b = encm || f->max_char_or_byte2 > 255; 826 enc2b = encm || f->max_char_or_byte2 > 255;
802 827
803 slow = false; 828 slow = false;
804 829
805#if 1 // only used for slow detection, TODO optimize 830#if 1 // only used for slow detection, TODO optimize
806 if (f->min_bounds.width == f->max_bounds.width) 831 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
807 width = f->min_bounds.width;
808 else if (f->per_char == NULL)
809 width = f->max_bounds.width; 832 width = f->max_bounds.width;
810 else 833 else
811 { 834 {
812 slow = true; 835 slow = true;
813 836
814 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;
815 838
816 if (encm) 839 if (encm)
817 N += (f->max_byte1 - f->min_byte1) 840 N += (f->max_byte1 - f->min_byte1)
818 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 841 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
819 842
820 while (N) 843 while (N)
821 { 844 {
822 if (f->per_char[N].width > width) 845 if (f->per_char[N].width > width)
823 width = f->per_char[N].width; 846 width = f->per_char[N].width;
824 847
… …
829 852
830 width = 1; 853 width = 1;
831 854
832 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; )
833 { 856 {
834 if (cs != CS_UNICODE
835 && *t > 0x100
836 && FROM_UNICODE (cs, *t) == NOCHAR) 857 if (FROM_UNICODE (cs, *t) == NOCHAR)
837 continue; 858 continue;
838 859
839 // ignore characters we wouldn't use anyways 860 // ignore characters we wouldn't use anyways
840 bool careful; 861 bool careful;
841 if (!has_char (*t, &prop, careful)) 862 if (!has_char (*t, &prop, careful))
… …
845 866
846 XCharStruct g; 867 XCharStruct g;
847 int dir_ret, asc_ret, des_ret; 868 int dir_ret, asc_ret, des_ret;
848 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 869 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
849 870
850 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 871 int wcw = WCWIDTH (*t);
872 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
851 873
852 if (width < g.width) width = g.width; 874 if (width < g.width) width = g.width;
853 } 875 }
854 876
855 if (cs == CS_UNKNOWN) 877 if (cs == CS_UNKNOWN)
856 { 878 {
857 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 879 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
874void 896void
875rxvt_font_x11::clear () 897rxvt_font_x11::clear ()
876{ 898{
877 if (f) 899 if (f)
878 { 900 {
879 XFreeFont (DISPLAY, f); 901 XFreeFont (term->dpy, f);
880 f = 0; 902 f = 0;
881 } 903 }
882} 904}
883 905
884bool 906bool
885rxvt_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
886{ 908{
887 uint32_t ch = FROM_UNICODE (cs, unicode); 909 uint32_t ch = FROM_UNICODE (cs, unicode);
888 910
889 if (ch == NOCHAR) 911 if (ch == NOCHAR)
890 return false; 912 return false;
… …
927 return false; 949 return false;
928 950
929 if (!prop || prop->width == rxvt_fontprop::unset) 951 if (!prop || prop->width == rxvt_fontprop::unset)
930 return true; 952 return true;
931 953
932 // check character against base font bounding box 954 // check wether character overlaps previous/next character
933 int w = xcs->width; 955 int w = xcs->rbearing - xcs->lbearing;
934 int wcw = wcwidth (unicode); 956 int wcw = max (WCWIDTH (unicode), 1);
935 if (wcw > 0) w /= wcw;
936 957
937 careful = w > prop->width; 958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
938 if (careful && w > prop->width * MAX_OVERLAP >> 2) 959
960 if (careful && !OVERLAP_OK (w, wcw, prop))
939 return false; 961 return false;
940 962
941 return true; 963 return true;
942} 964}
943 965
… …
949 // this looks like a mess /. 971 // this looks like a mess /.
950 // and it is a mess /. 972 // and it is a mess /.
951 // yet we are trying to be perfect /. 973 // yet we are trying to be perfect /.
952 // but the result still isn't perfect /. 974 // but the result still isn't perfect /.
953 975
976 dTermDisplay;
977 dTermGC;
978
954 bool slow = this->slow 979 bool slow = this->slow
955 || width != r->TermWin.fwidth 980 || width != term->fwidth
956 || height != r->TermWin.fheight; 981 || height != term->fheight;
957 982
958 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 983 int base = ascent; // sorry, incorrect: term->fbase;
959 984
960 XGCValues v; 985 XGCValues v;
961 v.foreground = r->pix_colors[fg]; 986 v.foreground = term->pix_colors[fg];
962 v.font = f->fid; 987 v.font = f->fid;
963 988
964 if (enc2b) 989 if (enc2b)
965 { 990 {
966 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 991 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
967 992
968 if (bg == Color_bg && !slow) 993 if (bg == Color_bg && !slow)
969 { 994 {
970 v.background = r->pix_colors[bg]; 995 v.background = term->pix_colors[bg];
971 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 996 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
972 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 997 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
973 } 998 }
974 else 999 else
975 { 1000 {
976 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1001 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
977 1002
978 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1003 XChangeGC (disp, gc, GCForeground | GCFont, &v);
979 1004
980 if (slow) 1005 if (slow)
981 { 1006 {
982 do 1007 do
983 { 1008 {
984 if (xc->byte1 || xc->byte2) 1009 if (xc->byte1 || xc->byte2)
985 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1010 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
986 1011
987 x += r->TermWin.fwidth; 1012 x += term->fwidth;
988 xc++; len--; 1013 xc++; len--;
989 } 1014 }
990 while (len); 1015 while (len);
991 } 1016 }
992 else 1017 else
993 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1018 XDrawString16 (disp, d, gc, x, y + base, xc, len);
994 } 1019 }
995 } 1020 }
996 else 1021 else
997 { 1022 {
998 const char *xc = enc_char (text, len, cs, slow); 1023 const char *xc = enc_char (text, len, cs, slow);
999 1024
1000 if (bg == Color_bg && !slow) 1025 if (bg == Color_bg && !slow)
1001 { 1026 {
1002 v.background = r->pix_colors[bg]; 1027 v.background = term->pix_colors[bg];
1003 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1028 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1004 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1029 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1005 } 1030 }
1006 else 1031 else
1007 { 1032 {
1008 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1033 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1009 1034
1010 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1035 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1011 1036
1012 if (slow) 1037 if (slow)
1013 { 1038 {
1014 do 1039 do
1015 { 1040 {
1016 if (*xc) 1041 if (*xc)
1017 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1042 XDrawString (disp, d, gc, x, y + base, xc, 1);
1018 1043
1019 x += r->TermWin.fwidth; 1044 x += term->fwidth;
1020 xc++; len--; 1045 xc++; len--;
1021 } 1046 }
1022 while (len); 1047 while (len);
1023 } 1048 }
1024 else 1049 else
1025 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1050 XDrawString (disp, d, gc, x, y + base, xc, len);
1026 } 1051 }
1027 } 1052 }
1028} 1053}
1029 1054
1030///////////////////////////////////////////////////////////////////////////// 1055/////////////////////////////////////////////////////////////////////////////
… …
1036 1061
1037 void clear (); 1062 void clear ();
1038 1063
1039 rxvt_fontprop properties (); 1064 rxvt_fontprop properties ();
1040 1065
1041 bool load (const rxvt_fontprop &prop); 1066 bool load (const rxvt_fontprop &prop, bool force_prop);
1042 1067
1043 void draw (rxvt_drawable &d, int x, int y, 1068 void draw (rxvt_drawable &d, int x, int y,
1044 const text_t *text, int len, 1069 const text_t *text, int len,
1045 int fg, int bg); 1070 int fg, int bg);
1046 1071
1047 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;
1048 1073
1049protected: 1074protected:
1050 XftFont *f; 1075 XftFont *f;
1051}; 1076};
1052 1077
1053void 1078void
1054rxvt_font_xft::clear () 1079rxvt_font_xft::clear ()
1055{ 1080{
1056 if (f) 1081 if (f)
1057 { 1082 {
1058 XftFontClose (DISPLAY, f); 1083 XftFontClose (term->dpy, f);
1059 f = 0; 1084 f = 0;
1060 } 1085 }
1061} 1086}
1062 1087
1063rxvt_fontprop 1088rxvt_fontprop
… …
1067 1092
1068 FT_Face face = XftLockFace (f); 1093 FT_Face face = XftLockFace (f);
1069 1094
1070 p.width = width; 1095 p.width = width;
1071 p.height = height; 1096 p.height = height;
1097 p.ascent = ascent;
1072 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1098 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1073 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1099 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1074 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1100 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1075 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1101 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1076 1102
… …
1078 1104
1079 return p; 1105 return p;
1080} 1106}
1081 1107
1082bool 1108bool
1083rxvt_font_xft::load (const rxvt_fontprop &prop) 1109rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1084{ 1110{
1111 dTermDisplay;
1112
1085 clear (); 1113 clear ();
1086 1114
1087 FcPattern *p = FcNameParse ((FcChar8 *) name); 1115 FcPattern *p = FcNameParse ((FcChar8 *) name);
1088 1116
1089 if (!p) 1117 if (!p)
1090 return false; 1118 return false;
1091 1119
1092 FcValue v; 1120 FcValue v;
1093 1121
1094 if (prop.height != rxvt_fontprop::unset 1122 if (prop.height != rxvt_fontprop::unset
1095 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1123 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1096 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1124 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1097 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1125 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1098 1126
1099 if (prop.weight != rxvt_fontprop::unset 1127 if (prop.weight != rxvt_fontprop::unset
1100 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1128 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1101 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1129 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1102 1130
1103 if (prop.slant != rxvt_fontprop::unset 1131 if (prop.slant != rxvt_fontprop::unset
1104 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1132 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1105 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1133 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1106 1134
1107#if 0 // clipping unfortunately destroys our precious double-width-characters 1135#if 0 // clipping unfortunately destroys our precious double-width-characters
1108 // clip width, we can't do better, or can we? 1136 // clip width, we can't do better, or can we?
1109 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1115 1143
1116 // store generated name so iso14755 view gives better results 1144 // store generated name so iso14755 view gives better results
1117 set_name ((char *)FcNameUnparse (p)); 1145 set_name ((char *)FcNameUnparse (p));
1118 1146
1119 XftResult result; 1147 XftResult result;
1120 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1148 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1121 1149
1122 FcPatternDestroy (p); 1150 FcPatternDestroy (p);
1123 1151
1124 if (!match) 1152 if (!match)
1125 return false; 1153 return false;
… …
1127 int ftheight = 0; 1155 int ftheight = 0;
1128 bool success = true; 1156 bool success = true;
1129 1157
1130 for (;;) 1158 for (;;)
1131 { 1159 {
1132 f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); 1160 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
1133 1161
1134 if (!f) 1162 if (!f)
1135 { 1163 {
1136 success = false; 1164 success = false;
1137 break; 1165 break;
… …
1146 1174
1147 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1175 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1148 1176
1149 XftUnlockFace (f); 1177 XftUnlockFace (f);
1150 1178
1179 int glheight = height;
1180
1151 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1181 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1152 { 1182 {
1153 FcChar16 ch = *t; 1183 FcChar16 ch = *t;
1154 1184
1155 if (cs != CS_UNICODE 1185 if (cs != CS_UNICODE
… …
1161 bool careful; 1191 bool careful;
1162 if (!has_char (*t, &prop, careful)) 1192 if (!has_char (*t, &prop, careful))
1163 continue; 1193 continue;
1164 1194
1165 XGlyphInfo g; 1195 XGlyphInfo g;
1166 XftTextExtents16 (DISPLAY, f, &ch, 1, &g); 1196 XftTextExtents16 (disp, f, &ch, 1, &g);
1167 1197
1198 g.width -= g.x;
1199
1168 int wcw = wcwidth (ch); 1200 int wcw = WCWIDTH (ch);
1169 if (wcw > 0) g.width = g.width / wcw; 1201 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1170 1202
1171 if (width < g.width) width = g.width; 1203 if (width < g.width ) width = g.width;
1172 if (height < g.height) height = g.height; 1204 if (height < g.height ) height = g.height;
1205 if (glheight < g.height - g.y) glheight = g.height - g.y;
1206 }
1207
1208 if (!width)
1209 {
1210 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1211
1212 XftFontClose (disp, f);
1213 f = 0;
1214
1215 success = false;
1216 break;
1173 } 1217 }
1174 1218
1175 if (prop.height == rxvt_fontprop::unset 1219 if (prop.height == rxvt_fontprop::unset
1176 || height <= prop.height 1220 || (height <= prop.height && glheight <= prop.height)
1177 || height <= 2 1221 || height <= 2
1178 || !scalable) 1222 || !scalable)
1179 break; 1223 break;
1180 1224
1181 if (ftheight) 1225 if (ftheight)
… …
1188 ftheight -= height - prop.height; 1232 ftheight -= height - prop.height;
1189 } 1233 }
1190 else 1234 else
1191 ftheight = prop.height - 1; 1235 ftheight = prop.height - 1;
1192 1236
1193 XftFontClose (DISPLAY, f); 1237 XftFontClose (disp, f);
1194 FcPatternDel (match, FC_PIXEL_SIZE); 1238 FcPatternDel (match, FC_PIXEL_SIZE);
1195 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1239 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1196 } 1240 }
1197 1241
1198 FcPatternDestroy (match); 1242 FcPatternDestroy (match);
1199 1243
1200#if 0 // do it per-character 1244#if 0 // do it per-character
… …
1207 1251
1208 return success; 1252 return success;
1209} 1253}
1210 1254
1211bool 1255bool
1212rxvt_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
1213{ 1257{
1214 careful = false; 1258 careful = false;
1215 1259
1216 if (!XftCharExists (DISPLAY, f, unicode)) 1260 if (!XftCharExists (term->dpy, f, unicode))
1217 return false; 1261 return false;
1218 1262
1219 if (!prop || prop->width == rxvt_fontprop::unset) 1263 if (!prop || prop->width == rxvt_fontprop::unset)
1220 return true; 1264 return true;
1221 1265
1222 // check character against base font bounding box 1266 // check character against base font bounding box
1223 FcChar32 ch = unicode; 1267 FcChar32 ch = unicode;
1224 XGlyphInfo g; 1268 XGlyphInfo g;
1225 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1269 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1226 1270
1227 int w = g.width; 1271 int w = g.width - g.x;
1228 int wcw = wcwidth (unicode); 1272 int wcw = max (WCWIDTH (unicode), 1);
1229 if (wcw > 0) w /= wcw;
1230 1273
1231 careful = w > prop->width; 1274 careful = g.x > 0 || w > prop->width * wcw;
1232 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))
1233 return false; 1281 return false;
1234 1282
1235 return true; 1283 return true;
1236} 1284}
1237 1285
1238void 1286void
1239rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1240 const text_t *text, int len, 1288 const text_t *text, int len,
1241 int fg, int bg) 1289 int fg, int bg)
1242{ 1290{
1243 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
1244
1245 int base = ascent; // should be fbase, but that is incorrect
1246
1247 XGlyphInfo extents; 1291 XGlyphInfo extents;
1248 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1249 FcChar32 *ep = enc; 1293 XftGlyphSpec *ep = enc;
1250 int ewidth = 0; 1294
1251 int xoff = 0; 1295 dTermDisplay;
1296 dTermGC;
1297
1298 int w = term->fwidth * len;
1299 int h = term->fheight;
1300
1301 /*
1302 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1303 * good idea from the perspective of packaging for wide variety of user configs.
1304 */
1305 bool buffered = bg >= Color_transparent;
1306#ifdef FORCE_UNBUFFERED_XFT
1307 buffered = false;
1308#endif
1309
1310 // cut trailing spaces
1311 while (len && text [len - 1] == ' ')
1312 len--;
1313
1314 int x_ = buffered ? 0 : x;
1315 int y_ = buffered ? 0 : y;
1252 1316
1253 while (len) 1317 while (len)
1254 { 1318 {
1255 int cwidth = r->TermWin.fwidth; 1319 int cwidth = term->fwidth;
1256 FcChar32 fc = *text++; len--; 1320 FcChar32 fc = *text++; len--;
1257 FT_UInt gl;
1258 1321
1259 while (len && *text == NOCHAR) 1322 while (len && *text == NOCHAR)
1260 text++, len--, cwidth += r->TermWin.fwidth; 1323 text++, len--, cwidth += term->fwidth;
1261
1262 gl = XftCharIndex (d.display->display, f, fc);
1263 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1264 1324
1265 if (extents.xOff != cwidth && ep != enc) 1325 if (fc != ' ') // skip spaces
1266 {
1267 if (xoff > ewidth) xoff = ewidth;
1268 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1269 x + (ewidth - xoff >> 1),
1270 y + base, enc, ep - enc);
1271 x += ewidth;
1272
1273 ep = enc;
1274 ewidth = 0;
1275 xoff = 0;
1276 } 1326 {
1327 FT_UInt glyph = XftCharIndex (disp, f, fc);
1328 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1277 1329
1278 if (fc == ' ' && ep == enc) // skip leading spaces 1330 ep->glyph = glyph;
1331 ep->x = x_ + (cwidth - extents.xOff >> 1);
1332 ep->y = y_ + ascent;
1333
1334 if (extents.xOff == 0)
1335 ep->x = x_ + cwidth;
1336
1337 ep++;
1279 { 1338 }
1339
1280 x += cwidth; 1340 x_ += cwidth;
1281 continue; 1341 }
1342
1343 if (buffered)
1344 {
1345 if (ep != enc)
1282 } 1346 {
1347 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1283 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 clear_rect (d2, 0, 0, w, h, bg);
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 }
1284 else 1403 else
1285 { 1404 clear_rect (d, x, y, w, h, bg);
1286 *ep++ = gl;
1287 ewidth += cwidth;
1288 xoff += extents.xOff;
1289 }
1290 }
1291
1292 if (ep != enc)
1293 { 1405 }
1294 if (xoff > ewidth) xoff = ewidth; 1406 else
1295 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1296 x + (ewidth - xoff >> 1),
1297 y + base, enc, ep - enc);
1298 } 1407 {
1408 clear_rect (d, x, y, w, h, bg);
1409 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1410 }
1299} 1411}
1412
1300#endif 1413#endif
1301 1414
1302///////////////////////////////////////////////////////////////////////////// 1415/////////////////////////////////////////////////////////////////////////////
1303 1416
1304rxvt_fontset::rxvt_fontset (rxvt_t r) 1417rxvt_fontset::rxvt_fontset (rxvt_term *term)
1305: r (r), fontdesc (0) 1418: fontdesc (0), term (term)
1306{ 1419{
1307 clear (); 1420 clear ();
1308} 1421}
1309 1422
1310rxvt_fontset::~rxvt_fontset () 1423rxvt_fontset::~rxvt_fontset ()
… …
1313} 1426}
1314 1427
1315void 1428void
1316rxvt_fontset::clear () 1429rxvt_fontset::clear ()
1317{ 1430{
1318 prop.width = prop.height = prop.weight = prop.slant 1431 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1319 = rxvt_fontprop::unset; 1432 = rxvt_fontprop::unset;
1433 force_prop = false;
1320 1434
1321 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1435 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1322 FONT_UNREF (*i); 1436 FONT_UNREF (*i);
1323 1437
1324 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1438 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1333 1447
1334rxvt_font * 1448rxvt_font *
1335rxvt_fontset::new_font (const char *name, codeset cs) 1449rxvt_fontset::new_font (const char *name, codeset cs)
1336{ 1450{
1337 rxvt_font *f; 1451 rxvt_font *f;
1338 1452
1339 if (!name || !*name) 1453 if (!name || !*name)
1340 { 1454 {
1341 name = ""; 1455 name = "";
1342 f = new rxvt_font_default (this); 1456 f = new rxvt_font_default (this);
1343 } 1457 }
… …
1354 f = new rxvt_font_x11; 1468 f = new rxvt_font_x11;
1355 } 1469 }
1356 else 1470 else
1357 f = new rxvt_font_x11; 1471 f = new rxvt_font_x11;
1358 1472
1359 f->set_term (r); 1473 f->set_term (term);
1360 f->set_name (strdup (name)); 1474 f->set_name (strdup (name));
1361 1475
1362 f->cs = cs; 1476 f->cs = cs;
1363 f->loaded = false; 1477 f->loaded = false;
1364 1478
… …
1375 char buf[512]; 1489 char buf[512];
1376 const char *end; 1490 const char *end;
1377 1491
1378 do 1492 do
1379 { 1493 {
1380 while (*desc <= ' ') desc++; 1494 while (*desc && *desc <= ' ')
1495 desc++;
1381 1496
1382 codeset cs = CS_UNICODE; 1497 codeset cs = CS_UNICODE;
1383 1498
1384 if (*desc == '[') 1499 if (*desc == '[')
1385 { 1500 {
… …
1410 if (!end) 1525 if (!end)
1411 end = desc + strlen (desc); 1526 end = desc + strlen (desc);
1412 1527
1413 if (end - desc < 511) 1528 if (end - desc < 511)
1414 { 1529 {
1415 strncpy (buf, desc, end - desc); 1530 memcpy (buf, desc, end - desc);
1416 buf[end - desc] = 0; 1531 buf[end - desc] = 0;
1417 1532
1418 fonts.push_back (new_font (buf, cs)); 1533 fonts.push_back (new_font (buf, cs));
1419 } 1534 }
1420 else 1535 else
… …
1435 if (fonts[i]->loaded) 1550 if (fonts[i]->loaded)
1436 return true; 1551 return true;
1437 1552
1438 fonts[i]->loaded = true; 1553 fonts[i]->loaded = true;
1439 1554
1440 if (!fonts[i]->load (prop)) 1555 if (!fonts[i]->load (prop, force_prop))
1441 { 1556 {
1442 fonts[i]->cs = CS_UNKNOWN; 1557 fonts[i]->cs = CS_UNKNOWN;
1443 return false; 1558 return false;
1444 } 1559 }
1445 1560
… …
1495 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1610 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1496 goto next_font; 1611 goto next_font;
1497 1612
1498 if (!realize_font (i)) 1613 if (!realize_font (i))
1499 goto next_font; 1614 goto next_font;
1615
1616 if (prop.ascent != rxvt_fontprop::unset)
1617 max_it (f->ascent, prop.ascent);
1500 } 1618 }
1501 1619
1502 if (f->cs == CS_UNKNOWN) 1620 if (f->cs == CS_UNKNOWN)
1503 goto next_font; 1621 goto next_font;
1504 1622
… …
1543 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1661 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1544 FcPatternAddBool (p, FC_MINSPACE, 1); 1662 FcPatternAddBool (p, FC_MINSPACE, 1);
1545 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1663 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1546 1664
1547 XftResult result; 1665 XftResult result;
1548 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1666 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1549 1667
1550 FcPatternDestroy (p); 1668 FcPatternDestroy (p);
1551 1669
1552 if (match) 1670 if (match)
1553 { 1671 {
… …
1558 if (find_font (font) < 0) 1676 if (find_font (font) < 0)
1559 { 1677 {
1560 char fontname[4096]; 1678 char fontname[4096];
1561 sprintf (fontname, "xft:%-.4090s", font); 1679 sprintf (fontname, "xft:%-.4090s", font);
1562 1680
1563 fonts.push_back (new_font (fontname, CS_UNICODE)); 1681 fonts.push_back (new_font (fontname, CS_UNICODE));
1564 } 1682 }
1565 1683
1566 free (font); 1684 free (font);
1567 } 1685 }
1568#endif 1686#endif

Diff Legend

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