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

Diff Legend

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