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.52 by root, Sat Dec 4 02:56:06 2004 UTC vs.
Revision 1.103 by root, Sun Aug 27 10:10:25 2006 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 "rxvtlib.h"
24#include "rxvtutil.h" 25#include "rxvtutil.h"
25#include "rxvtfont.h" 26#include "rxvtfont.h"
26 27
27#include <cstdlib> 28#include <cstdlib>
28#include <wchar.h> 29
29#include <inttypes.h> 30#include <inttypes.h>
30 31
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 32#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
33#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34
35#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36 (prop)->slant >= rxvt_fontprop::italic \
37 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 ))
35 40
36const struct rxvt_fallback_font { 41const struct rxvt_fallback_font {
37 codeset cs; 42 codeset cs;
38 const char *name; 43 const char *name;
39} fallback_fonts[] = { 44} fallback_fonts[] = {
… …
59 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 64 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
60 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
61 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
62 67
63# if XFT 68# if XFT
64 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 69 { CS_KOI8_U, "xft::lang=ru" },
65 70
66 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 71 { CS_ISO8859_5, "xft::lang=ru" },
67 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 72 { CS_ISO8859_6, "xft::lang=ar" },
68 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 73 { CS_ISO8859_7, "xft::lang=el" },
69 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 74 { CS_ISO8859_8, "xft::lang=he" },
70 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 75 { CS_ISO8859_9, "xft::lang=tr" },
71 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 76 { CS_ISO8859_10, "xft::lang=se" },
72 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 77 { CS_ISO8859_11, "xft::lang=th" },
73# endif 78# endif
74#endif 79#endif
75 80
76 // japanese 81 // japanese
77#if ENCODING_JP || ENCODING_JP_EXT 82#if ENCODING_JP || ENCODING_JP_EXT
78# if XFT 83# if XFT
79 // prefer xft for complex scripts 84 // prefer xft for complex scripts
80 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
81 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, 86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
82 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
83 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
84# endif 89# endif
85 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
86 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
87 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 92 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
88 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
… …
90 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 95 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
91#endif 96#endif
92 97
93#if ENCODING_ZH || ENCODING_ZH_EXT 98#if ENCODING_ZH || ENCODING_ZH_EXT
94# if XFT 99# if XFT
100 { CS_GBK_0, "xft:AR PL KaitiM GB" },
101 { CS_GBK_0, "xft:AR PL SungtiL GB" },
102 { CS_GBK_0, "xft::lang=zh" },
95 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
96 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 104 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
97 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
98 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 106 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
99 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 107 { CS_GB2312_1980_0, "xft::lang=zh" },
100# endif 108# endif
109 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
101 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 110 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
102 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 111 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
103 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 112 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
113 { CS_GB2312_1980_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
104 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, 114 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
105 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, 115 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
106 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, 116 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
107 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, 117 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
108 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, 118 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
… …
115#if ENCODING_KR 125#if ENCODING_KR
116 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 126 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
117 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 127 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
118# if XFT 128# if XFT
119 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
120 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
121# endif 131# endif
122#endif 132#endif
123 133
124 // generic font fallback
125 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 134 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
126 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 135 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
127 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
128 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
129#if XFT 136#if XFT
130 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"}, 137 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
131 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 138 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
132 { CS_UNICODE, "xft:Andale Mono:antialias=false" }, 139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
133 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, 140 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
134 141
135 // FreeMono is usually uglier than x fonts, so try last only. 142 // FreeMono is usually uglier than x fonts, so try after the others
136 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 143 { CS_UNICODE, "xft:FreeMono:autohint=true" },
137#endif 144#endif
138 145
146 // generic font fallback, put this last, as many iso10646 fonts have extents
147 // specified for all glyphs in the range they cover, but most are simply empty
148 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
149 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
139 { CS_UNKNOWN, 0 } 150 { CS_UNKNOWN, 0 }
140}; 151};
141 152
142// these characters are used to guess the font height and width 153// these characters are used to guess the font height and width
143// pango uses a similar algorithm and eosn't trust the font either. 154// pango uses a similar algorithm and doesn't trust the font either.
144static uint16_t extent_test_chars[] = { 155static uint16_t extent_test_chars[] = {
145 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 156 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
146 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 157 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
147 0x304c, 0x672c, // が本 158 0x304c, 0x672c, // が本
148}; 159};
149 160
150#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 161#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
151 162
163#define dTermDisplay Display *disp = term->dpy
164#define dTermGC GC gc = term->gc
165
152///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
153
154#if XFT
155rxvt_drawable::~rxvt_drawable ()
156{
157 if (xftdrawable)
158 XftDrawDestroy (xftdrawable);
159}
160
161rxvt_drawable::operator XftDraw *()
162{
163 if (!xftdrawable)
164 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
165
166 return xftdrawable;
167}
168#endif
169
170/////////////////////////////////////////////////////////////////////////////
171
172static void *enc_buf;
173static uint32_t enc_len;
174
175static inline void *
176get_enc_buf (uint32_t len)
177{
178 if (len > enc_len)
179 {
180 free (enc_buf);
181 enc_buf = malloc (len);
182 enc_len = len;
183 }
184
185 return enc_buf;
186}
187 167
188static const char * 168static const char *
189enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 169enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
190{ 170{
191 uint8_t *buf = (uint8_t *)get_enc_buf (len); 171 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
172 uint8_t *res = buf;
192 173
193 while (len--) 174 while (len--)
194 { 175 {
195 uint32_t c = FROM_UNICODE (cs, *text++); 176 uint32_t c = FROM_UNICODE (cs, *text++);
196 177
… …
201 } 182 }
202 183
203 *buf++ = c; 184 *buf++ = c;
204 } 185 }
205 186
206 return (const char *)enc_buf; 187 return (const char *)res;
207} 188}
208 189
209static const XChar2b * 190static const XChar2b *
210enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 191enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
211{ 192{
212 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 193 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
194 XChar2b *res = buf;
213 195
214 while (len--) 196 while (len--)
215 { 197 {
216 uint32_t c = FROM_UNICODE (cs, *text++); 198 uint32_t c = FROM_UNICODE (cs, *text++);
217 199
… …
224 buf->byte1 = c >> 8; 206 buf->byte1 = c >> 8;
225 buf->byte2 = c; 207 buf->byte2 = c;
226 buf++; 208 buf++;
227 } 209 }
228 210
229 return (XChar2b *)enc_buf; 211 return res;
230} 212}
231 213
232///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
215
216rxvt_font::rxvt_font ()
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{
219}
233 220
234void 221void
235rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name)
236{ 223{
237 if (this->name == name) 224 if (this->name == name)
… …
240 if (this->name) free (this->name); // let the compiler optimize 227 if (this->name) free (this->name); // let the compiler optimize
241 this->name = name; 228 this->name = name;
242} 229}
243 230
244void 231void
245rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) 232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
246{ 233{
234 dTermDisplay;
235 dTermGC;
236
247 if (color == Color_bg) 237 if (color < 0 || color == Color_bg)
248 XClearArea (d.display->display, d, x, y, w, h, FALSE); 238 XClearArea (disp, d, x, y, w, h, false);
249 else if (color >= 0) 239 else
250 { 240 {
251#if XFT 241#if XFT
252 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 242 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
253#else 243#else
254 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 244 XSetForeground (disp, gc, term->pix_colors[color]);
255 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 245 XFillRectangle (disp, d, gc, x, y, w, h);
256#endif 246#endif
257 } 247 }
258} 248}
249
250/////////////////////////////////////////////////////////////////////////////
259 251
260#include "table/linedraw.h" 252#include "table/linedraw.h"
261 253
262struct rxvt_font_default : rxvt_font { 254struct rxvt_font_default : rxvt_font {
263 struct rxvt_fontset *fs; 255 struct rxvt_fontset *fs;
… …
271 rxvt_fontprop properties () 263 rxvt_fontprop properties ()
272 { 264 {
273 rxvt_fontprop p; 265 rxvt_fontprop p;
274 266
275 p.width = p.height = 1; 267 p.width = p.height = 1;
268 p.ascent = rxvt_fontprop::unset;
276 p.weight = rxvt_fontprop::medium; 269 p.weight = rxvt_fontprop::medium;
277 p.slant = rxvt_fontprop::roman; 270 p.slant = rxvt_fontprop::roman;
278 271
279 return p; 272 return p;
280 } 273 }
281 274
282 bool load (const rxvt_fontprop &prop) 275 bool load (const rxvt_fontprop &prop, bool force_prop)
283 { 276 {
284 width = 1; height = 1; 277 width = 1; height = 1;
285 ascent = 1; descent = 0; 278 ascent = 1; descent = 0;
286 279
287 set_name (strdup ("built-in support font")); 280 set_name (strdup ("built-in support font"));
288 281
289 return true; 282 return true;
290 } 283 }
291 284
292 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 285 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
293 { 286 {
294 careful = false; 287 careful = false;
295 288
296 if (unicode <= 0x001f) 289 if (unicode <= 0x001f)
297 return true; 290 return true;
… …
300 return false; 293 return false;
301 294
302 if (unicode <= 0x009f) 295 if (unicode <= 0x009f)
303 return true; 296 return true;
304 297
305 if (unicode >= 0x2500 && unicode <= 0x259f) 298 if (unicode >= 0x2500 && unicode <= 0x259f &&
299 !term->option (Opt_skipBuiltinGlyphs))
306 return true; 300 return true;
307 301
308 if (IS_COMPOSE (unicode)) 302 if (IS_COMPOSE (unicode))
309 return true; 303 return true;
310 304
… …
326void 320void
327rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 321rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
328 const text_t *text, int len, 322 const text_t *text, int len,
329 int fg, int bg) 323 int fg, int bg)
330{ 324{
325 dTermDisplay;
326 dTermGC;
327
331 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 328 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
332 329
333 XSetForeground (d.display->display, TGC, r->pix_colors[fg]); 330 XSetForeground (disp, gc, term->pix_colors[fg]);
334 331
335 while (len--) 332 while (len)
336 { 333 {
337#if ENABLE_COMBINING 334#if ENABLE_COMBINING
338 compose_char *cc; 335 compose_char *cc;
339#endif 336#endif
337 const text_t *tp = text;
340 text_t t = *text++; 338 text_t t = *tp;
339
340 while (++text, --len && *text == NOCHAR)
341 ;
342
343 int width = text - tp;
344 int fwidth = term->fwidth * width;
341 345
342 if (0x2500 <= t && t <= 0x259f) 346 if (0x2500 <= t && t <= 0x259f)
343 { 347 {
344 uint16_t offs = linedraw_offs[t - 0x2500]; 348 uint16_t offs = linedraw_offs[t - 0x2500];
345 uint32_t *a = linedraw_command + (offs >> 4); 349 uint32_t *a = linedraw_command + (offs >> 4);
346 uint32_t *b = a + (offs & 15); 350 uint32_t *b = a + (offs & 15);
347 351
348 int W = r->TermWin.fwidth; 352 int W = fwidth;
349 int H = r->TermWin.fheight; 353 int H = term->fheight;
350
351 // support double-width (but not more) graphics chars
352 // TODO: do this outside the if/elsif.. statement for all cases
353 if (len && *text == NOCHAR)
354 W += r->TermWin.fwidth;
355 354
356 int x_[16]; 355 int x_[16];
357 int y_[16]; 356 int y_[16];
358 357
359 for (int i = 0; i <= 8; i++) 358 for (int i = 0; i <= 8; i++)
… …
367 366
368 XGCValues gcv; 367 XGCValues gcv;
369 368
370 gcv.cap_style = CapButt; 369 gcv.cap_style = CapButt;
371 gcv.line_width = 0; 370 gcv.line_width = 0;
372 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 371 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
373 372
374 while (a < b) 373 while (a < b)
375 { 374 {
376 uint32_t command = *a++; 375 uint32_t command = *a++;
377 376
… …
384 int y2 = y_[(command >> 0) & 15]; 383 int y2 = y_[(command >> 0) & 15];
385 384
386 switch (op) 385 switch (op)
387 { 386 {
388 case 0: // line 387 case 0: // line
389 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 388 XDrawLine (disp, d, gc, x1, y1, x2, y2);
390 break; 389 break;
391 390
392 case 1: // rectangle, possibly stippled 391 case 1: // rectangle, possibly stippled
393 if (a) 392 if (a)
394 { 393 {
395 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 394 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
396 395
397 gcv.fill_style = FillStippled; 396 gcv.fill_style = FillStippled;
398 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 397 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
399 gcv.ts_x_origin = x; 398 gcv.ts_x_origin = x;
400 gcv.ts_y_origin = y; 399 gcv.ts_y_origin = y;
401 400
402 XChangeGC (d.display->display, TGC, 401 XChangeGC (disp, gc,
403 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 402 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
404 &gcv); 403 &gcv);
405 } 404 }
406 405
407 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 406 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
408 407
409 if (a) 408 if (a)
410 { 409 {
411 XFreePixmap (d.display->display, gcv.stipple); 410 XFreePixmap (disp, gcv.stipple);
412 gcv.stipple = 0; 411 gcv.stipple = 0;
413 gcv.fill_style = FillSolid; 412 gcv.fill_style = FillSolid;
414 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 413 XChangeGC (disp, gc, GCFillStyle, &gcv);
415 } 414 }
416 break; 415 break;
417 case 2: // arc 416 case 2: // arc
418 XDrawArc (d.display->display, d, TGC, 417 XDrawArc (disp, d, gc,
419 x1 - W/2, y1 - H/2, W-1, H-1, 418 x1 - W/2, y1 - H/2, W-1, H-1,
420 (a - 1) * 90*64, (b - 1) * 90*64); 419 (a - 1) * 90*64, (b - 1) * 90*64);
421 break; 420 break;
422 } 421 }
423 } 422 }
424 } 423 }
425#if ENABLE_COMBINING 424#if ENABLE_COMBINING
426 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 425 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
427 { 426 {
427 min_it (width, 2); // we only support wcwidth up to 2
428
428 text_t c2[2]; 429 text_t chrs[2];
429 int len2 = 1; 430 chrs [1] = NOCHAR;
430
431 // support double-width (but not more) combining characters
432 if (len && *text == NOCHAR)
433 {
434 c2[1] = *text; // not text++ to get correct x-width
435 len2++;
436 }
437 431
438 c2[0] = cc->c1; 432 *chrs = cc->c1;
439 rxvt_font *f1 = (*fs)[fs->find_font (c2[0])]; 433 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
440 f1->draw (d, x, y, c2, len2, fg, bg); 434 f1->draw (d, x, y, chrs, width, fg, bg);
441 435
442 if (cc->c2 != NOCHAR) 436 if (cc->c2 != NOCHAR)
443 { 437 {
444 bool careful; 438 bool careful;
445 439
446 // prefer font of first character, for no good reasons 440 // prefer font of first character, for no good reasons
447 c2[0] = cc->c2; 441 *chrs = cc->c2;
448 rxvt_font *f2 = (f1->has_char (c2[0], 0, careful) && !careful) 442 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
449 ? f1 443 ? f1
450 : (*fs)[fs->find_font (c2[0])]; 444 : (*fs)[fs->find_font (cc->c2)];
451 445
452 f2->draw (d, x, y, c2, len2, fg, -1); 446 f2->draw (d, x, y, chrs, width, fg, -1);
453 } 447 }
454 } 448 }
455#endif 449#endif
456 else 450 else
457 switch (t) 451 switch (t)
… …
460 case ZERO_WIDTH_CHAR: 454 case ZERO_WIDTH_CHAR:
461 case NOCHAR: 455 case NOCHAR:
462 break; 456 break;
463 457
464 default: 458 default:
465 int w = 0;
466 while (len > 0 && *text == NOCHAR)
467 {
468 ++text;
469 --len;
470 w += r->TermWin.fwidth;
471 }
472
473 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, 459 XDrawRectangle (disp, d, gc, x + 2, y + 2,
474 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); 460 fwidth - 4, term->fheight - 4);
475 x += w;
476 } 461 }
477 462
478 x += r->TermWin.fwidth; 463 x += fwidth;
479 } 464 }
480} 465}
481 466
482///////////////////////////////////////////////////////////////////////////// 467/////////////////////////////////////////////////////////////////////////////
483 468
… …
486 471
487 void clear (); 472 void clear ();
488 473
489 rxvt_fontprop properties (); 474 rxvt_fontprop properties ();
490 475
491 bool load (const rxvt_fontprop &prop); 476 bool load (const rxvt_fontprop &prop, bool force_prop);
492 477
493 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 478 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
494 479
495 void draw (rxvt_drawable &d, int x, int y, 480 void draw (rxvt_drawable &d, int x, int y,
496 const text_t *text, int len, 481 const text_t *text, int len,
497 int fg, int bg); 482 int fg, int bg);
498 483
499 bool slow; // wether this is a proportional font or has other funny characteristics 484 bool slow; // wether this is a proportional font or has other funny characteristics
500 XFontStruct *f; 485 XFontStruct *f;
501 codeset cs; 486 codeset cs;
502 bool enc2b, encm; 487 bool enc2b, encm;
503 488
504 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 489 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
505 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 490 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
506 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 491 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
507 bool set_properties (rxvt_fontprop &p, const char *name); 492 bool set_properties (rxvt_fontprop &p, const char *name);
508}; 493};
509 494
510char * 495char *
511rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 496rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
512{ 497{
513 unsigned long value; 498 unsigned long value;
514 499
515 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 500 if (XGetFontProperty (f, property, &value))
516 return XGetAtomName (DISPLAY, value); 501 return XGetAtomName (term->dpy, value);
517 else 502 else
518 return rxvt_strdup (repl); 503 return rxvt_strdup (repl);
519} 504}
520 505
521rxvt_fontprop 506rxvt_fontprop
… …
527} 512}
528 513
529bool 514bool
530rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 515rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
531{ 516{
532 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 517 p.width = width != rxvt_fontprop::unset ? width
518 : avgwidth ? (avgwidth + 1) / 10
519 : (height + 1) / 2;
533 p.height = height; 520 p.height = height;
521 p.ascent = rxvt_fontprop::unset;
534 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 522 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
535 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 523 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
536 524
537 return true; 525 return true;
538} 526}
539 527
540bool 528bool
541rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 529rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
542{ 530{
543 unsigned long height; 531 unsigned long height;
532
533#if 0
544 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 534 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
545 return false; 535 return false;
536#else
537 height = f->ascent + f->descent;
538#endif
546 539
547 unsigned long avgwidth; 540 unsigned long avgwidth;
548 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 541 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
549 avgwidth = 0; 542 avgwidth = 0;
550 543
551 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 544 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
552 char *slant = get_property (f, "SLANT", "r"); 545 char *slant = get_property (f, term->xa [XA_SLANT], "r");
553 546
554 set_properties (p, height, weight, slant, avgwidth); 547 set_properties (p, height, weight, slant, avgwidth);
555 548
556 free (weight); 549 free (weight);
557 free (slant); 550 free (slant);
558 551
552 p.ascent = f->ascent;
553
559 return true; 554 return true;
560} 555}
561 556
562bool 557bool
563rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 558rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
564{ 559{
560 dTermDisplay;
565 int slashes = 0; 561 int slashes = 0;
566 const char *comp[13]; 562 const char *comp[13];
567 563
568 for (const char *c = name; *c; c++) 564 for (const char *c = name; *c; c++)
569 if (*c == '-') 565 if (*c == '-')
… …
577 if (slashes >= 13 573 if (slashes >= 13
578 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 574 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
579 && (*comp[11] >= '0' && *comp[11] <= '9')) 575 && (*comp[11] >= '0' && *comp[11] <= '9'))
580 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 576 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
581 577
582 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 578 XFontStruct *f = XLoadQueryFont (disp, name);
583 579
584 if (f) 580 if (f)
585 { 581 {
586 // the font should really exist now. if not, we have a problem 582 // the font should really exist now. if not, we have a problem
587 // (e.g. if the user did xset fp rehash just when we were searching fonts). 583 // (e.g. if the user did xset fp rehash just when we were searching fonts).
588 // in that case, just return garbage. 584 // in that case, just return garbage.
589 bool ret = set_properties (p, f); 585 bool ret = set_properties (p, f);
590 XFreeFont (DISPLAY, f); 586 XFreeFont (disp, f);
591 return ret; 587 return ret;
592 } 588 }
593 else 589 else
594 return false; 590 return false;
595} 591}
… …
631 return false; 627 return false;
632 } 628 }
633} 629}
634 630
635bool 631bool
636rxvt_font_x11::load (const rxvt_fontprop &prop) 632rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
637{ 633{
634 dTermDisplay;
635
638 clear (); 636 clear ();
639 637
640 char field_str[64]; // enough for 128 bits 638 char field_str[64]; // enough for 128 bits
641 639
642 // first morph the font if required 640 // first morph the font if required
643 if (prop.weight != rxvt_fontprop::unset 641 if (force_prop)
644 || prop.slant != rxvt_fontprop::unset)
645 { 642 {
646 char fname[1024]; 643 char fname[1024];
647 644
648 if (name[0] != '-') 645 if (name[0] != '-')
649 { 646 {
650 f = XLoadQueryFont (DISPLAY, name); 647 f = XLoadQueryFont (disp, name);
651 648
652 if (!f) 649 if (!f)
653 return false; 650 return false;
654 651
655 char *new_name = get_property (f, "FONT", name); 652 char *new_name = get_property (f, XA_FONT, name);
656 653
657 if (new_name) 654 if (new_name)
658 set_name (new_name); 655 set_name (new_name);
659 else 656 else
660 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 657 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
661 658
662 XFreeFont (DISPLAY, f); 659 XFreeFont (disp, f);
663 f = 0; 660 f = 0;
664 } 661 }
665 662
666 if (prop.weight != rxvt_fontprop::unset) 663 if (prop.weight != rxvt_fontprop::unset)
667 { 664 {
… …
678 ? "r" : "i"); // TODO: handle "o"blique, too 675 ? "r" : "i"); // TODO: handle "o"blique, too
679 set_name (strdup (fname)); 676 set_name (strdup (fname));
680 } 677 }
681 } 678 }
682 679
680 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
681 ? 0 : prop.height);
682
683 struct font_weight {
684 char *name;
685 int diff;
686
687 void clear ()
688 {
689 name = 0;
690 diff = 0x7fffffff;
691 }
692
693 font_weight () { clear (); }
694 ~font_weight () { free (name); }
695 };
696
683 char **list; 697 char **list;
684 int count; 698 int count;
685 list = XListFonts (DISPLAY, name, 1024, &count); 699 list = XListFonts (disp, name, 4000, &count);
686 700
687 set_name (0); 701 set_name (0);
688 702
689 if (!list) 703 if (!list)
690 return false; 704 return false;
691 705
692 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 706 font_weight *fonts = new font_weight[count];
693 ? 0 : prop.height);
694 707
695 int bestdiff = 0x7fffffff;
696 for (int i = 0; i < count; i++) 708 for (int i = 0; i < count; i++)
697 { 709 {
698 rxvt_fontprop p; 710 rxvt_fontprop p;
699 char fname[1024]; 711 char fname[1024];
700 712
701 int diff = 0; 713 int diff = 0;
702 714
703 if (replace_field (fname, list[i], 6, '0', field_str)) 715 if (replace_field (fname, list[i], 6, '0', field_str))
704 diff += 10; // slightly penalize scalable fonts 716 diff += 10; // slightly penalize scalable fonts
717 else if (replace_field (fname, list[i], 11, '0', "0"))
718 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
705 719
706 if (!set_properties (p, fname)) 720 if (!set_properties (p, fname))
707 continue; 721 continue;
708 722
709 if (prop.height != rxvt_fontprop::unset 723 if (prop.height != rxvt_fontprop::unset
… …
713 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 727 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
714 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 728 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
715 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 729 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
716 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 730 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
717 731
718 if (!name // compare against best found so far 732 fonts[i].name = strdup (fname);
719 || diff < bestdiff) 733 fonts[i].diff = diff;
720 {
721 set_name (strdup (fname));
722 bestdiff = diff;
723 }
724 } 734 }
725 735
726 XFreeFontNames (list); 736 XFreeFontNames (list);
727 737
728 if (!name) 738 // this loop only iterates when the guessed font-size is too small
729 return false; 739 for (;;)
740 {
741 font_weight *best = fonts + count - 1;
730 742
731 f = XLoadQueryFont (DISPLAY, name); 743 for (font_weight *w = best; w-- > fonts; )
744 if (w->diff <= best->diff)
745 best = w;
746
747 if (!best->name
748 || !(f = XLoadQueryFont (disp, best->name)))
749 break;
750
751 set_name (best->name);
752 best->clear ();
753
754 ascent = f->ascent;
755 descent = f->descent;
756 height = ascent + descent;
757
758 if (prop.height == rxvt_fontprop::unset
759 || height <= prop.height)
760 break; // font is ready for use
761
762 // PIXEL_SIZE small enough, but real height too large
763 clear ();
764 }
765
766 delete [] fonts;
732 767
733 if (!f) 768 if (!f)
734 return false; 769 return false;
735 770
736 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 771 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
737 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 772 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
738 773
739 if (registry && encoding) 774 if (registry && encoding)
740 { 775 {
741 char charset[64]; 776 char charset[64];
742 snprintf (charset, 64, "%s-%s", registry, encoding); 777 snprintf (charset, 64, "%s-%s", registry, encoding);
743 778
744 cs = codeset_from_name (charset); 779 cs = codeset_from_name (charset);
745 } 780 }
746 else 781 else
747 { 782 {
748 const char *charset = get_property (f, "FONT", 0); 783 const char *charset = get_property (f, XA_FONT, 0);
749 784
750 if (!charset) 785 if (!charset)
751 charset = name; 786 charset = name;
752 787
753 int count = 13; 788 int count = 13;
… …
765 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 800 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
766 801
767 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 802 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
768 enc2b = encm || f->max_char_or_byte2 > 255; 803 enc2b = encm || f->max_char_or_byte2 > 255;
769 804
770 ascent = f->ascent;
771 descent = f->descent;
772 height = ascent + descent;
773
774 slow = false; 805 slow = false;
775 806
776#if 1 // only used for slow detection, TODO optimize 807#if 1 // only used for slow detection, TODO optimize
777 if (f->min_bounds.width == f->max_bounds.width) 808 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
778 width = f->min_bounds.width;
779 else if (f->per_char == NULL)
780 width = f->max_bounds.width; 809 width = f->max_bounds.width;
781 else 810 else
782 { 811 {
783 slow = true; 812 slow = true;
784 813
… …
800 829
801 width = 1; 830 width = 1;
802 831
803 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 832 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
804 { 833 {
805 if (cs != CS_UNICODE
806 && *t > 0x100
807 && FROM_UNICODE (cs, *t) == NOCHAR) 834 if (FROM_UNICODE (cs, *t) == NOCHAR)
808 continue; 835 continue;
809 836
810 // ignore characters we wouldn't use anyways 837 // ignore characters we wouldn't use anyways
811 bool careful; 838 bool careful;
812 if (!has_char (*t, &prop, careful)) 839 if (!has_char (*t, &prop, careful))
… …
816 843
817 XCharStruct g; 844 XCharStruct g;
818 int dir_ret, asc_ret, des_ret; 845 int dir_ret, asc_ret, des_ret;
819 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 846 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
820 847
821 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 848 int wcw = WCWIDTH (*t);
849 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
822 850
823 if (width < g.width) width = g.width; 851 if (width < g.width) width = g.width;
824 } 852 }
825 853
826 if (cs == CS_UNKNOWN) 854 if (cs == CS_UNKNOWN)
827 { 855 {
828 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 856 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
845void 873void
846rxvt_font_x11::clear () 874rxvt_font_x11::clear ()
847{ 875{
848 if (f) 876 if (f)
849 { 877 {
850 XFreeFont (DISPLAY, f); 878 XFreeFont (term->dpy, f);
851 f = 0; 879 f = 0;
852 } 880 }
853} 881}
854 882
855bool 883bool
856rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 884rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
857{ 885{
858 uint32_t ch = FROM_UNICODE (cs, unicode); 886 uint32_t ch = FROM_UNICODE (cs, unicode);
859 887
860 if (ch == NOCHAR) 888 if (ch == NOCHAR)
861 return false; 889 return false;
… …
898 return false; 926 return false;
899 927
900 if (!prop || prop->width == rxvt_fontprop::unset) 928 if (!prop || prop->width == rxvt_fontprop::unset)
901 return true; 929 return true;
902 930
903 // check character against base font bounding box 931 // check wether character overlaps previous/next character
904 int w = xcs->width; 932 int w = xcs->rbearing - xcs->lbearing;
905 int wcw = wcwidth (unicode); 933 int wcw = max (WCWIDTH (unicode), 1);
906 if (wcw > 0) w /= wcw;
907 934
908 careful = w > prop->width; 935 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
909 if (careful && w > prop->width * MAX_OVERLAP >> 2) 936
937 if (careful && !OVERLAP_OK (w, wcw, prop))
910 return false; 938 return false;
911 939
912 return true; 940 return true;
913} 941}
914 942
… …
920 // this looks like a mess /. 948 // this looks like a mess /.
921 // and it is a mess /. 949 // and it is a mess /.
922 // yet we are trying to be perfect /. 950 // yet we are trying to be perfect /.
923 // but the result still isn't perfect /. 951 // but the result still isn't perfect /.
924 952
953 dTermDisplay;
954 dTermGC;
955
925 bool slow = this->slow 956 bool slow = this->slow
926 || width != r->TermWin.fwidth 957 || width != term->fwidth
927 || height != r->TermWin.fheight; 958 || height != term->fheight;
928 959
929 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 960 int base = ascent; // sorry, incorrect: term->fbase;
930 961
931 XGCValues v; 962 XGCValues v;
932 v.foreground = r->pix_colors[fg]; 963 v.foreground = term->pix_colors[fg];
933 v.font = f->fid; 964 v.font = f->fid;
934 965
935 if (enc2b) 966 if (enc2b)
936 { 967 {
937 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 968 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
938 969
939 if (bg == Color_bg && !slow) 970 if (bg == Color_bg && !slow)
940 { 971 {
941 v.background = r->pix_colors[bg]; 972 v.background = term->pix_colors[bg];
942 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 973 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
943 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 974 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
944 } 975 }
945 else 976 else
946 { 977 {
947 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 978 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
948 979
949 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 980 XChangeGC (disp, gc, GCForeground | GCFont, &v);
950 981
951 if (slow) 982 if (slow)
952 { 983 {
953 do 984 do
954 { 985 {
955 if (xc->byte1 || xc->byte2) 986 if (xc->byte1 || xc->byte2)
956 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 987 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
957 988
958 x += r->TermWin.fwidth; 989 x += term->fwidth;
959 xc++; len--; 990 xc++; len--;
960 } 991 }
961 while (len); 992 while (len);
962 } 993 }
963 else 994 else
964 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 995 XDrawString16 (disp, d, gc, x, y + base, xc, len);
965 } 996 }
966 } 997 }
967 else 998 else
968 { 999 {
969 const char *xc = enc_char (text, len, cs, slow); 1000 const char *xc = enc_char (text, len, cs, slow);
970 1001
971 if (bg == Color_bg && !slow) 1002 if (bg == Color_bg && !slow)
972 { 1003 {
973 v.background = r->pix_colors[bg]; 1004 v.background = term->pix_colors[bg];
974 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1005 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
975 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1006 XDrawImageString (disp, d, gc, x, y + base, xc, len);
976 } 1007 }
977 else 1008 else
978 { 1009 {
979 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1010 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
980 1011
981 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1012 XChangeGC (disp, gc, GCForeground | GCFont, &v);
982 1013
983 if (slow) 1014 if (slow)
984 { 1015 {
985 do 1016 do
986 { 1017 {
987 if (*xc) 1018 if (*xc)
988 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1019 XDrawString (disp, d, gc, x, y + base, xc, 1);
989 1020
990 x += r->TermWin.fwidth; 1021 x += term->fwidth;
991 xc++; len--; 1022 xc++; len--;
992 } 1023 }
993 while (len); 1024 while (len);
994 } 1025 }
995 else 1026 else
996 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1027 XDrawString (disp, d, gc, x, y + base, xc, len);
997 } 1028 }
998 } 1029 }
999} 1030}
1000 1031
1001///////////////////////////////////////////////////////////////////////////// 1032/////////////////////////////////////////////////////////////////////////////
… …
1007 1038
1008 void clear (); 1039 void clear ();
1009 1040
1010 rxvt_fontprop properties (); 1041 rxvt_fontprop properties ();
1011 1042
1012 bool load (const rxvt_fontprop &prop); 1043 bool load (const rxvt_fontprop &prop, bool force_prop);
1013 1044
1014 void draw (rxvt_drawable &d, int x, int y, 1045 void draw (rxvt_drawable &d, int x, int y,
1015 const text_t *text, int len, 1046 const text_t *text, int len,
1016 int fg, int bg); 1047 int fg, int bg);
1017 1048
1018 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1049 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
1019 1050
1020protected: 1051protected:
1021 XftFont *f; 1052 XftFont *f;
1022}; 1053};
1023 1054
1024void 1055void
1025rxvt_font_xft::clear () 1056rxvt_font_xft::clear ()
1026{ 1057{
1027 if (f) 1058 if (f)
1028 { 1059 {
1029 XftFontClose (DISPLAY, f); 1060 XftFontClose (term->dpy, f);
1030 f = 0; 1061 f = 0;
1031 } 1062 }
1032} 1063}
1033 1064
1034rxvt_fontprop 1065rxvt_fontprop
… …
1038 1069
1039 FT_Face face = XftLockFace (f); 1070 FT_Face face = XftLockFace (f);
1040 1071
1041 p.width = width; 1072 p.width = width;
1042 p.height = height; 1073 p.height = height;
1074 p.ascent = ascent;
1043 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1075 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1044 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1076 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1045 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1077 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1046 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1078 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1047 1079
… …
1049 1081
1050 return p; 1082 return p;
1051} 1083}
1052 1084
1053bool 1085bool
1054rxvt_font_xft::load (const rxvt_fontprop &prop) 1086rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1055{ 1087{
1088 dTermDisplay;
1089
1056 clear (); 1090 clear ();
1057 1091
1058 FcPattern *p = FcNameParse ((FcChar8 *) name); 1092 FcPattern *p = FcNameParse ((FcChar8 *) name);
1059 1093
1060 if (!p) 1094 if (!p)
1061 return false; 1095 return false;
1062 1096
1063 FcValue v; 1097 FcValue v;
1064 1098
1065 if (prop.height != rxvt_fontprop::unset 1099 if (prop.height != rxvt_fontprop::unset
1066 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1100 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1067 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1101 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1068 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1102 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1069 1103
1070 if (prop.weight != rxvt_fontprop::unset 1104 if (prop.weight != rxvt_fontprop::unset
1071 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1105 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1072 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1106 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1073 1107
1074 if (prop.slant != rxvt_fontprop::unset 1108 if (prop.slant != rxvt_fontprop::unset
1075 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1109 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1076 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1110 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1077 1111
1078#if 0 // clipping unfortunately destroys our precious double-width-characters 1112#if 0 // clipping unfortunately destroys our precious double-width-characters
1079 // clip width, we can't do better, or can we? 1113 // clip width, we can't do better, or can we?
1080 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1114 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1086 1120
1087 // store generated name so iso14755 view gives better results 1121 // store generated name so iso14755 view gives better results
1088 set_name ((char *)FcNameUnparse (p)); 1122 set_name ((char *)FcNameUnparse (p));
1089 1123
1090 XftResult result; 1124 XftResult result;
1091 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1125 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1092 1126
1093 FcPatternDestroy (p); 1127 FcPatternDestroy (p);
1094 1128
1095 if (!match) 1129 if (!match)
1096 return false; 1130 return false;
… …
1098 int ftheight = 0; 1132 int ftheight = 0;
1099 bool success = true; 1133 bool success = true;
1100 1134
1101 for (;;) 1135 for (;;)
1102 { 1136 {
1103 f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); 1137 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
1104 1138
1105 if (!f) 1139 if (!f)
1106 { 1140 {
1107 success = false; 1141 success = false;
1108 break; 1142 break;
… …
1117 1151
1118 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1152 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1119 1153
1120 XftUnlockFace (f); 1154 XftUnlockFace (f);
1121 1155
1156 int glheight = height;
1157
1122 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1158 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1123 { 1159 {
1124 FcChar16 ch = *t; 1160 FcChar16 ch = *t;
1125 1161
1126 if (cs != CS_UNICODE 1162 if (cs != CS_UNICODE
… …
1132 bool careful; 1168 bool careful;
1133 if (!has_char (*t, &prop, careful)) 1169 if (!has_char (*t, &prop, careful))
1134 continue; 1170 continue;
1135 1171
1136 XGlyphInfo g; 1172 XGlyphInfo g;
1137 XftTextExtents16 (DISPLAY, f, &ch, 1, &g); 1173 XftTextExtents16 (disp, f, &ch, 1, &g);
1138 1174
1175 g.width -= g.x;
1176
1139 int wcw = wcwidth (ch); 1177 int wcw = WCWIDTH (ch);
1140 if (wcw > 0) g.width = g.width / wcw; 1178 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1141 1179
1142 if (width < g.width) width = g.width; 1180 if (width < g.width ) width = g.width;
1143 if (height < g.height) height = g.height; 1181 if (height < g.height ) height = g.height;
1182 if (glheight < g.height - g.y) glheight = g.height - g.y;
1183 }
1184
1185 if (!width)
1186 {
1187 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1188
1189 XftFontClose (disp, f);
1190 f = 0;
1191
1192 success = false;
1193 break;
1144 } 1194 }
1145 1195
1146 if (prop.height == rxvt_fontprop::unset 1196 if (prop.height == rxvt_fontprop::unset
1147 || height <= prop.height 1197 || (height <= prop.height && glheight <= prop.height)
1148 || height <= 2 1198 || height <= 2
1149 || !scalable) 1199 || !scalable)
1150 break; 1200 break;
1151 1201
1152 if (ftheight) 1202 if (ftheight)
… …
1159 ftheight -= height - prop.height; 1209 ftheight -= height - prop.height;
1160 } 1210 }
1161 else 1211 else
1162 ftheight = prop.height - 1; 1212 ftheight = prop.height - 1;
1163 1213
1164 XftFontClose (DISPLAY, f); 1214 XftFontClose (disp, f);
1165 FcPatternDel (match, FC_PIXEL_SIZE); 1215 FcPatternDel (match, FC_PIXEL_SIZE);
1166 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1216 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1167 } 1217 }
1168 1218
1169 FcPatternDestroy (match); 1219 FcPatternDestroy (match);
1170 1220
1171#if 0 // do it per-character 1221#if 0 // do it per-character
… …
1178 1228
1179 return success; 1229 return success;
1180} 1230}
1181 1231
1182bool 1232bool
1183rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1233rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1184{ 1234{
1185 careful = false; 1235 careful = false;
1186 1236
1187 if (!XftCharExists (DISPLAY, f, unicode)) 1237 if (!XftCharExists (term->dpy, f, unicode))
1188 return false; 1238 return false;
1189 1239
1190 if (!prop || prop->width == rxvt_fontprop::unset) 1240 if (!prop || prop->width == rxvt_fontprop::unset)
1191 return true; 1241 return true;
1192 1242
1193 // check character against base font bounding box 1243 // check character against base font bounding box
1194 FcChar32 ch = unicode; 1244 FcChar32 ch = unicode;
1195 XGlyphInfo g; 1245 XGlyphInfo g;
1196 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1246 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1197 1247
1198 int w = g.width; 1248 int w = g.width - g.x;
1199 int wcw = wcwidth (unicode); 1249 int wcw = max (WCWIDTH (unicode), 1);
1200 if (wcw > 0) w /= wcw;
1201 1250
1202 careful = w > prop->width; 1251 careful = g.x > 0 || w > prop->width * wcw;
1203 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1252
1253 if (careful && !OVERLAP_OK (w, wcw, prop))
1254 return false;
1255
1256 // this weeds out _totally_ broken fonts, or glyphs
1257 if (!OVERLAP_OK (g.xOff, wcw, prop))
1204 return false; 1258 return false;
1205 1259
1206 return true; 1260 return true;
1207} 1261}
1208 1262
1209void 1263void
1210rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1264rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1211 const text_t *text, int len, 1265 const text_t *text, int len,
1212 int fg, int bg) 1266 int fg, int bg)
1213{ 1267{
1214 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
1215
1216 int base = ascent; // should be fbase, but that is incorrect
1217
1218 XGlyphInfo extents; 1268 XGlyphInfo extents;
1219 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1269 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1220 FcChar32 *ep = enc; 1270 XftGlyphSpec *ep = enc;
1221 int ewidth = 0; 1271
1222 int xoff = 0; 1272 dTermDisplay;
1273 dTermGC;
1274
1275 int w = term->fwidth * len;
1276 int h = term->fheight;
1277
1278 bool buffered = bg >= 0 // we don't use a transparent bg
1279#ifndef FORCE_UNBUFFERED_XFT
1280# if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
1281 || !term->am_transparent // we aren't transparent
1282 || term->am_pixmap_trans // we have a pixmap
1283# endif
1284#endif
1285 ;
1286
1287 // cut trailing spaces
1288 while (len && text [len - 1] == ' ')
1289 len--;
1290
1291 int x_ = buffered ? 0 : x;
1292 int y_ = buffered ? 0 : y;
1223 1293
1224 while (len) 1294 while (len)
1225 { 1295 {
1226 int cwidth = r->TermWin.fwidth; 1296 int cwidth = term->fwidth;
1227 FcChar32 fc = *text++; len--; 1297 FcChar32 fc = *text++; len--;
1228 FT_UInt gl;
1229 1298
1230 while (len && *text == NOCHAR) 1299 while (len && *text == NOCHAR)
1231 text++, len--, cwidth += r->TermWin.fwidth; 1300 text++, len--, cwidth += term->fwidth;
1232 1301
1233 gl = XftCharIndex (d.display->display, f, fc); 1302 if (fc != ' ') // skip spaces
1234 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1235
1236 if (extents.xOff != cwidth && ep != enc)
1237 {
1238 if (xoff > ewidth) xoff = ewidth;
1239 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1240 x + (ewidth - xoff >> 1),
1241 y + base, enc, ep - enc);
1242 x += ewidth;
1243
1244 ep = enc;
1245 ewidth = 0;
1246 xoff = 0;
1247 } 1303 {
1304 FT_UInt glyph = XftCharIndex (disp, f, fc);
1305 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1248 1306
1249 if (fc == ' ' && ep == enc) // skip leading spaces 1307 ep->glyph = glyph;
1308 ep->x = x_ + (cwidth - extents.xOff >> 1);
1309 ep->y = y_ + ascent;
1310
1311 if (extents.xOff == 0)
1312 ep->x = x_ + cwidth;
1313
1314 ep++;
1250 { 1315 }
1316
1251 x += cwidth; 1317 x_ += cwidth;
1252 continue; 1318 }
1319
1320 if (buffered)
1321 {
1322 if (ep != enc)
1253 } 1323 {
1324 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1254 1325
1326 if (0)
1327 ;
1328#ifdef TRANSPARENT
1329 else if (bg < 0 && term->am_pixmap_trans)
1330 XCopyArea (disp, term->pixmap, d2, gc,
1331 x + term->window_vt_x, y + term->window_vt_y,
1332 w, h, 0, 0);
1333#endif
1334#ifdef XPM_BACKGROUND
1335 else if (bg < 0 && term->bgPixmap.pixmap)
1336 {
1337 XGCValues gcv;
1338
1339 gcv.fill_style = FillTiled;
1340 gcv.tile = term->pixmap;
1341 gcv.ts_x_origin = -x;
1342 gcv.ts_y_origin = -y;
1343
1344 GC gc2 = XCreateGC (disp, d2,
1345 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1346 &gcv);
1347
1348 XFillRectangle (disp, d2, gc2, 0, 0, w, h);
1349
1350 XFreeGC (disp, gc2);
1351 }
1352#endif
1353 else
1354 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1355
1356 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1357 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1358 }
1255 else 1359 else
1256 { 1360 clear_rect (d, x, y, w, h, bg);
1257 *ep++ = gl;
1258 ewidth += cwidth;
1259 xoff += extents.xOff;
1260 }
1261 }
1262
1263 if (ep != enc)
1264 { 1361 }
1265 if (xoff > ewidth) xoff = ewidth; 1362 else
1266 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1267 x + (ewidth - xoff >> 1),
1268 y + base, enc, ep - enc);
1269 } 1363 {
1364 clear_rect (d, x, y, w, h, bg);
1365 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1366 }
1270} 1367}
1368
1271#endif 1369#endif
1272 1370
1273///////////////////////////////////////////////////////////////////////////// 1371/////////////////////////////////////////////////////////////////////////////
1274 1372
1275rxvt_fontset::rxvt_fontset (rxvt_t r) 1373rxvt_fontset::rxvt_fontset (rxvt_term *term)
1276: r (r), fontdesc (0) 1374: fontdesc (0), term (term)
1277{ 1375{
1278 clear (); 1376 clear ();
1279} 1377}
1280 1378
1281rxvt_fontset::~rxvt_fontset () 1379rxvt_fontset::~rxvt_fontset ()
… …
1284} 1382}
1285 1383
1286void 1384void
1287rxvt_fontset::clear () 1385rxvt_fontset::clear ()
1288{ 1386{
1289 prop.width = prop.height = prop.weight = prop.slant 1387 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1290 = rxvt_fontprop::unset; 1388 = rxvt_fontprop::unset;
1389 force_prop = false;
1291 1390
1292 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1391 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1293 FONT_UNREF (*i); 1392 FONT_UNREF (*i);
1294 1393
1295 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1394 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1325 f = new rxvt_font_x11; 1424 f = new rxvt_font_x11;
1326 } 1425 }
1327 else 1426 else
1328 f = new rxvt_font_x11; 1427 f = new rxvt_font_x11;
1329 1428
1330 f->set_term (r); 1429 f->set_term (term);
1331 f->set_name (strdup (name)); 1430 f->set_name (strdup (name));
1332 1431
1333 f->cs = cs; 1432 f->cs = cs;
1334 f->loaded = false; 1433 f->loaded = false;
1335 1434
… …
1346 char buf[512]; 1445 char buf[512];
1347 const char *end; 1446 const char *end;
1348 1447
1349 do 1448 do
1350 { 1449 {
1351 while (*desc <= ' ') desc++; 1450 while (*desc && *desc <= ' ')
1451 desc++;
1352 1452
1353 codeset cs = CS_UNICODE; 1453 codeset cs = CS_UNICODE;
1354 1454
1355 if (*desc == '[') 1455 if (*desc == '[')
1356 { 1456 {
… …
1406 if (fonts[i]->loaded) 1506 if (fonts[i]->loaded)
1407 return true; 1507 return true;
1408 1508
1409 fonts[i]->loaded = true; 1509 fonts[i]->loaded = true;
1410 1510
1411 if (!fonts[i]->load (prop)) 1511 if (!fonts[i]->load (prop, force_prop))
1412 { 1512 {
1413 fonts[i]->cs = CS_UNKNOWN; 1513 fonts[i]->cs = CS_UNKNOWN;
1414 return false; 1514 return false;
1415 } 1515 }
1416 1516
… …
1466 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1566 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1467 goto next_font; 1567 goto next_font;
1468 1568
1469 if (!realize_font (i)) 1569 if (!realize_font (i))
1470 goto next_font; 1570 goto next_font;
1571
1572 if (prop.ascent != rxvt_fontprop::unset)
1573 max_it (f->ascent, prop.ascent);
1471 } 1574 }
1472 1575
1473 if (f->cs == CS_UNKNOWN) 1576 if (f->cs == CS_UNKNOWN)
1474 goto next_font; 1577 goto next_font;
1475 1578
… …
1514 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1617 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1515 FcPatternAddBool (p, FC_MINSPACE, 1); 1618 FcPatternAddBool (p, FC_MINSPACE, 1);
1516 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1619 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1517 1620
1518 XftResult result; 1621 XftResult result;
1519 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1622 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1520 1623
1521 FcPatternDestroy (p); 1624 FcPatternDestroy (p);
1522 1625
1523 if (match) 1626 if (match)
1524 { 1627 {

Diff Legend

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