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.48 by root, Sun Nov 21 20:19:24 2004 UTC vs.
Revision 1.110 by sasha, Fri Aug 3 22:40:10 2007 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{
247 if (color == Color_bg) 234 dTermDisplay;
248 XClearArea (d.display->display, d, x, y, w, h, FALSE); 235 dTermGC;
236
237 if (color == Color_bg || color == Color_transparent)
238 XClearArea (disp, d, x, y, w, h, false);
249 else if (color >= 0) 239 else if (color >= 0)
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 354
351 int x_[16]; 355 int x_[16];
352 int y_[16]; 356 int y_[16];
353 357
354 for (int i = 0; i <= 8; i++) 358 for (int i = 0; i <= 8; i++)
… …
362 366
363 XGCValues gcv; 367 XGCValues gcv;
364 368
365 gcv.cap_style = CapButt; 369 gcv.cap_style = CapButt;
366 gcv.line_width = 0; 370 gcv.line_width = 0;
367 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 371 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
368 372
369 while (a < b) 373 while (a < b)
370 { 374 {
371 uint32_t command = *a++; 375 uint32_t command = *a++;
372 376
… …
379 int y2 = y_[(command >> 0) & 15]; 383 int y2 = y_[(command >> 0) & 15];
380 384
381 switch (op) 385 switch (op)
382 { 386 {
383 case 0: // line 387 case 0: // line
384 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 388 XDrawLine (disp, d, gc, x1, y1, x2, y2);
385 break; 389 break;
386 390
387 case 1: // rectangle, possibly stippled 391 case 1: // rectangle, possibly stippled
388 if (a) 392 if (a)
389 { 393 {
390 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 394 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
391 395
392 gcv.fill_style = FillStippled; 396 gcv.fill_style = FillStippled;
393 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 397 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
394 gcv.ts_x_origin = x; 398 gcv.ts_x_origin = x;
395 gcv.ts_y_origin = y; 399 gcv.ts_y_origin = y;
396 400
397 XChangeGC (d.display->display, TGC, 401 XChangeGC (disp, gc,
398 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 402 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
399 &gcv); 403 &gcv);
400 } 404 }
401 405
402 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);
403 407
404 if (a) 408 if (a)
405 { 409 {
406 XFreePixmap (d.display->display, gcv.stipple); 410 XFreePixmap (disp, gcv.stipple);
407 gcv.stipple = 0; 411 gcv.stipple = 0;
408 gcv.fill_style = FillSolid; 412 gcv.fill_style = FillSolid;
409 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 413 XChangeGC (disp, gc, GCFillStyle, &gcv);
410 } 414 }
411 break; 415 break;
412 case 2: // arc 416 case 2: // arc
413 XDrawArc (d.display->display, d, TGC, 417 XDrawArc (disp, d, gc,
414 x1 - W/2, y1 - H/2, W-1, H-1, 418 x1 - W/2, y1 - H/2, W-1, H-1,
415 (a - 1) * 90*64, (b - 1) * 90*64); 419 (a - 1) * 90*64, (b - 1) * 90*64);
416 break; 420 break;
417 } 421 }
418 } 422 }
419 } 423 }
420#if ENABLE_COMBINING 424#if ENABLE_COMBINING
421 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 425 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
422 { 426 {
427 min_it (width, 2); // we only support wcwidth up to 2
428
423 text_t c2[2]; 429 text_t chrs[2];
424 int len2 = 1; 430 chrs [1] = NOCHAR;
425
426 // support double-width (but not more) combining characters
427 if (len && *text == NOCHAR)
428 {
429 c2[1] = *text; // not text++ to get correct x-width
430 len2++;
431 }
432 431
433 c2[0] = cc->c1; 432 *chrs = cc->c1;
434 rxvt_font *f1 = (*fs)[fs->find_font (c2[0])]; 433 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
435 f1->draw (d, x, y, c2, len2, fg, bg); 434 f1->draw (d, x, y, chrs, width, fg, bg);
436 435
437 if (cc->c2 != NOCHAR) 436 if (cc->c2 != NOCHAR)
438 { 437 {
439 bool careful; 438 bool careful;
440 439
441 // prefer font of first character, for no good reasons 440 // prefer font of first character, for no good reasons
442 c2[0] = cc->c2; 441 *chrs = cc->c2;
443 rxvt_font *f2 = (f1->has_char (c2[0], 0, careful) && !careful) 442 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
444 ? f1 443 ? f1
445 : (*fs)[fs->find_font (c2[0])]; 444 : (*fs)[fs->find_font (cc->c2)];
446 445
447 f2->draw (d, x, y, c2, len2, fg, -1); 446 f2->draw (d, x, y, chrs, width, fg, Color_none);
448 } 447 }
449 } 448 }
450#endif 449#endif
451 else 450 else
452 switch (t) 451 switch (t)
… …
455 case ZERO_WIDTH_CHAR: 454 case ZERO_WIDTH_CHAR:
456 case NOCHAR: 455 case NOCHAR:
457 break; 456 break;
458 457
459 default: 458 default:
460 int w = 0;
461 while (len > 0 && *text == NOCHAR)
462 {
463 ++text;
464 --len;
465 w += r->TermWin.fwidth;
466 }
467
468 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, 459 XDrawRectangle (disp, d, gc, x + 2, y + 2,
469 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); 460 fwidth - 4, term->fheight - 4);
470 x += w;
471 } 461 }
472 462
473 x += r->TermWin.fwidth; 463 x += fwidth;
474 } 464 }
475} 465}
476 466
477///////////////////////////////////////////////////////////////////////////// 467/////////////////////////////////////////////////////////////////////////////
478 468
… …
481 471
482 void clear (); 472 void clear ();
483 473
484 rxvt_fontprop properties (); 474 rxvt_fontprop properties ();
485 475
486 bool load (const rxvt_fontprop &prop); 476 bool load (const rxvt_fontprop &prop, bool force_prop);
487 477
488 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;
489 479
490 void draw (rxvt_drawable &d, int x, int y, 480 void draw (rxvt_drawable &d, int x, int y,
491 const text_t *text, int len, 481 const text_t *text, int len,
492 int fg, int bg); 482 int fg, int bg);
493 483
494 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
495 XFontStruct *f; 485 XFontStruct *f;
496 codeset cs;
497 bool enc2b, encm; 486 bool enc2b, encm;
498 487
499 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 488 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
500 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 489 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
501 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 490 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
502 bool set_properties (rxvt_fontprop &p, const char *name); 491 bool set_properties (rxvt_fontprop &p, const char *name);
503}; 492};
504 493
505char * 494char *
506rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 495rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
507{ 496{
508 unsigned long value; 497 unsigned long value;
509 498
510 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 499 if (XGetFontProperty (f, property, &value))
511 return XGetAtomName (DISPLAY, value); 500 return XGetAtomName (term->dpy, value);
512 else 501 else
513 return rxvt_strdup (repl); 502 return rxvt_strdup (repl);
514} 503}
515 504
516rxvt_fontprop 505rxvt_fontprop
… …
522} 511}
523 512
524bool 513bool
525rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 514rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
526{ 515{
527 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 516 p.width = width != rxvt_fontprop::unset ? width
517 : avgwidth ? (avgwidth + 1) / 10
518 : (height + 1) / 2;
528 p.height = height; 519 p.height = height;
520 p.ascent = rxvt_fontprop::unset;
529 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 521 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
530 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 522 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
531 523
532 return true; 524 return true;
533} 525}
534 526
535bool 527bool
536rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 528rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
537{ 529{
538 unsigned long height; 530 unsigned long height;
531
532#if 0
539 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 533 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
540 return false; 534 return false;
535#else
536 height = f->ascent + f->descent;
537#endif
541 538
542 unsigned long avgwidth; 539 unsigned long avgwidth;
543 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 540 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
544 avgwidth = 0; 541 avgwidth = 0;
545 542
546 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 543 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
547 char *slant = get_property (f, "SLANT", "r"); 544 char *slant = get_property (f, term->xa [XA_SLANT], "r");
548 545
549 set_properties (p, height, weight, slant, avgwidth); 546 set_properties (p, height, weight, slant, avgwidth);
550 547
551 free (weight); 548 free (weight);
552 free (slant); 549 free (slant);
553 550
551 p.ascent = f->ascent;
552
554 return true; 553 return true;
555} 554}
556 555
557bool 556bool
558rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 557rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
559{ 558{
559 dTermDisplay;
560 int slashes = 0; 560 int slashes = 0;
561 const char *comp[13]; 561 const char *comp[13];
562 562
563 for (const char *c = name; *c; c++) 563 for (const char *c = name; *c; c++)
564 if (*c == '-') 564 if (*c == '-')
… …
572 if (slashes >= 13 572 if (slashes >= 13
573 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 573 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
574 && (*comp[11] >= '0' && *comp[11] <= '9')) 574 && (*comp[11] >= '0' && *comp[11] <= '9'))
575 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 575 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
576 576
577 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 577 XFontStruct *f = XLoadQueryFont (disp, name);
578 578
579 if (f) 579 if (f)
580 { 580 {
581 // the font should really exist now. if not, we have a problem 581 // the font should really exist now. if not, we have a problem
582 // (e.g. if the user did xset fp rehash just when we were searching fonts). 582 // (e.g. if the user did xset fp rehash just when we were searching fonts).
583 // in that case, just return garbage. 583 // in that case, just return garbage.
584 bool ret = set_properties (p, f); 584 bool ret = set_properties (p, f);
585 XFreeFont (DISPLAY, f); 585 XFreeFont (disp, f);
586 return ret; 586 return ret;
587 } 587 }
588 else 588 else
589 return false; 589 return false;
590} 590}
… …
626 return false; 626 return false;
627 } 627 }
628} 628}
629 629
630bool 630bool
631rxvt_font_x11::load (const rxvt_fontprop &prop) 631rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
632{ 632{
633 dTermDisplay;
634
633 clear (); 635 clear ();
634 636
635 char field_str[64]; // enough for 128 bits 637 char field_str[64]; // enough for 128 bits
636 638
637 // first morph the font if required 639 // first morph the font if required
638 if (prop.weight != rxvt_fontprop::unset 640 if (force_prop)
639 || prop.slant != rxvt_fontprop::unset)
640 { 641 {
641 char fname[1024]; 642 char fname[1024];
642 643
643 if (name[0] != '-') 644 if (name[0] != '-')
644 { 645 {
645 f = XLoadQueryFont (DISPLAY, name); 646 f = XLoadQueryFont (disp, name);
646 647
647 if (!f) 648 if (!f)
648 return false; 649 return false;
649 650
650 char *new_name = get_property (f, "FONT", name); 651 char *new_name = get_property (f, XA_FONT, name);
651 652
652 if (new_name) 653 if (new_name)
653 set_name (new_name); 654 set_name (new_name);
654 else 655 else
655 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 656 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
656 657
657 XFreeFont (DISPLAY, f); 658 XFreeFont (disp, f);
658 f = 0; 659 f = 0;
659 } 660 }
660 661
661 if (prop.weight != rxvt_fontprop::unset) 662 if (prop.weight != rxvt_fontprop::unset)
662 { 663 {
… …
673 ? "r" : "i"); // TODO: handle "o"blique, too 674 ? "r" : "i"); // TODO: handle "o"blique, too
674 set_name (strdup (fname)); 675 set_name (strdup (fname));
675 } 676 }
676 } 677 }
677 678
679 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
680 ? 0 : prop.height);
681
682 struct font_weight {
683 char *name;
684 int diff;
685
686 void clear ()
687 {
688 name = 0;
689 diff = 0x7fffffff;
690 }
691
692 font_weight () { clear (); }
693 ~font_weight () { free (name); }
694 };
695
678 char **list; 696 char **list;
679 int count; 697 int count;
680 list = XListFonts (DISPLAY, name, 1024, &count); 698 list = XListFonts (disp, name, 4000, &count);
681 699
682 set_name (0); 700 set_name (0);
683 701
684 if (!list) 702 if (!list)
685 return false; 703 return false;
686 704
687 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 705 font_weight *fonts = new font_weight[count];
688 ? 0 : prop.height);
689 706
690 int bestdiff = 0x7fffffff;
691 for (int i = 0; i < count; i++) 707 for (int i = 0; i < count; i++)
692 { 708 {
693 rxvt_fontprop p; 709 rxvt_fontprop p;
694 char fname[1024]; 710 char fname[1024];
695 711
696 int diff = 0; 712 int diff = 0;
697 713
698 if (replace_field (fname, list[i], 6, '0', field_str)) 714 if (replace_field (fname, list[i], 6, '0', field_str))
699 diff += 10; // slightly penalize scalable fonts 715 diff += 10; // slightly penalize scalable fonts
716 else if (replace_field (fname, list[i], 11, '0', "0"))
717 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
700 718
701 if (!set_properties (p, fname)) 719 if (!set_properties (p, fname))
702 continue; 720 continue;
703 721
704 if (prop.height != rxvt_fontprop::unset 722 if (prop.height != rxvt_fontprop::unset
… …
708 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 726 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
709 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 727 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
710 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 728 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
711 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 729 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
712 730
713 if (!name // compare against best found so far 731 fonts[i].name = strdup (fname);
714 || diff < bestdiff) 732 fonts[i].diff = diff;
715 {
716 set_name (strdup (fname));
717 bestdiff = diff;
718 }
719 } 733 }
720 734
721 XFreeFontNames (list); 735 XFreeFontNames (list);
722 736
723 if (!name) 737 // this loop only iterates when the guessed font-size is too small
724 return false; 738 for (;;)
739 {
740 font_weight *best = fonts + count - 1;
725 741
726 f = XLoadQueryFont (DISPLAY, name); 742 for (font_weight *w = best; w-- > fonts; )
743 if (w->diff <= best->diff)
744 best = w;
745
746 if (!best->name
747 || !(f = XLoadQueryFont (disp, best->name)))
748 break;
749
750 set_name (best->name);
751 best->clear ();
752
753 ascent = f->ascent;
754 descent = f->descent;
755 height = ascent + descent;
756
757 if (prop.height == rxvt_fontprop::unset
758 || height <= prop.height)
759 break; // font is ready for use
760
761 // PIXEL_SIZE small enough, but real height too large
762 clear ();
763 }
764
765 delete [] fonts;
727 766
728 if (!f) 767 if (!f)
729 return false; 768 return false;
730 769
731 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 770 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
732 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 771 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
733 772
734 if (registry && encoding) 773 if (registry && encoding)
735 { 774 {
736 char charset[64]; 775 char charset[64];
737 snprintf (charset, 64, "%s-%s", registry, encoding); 776 snprintf (charset, 64, "%s-%s", registry, encoding);
738 777
739 cs = codeset_from_name (charset); 778 cs = codeset_from_name (charset);
740 } 779 }
741 else 780 else
742 { 781 {
743 const char *charset = get_property (f, "FONT", 0); 782 const char *charset = get_property (f, XA_FONT, 0);
744 783
745 if (!charset) 784 if (!charset)
746 charset = name; 785 charset = name;
747 786
748 int count = 13; 787 int count = 13;
… …
760 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 799 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
761 800
762 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 801 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
763 enc2b = encm || f->max_char_or_byte2 > 255; 802 enc2b = encm || f->max_char_or_byte2 > 255;
764 803
765 ascent = f->ascent;
766 descent = f->descent;
767 height = ascent + descent;
768
769 slow = false; 804 slow = false;
770 805
771#if 1 // only used for slow detection, TODO optimize 806#if 1 // only used for slow detection, TODO optimize
772 if (f->min_bounds.width == f->max_bounds.width) 807 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
773 width = f->min_bounds.width;
774 else if (f->per_char == NULL)
775 width = f->max_bounds.width; 808 width = f->max_bounds.width;
776 else 809 else
777 { 810 {
778 slow = true; 811 slow = true;
779 812
… …
795 828
796 width = 1; 829 width = 1;
797 830
798 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 831 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
799 { 832 {
800 if (cs != CS_UNICODE
801 && *t > 0x100
802 && FROM_UNICODE (cs, *t) == NOCHAR) 833 if (FROM_UNICODE (cs, *t) == NOCHAR)
803 continue; 834 continue;
804 835
805 // ignore characters we wouldn't use anyways 836 // ignore characters we wouldn't use anyways
806 bool careful; 837 bool careful;
807 if (!has_char (*t, &prop, careful)) 838 if (!has_char (*t, &prop, careful))
… …
811 842
812 XCharStruct g; 843 XCharStruct g;
813 int dir_ret, asc_ret, des_ret; 844 int dir_ret, asc_ret, des_ret;
814 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 845 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
815 846
816 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 847 int wcw = WCWIDTH (*t);
848 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
817 849
818 if (width < g.width) width = g.width; 850 if (width < g.width) width = g.width;
819 } 851 }
820 852
821 if (cs == CS_UNKNOWN) 853 if (cs == CS_UNKNOWN)
822 { 854 {
823 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 855 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
840void 872void
841rxvt_font_x11::clear () 873rxvt_font_x11::clear ()
842{ 874{
843 if (f) 875 if (f)
844 { 876 {
845 XFreeFont (DISPLAY, f); 877 XFreeFont (term->dpy, f);
846 f = 0; 878 f = 0;
847 } 879 }
848} 880}
849 881
850bool 882bool
851rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 883rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
852{ 884{
853 uint32_t ch = FROM_UNICODE (cs, unicode); 885 uint32_t ch = FROM_UNICODE (cs, unicode);
854 886
855 if (ch == NOCHAR) 887 if (ch == NOCHAR)
856 return false; 888 return false;
… …
893 return false; 925 return false;
894 926
895 if (!prop || prop->width == rxvt_fontprop::unset) 927 if (!prop || prop->width == rxvt_fontprop::unset)
896 return true; 928 return true;
897 929
898 // check character against base font bounding box 930 // check wether character overlaps previous/next character
899 int w = xcs->width; 931 int w = xcs->rbearing - xcs->lbearing;
900 int wcw = wcwidth (unicode); 932 int wcw = max (WCWIDTH (unicode), 1);
901 if (wcw > 0) w /= wcw;
902 933
903 careful = w > prop->width; 934 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
904 if (careful && w > prop->width * MAX_OVERLAP >> 2) 935
936 if (careful && !OVERLAP_OK (w, wcw, prop))
905 return false; 937 return false;
906 938
907 return true; 939 return true;
908} 940}
909 941
… …
915 // this looks like a mess /. 947 // this looks like a mess /.
916 // and it is a mess /. 948 // and it is a mess /.
917 // yet we are trying to be perfect /. 949 // yet we are trying to be perfect /.
918 // but the result still isn't perfect /. 950 // but the result still isn't perfect /.
919 951
952 dTermDisplay;
953 dTermGC;
954
920 bool slow = this->slow 955 bool slow = this->slow
921 || width != r->TermWin.fwidth 956 || width != term->fwidth
922 || height != r->TermWin.fheight; 957 || height != term->fheight;
923 958
924 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 959 int base = ascent; // sorry, incorrect: term->fbase;
925 960
926 XGCValues v; 961 XGCValues v;
927 v.foreground = r->pix_colors[fg]; 962 v.foreground = term->pix_colors[fg];
928 v.font = f->fid; 963 v.font = f->fid;
929 964
930 if (enc2b) 965 if (enc2b)
931 { 966 {
932 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 967 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
933 968
934 if (bg == Color_bg && !slow) 969 if (bg == Color_bg && !slow)
935 { 970 {
936 v.background = r->pix_colors[bg]; 971 v.background = term->pix_colors[bg];
937 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 972 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
938 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 973 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
939 } 974 }
940 else 975 else
941 { 976 {
942 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 977 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
943 978
944 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 979 XChangeGC (disp, gc, GCForeground | GCFont, &v);
945 980
946 if (slow) 981 if (slow)
947 { 982 {
948 do 983 do
949 { 984 {
950 if (xc->byte1 || xc->byte2) 985 if (xc->byte1 || xc->byte2)
951 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 986 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
952 987
953 x += r->TermWin.fwidth; 988 x += term->fwidth;
954 xc++; len--; 989 xc++; len--;
955 } 990 }
956 while (len); 991 while (len);
957 } 992 }
958 else 993 else
959 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 994 XDrawString16 (disp, d, gc, x, y + base, xc, len);
960 } 995 }
961 } 996 }
962 else 997 else
963 { 998 {
964 const char *xc = enc_char (text, len, cs, slow); 999 const char *xc = enc_char (text, len, cs, slow);
965 1000
966 if (bg == Color_bg && !slow) 1001 if (bg == Color_bg && !slow)
967 { 1002 {
968 v.background = r->pix_colors[bg]; 1003 v.background = term->pix_colors[bg];
969 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1004 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
970 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1005 XDrawImageString (disp, d, gc, x, y + base, xc, len);
971 } 1006 }
972 else 1007 else
973 { 1008 {
974 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1009 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
975 1010
976 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1011 XChangeGC (disp, gc, GCForeground | GCFont, &v);
977 1012
978 if (slow) 1013 if (slow)
979 { 1014 {
980 do 1015 do
981 { 1016 {
982 if (*xc) 1017 if (*xc)
983 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1018 XDrawString (disp, d, gc, x, y + base, xc, 1);
984 1019
985 x += r->TermWin.fwidth; 1020 x += term->fwidth;
986 xc++; len--; 1021 xc++; len--;
987 } 1022 }
988 while (len); 1023 while (len);
989 } 1024 }
990 else 1025 else
991 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1026 XDrawString (disp, d, gc, x, y + base, xc, len);
992 } 1027 }
993 } 1028 }
994} 1029}
995 1030
996///////////////////////////////////////////////////////////////////////////// 1031/////////////////////////////////////////////////////////////////////////////
… …
1002 1037
1003 void clear (); 1038 void clear ();
1004 1039
1005 rxvt_fontprop properties (); 1040 rxvt_fontprop properties ();
1006 1041
1007 bool load (const rxvt_fontprop &prop); 1042 bool load (const rxvt_fontprop &prop, bool force_prop);
1008 1043
1009 void draw (rxvt_drawable &d, int x, int y, 1044 void draw (rxvt_drawable &d, int x, int y,
1010 const text_t *text, int len, 1045 const text_t *text, int len,
1011 int fg, int bg); 1046 int fg, int bg);
1012 1047
1013 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1048 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
1014 1049
1015protected: 1050protected:
1016 XftFont *f; 1051 XftFont *f;
1017}; 1052};
1018 1053
1019void 1054void
1020rxvt_font_xft::clear () 1055rxvt_font_xft::clear ()
1021{ 1056{
1022 if (f) 1057 if (f)
1023 { 1058 {
1024 XftFontClose (DISPLAY, f); 1059 XftFontClose (term->dpy, f);
1025 f = 0; 1060 f = 0;
1026 } 1061 }
1027} 1062}
1028 1063
1029rxvt_fontprop 1064rxvt_fontprop
… …
1033 1068
1034 FT_Face face = XftLockFace (f); 1069 FT_Face face = XftLockFace (f);
1035 1070
1036 p.width = width; 1071 p.width = width;
1037 p.height = height; 1072 p.height = height;
1073 p.ascent = ascent;
1038 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1074 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1039 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1075 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1040 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1076 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1041 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1077 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1042 1078
… …
1044 1080
1045 return p; 1081 return p;
1046} 1082}
1047 1083
1048bool 1084bool
1049rxvt_font_xft::load (const rxvt_fontprop &prop) 1085rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1050{ 1086{
1087 dTermDisplay;
1088
1051 clear (); 1089 clear ();
1052 1090
1053 FcPattern *p = FcNameParse ((FcChar8 *) name); 1091 FcPattern *p = FcNameParse ((FcChar8 *) name);
1054 1092
1055 if (!p) 1093 if (!p)
1056 return false; 1094 return false;
1057 1095
1058 FcValue v; 1096 FcValue v;
1059 1097
1060 if (prop.height != rxvt_fontprop::unset 1098 if (prop.height != rxvt_fontprop::unset
1061 || FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch) 1099 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1100 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1062 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1101 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1063 1102
1064 if (prop.weight != rxvt_fontprop::unset 1103 if (prop.weight != rxvt_fontprop::unset
1065 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1104 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1066 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1105 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1067 1106
1068 if (prop.slant != rxvt_fontprop::unset 1107 if (prop.slant != rxvt_fontprop::unset
1069 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1108 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1070 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1109 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1071 1110
1072#if 0 // clipping unfortunately destroys our precious double-width-characters 1111#if 0 // clipping unfortunately destroys our precious double-width-characters
1073 // clip width, we can't do better, or can we? 1112 // clip width, we can't do better, or can we?
1074 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1113 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1080 1119
1081 // store generated name so iso14755 view gives better results 1120 // store generated name so iso14755 view gives better results
1082 set_name ((char *)FcNameUnparse (p)); 1121 set_name ((char *)FcNameUnparse (p));
1083 1122
1084 XftResult result; 1123 XftResult result;
1085 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1124 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1086 1125
1087 FcPatternDestroy (p); 1126 FcPatternDestroy (p);
1088 1127
1089 if (!match) 1128 if (!match)
1090 return false; 1129 return false;
… …
1092 int ftheight = 0; 1131 int ftheight = 0;
1093 bool success = true; 1132 bool success = true;
1094 1133
1095 for (;;) 1134 for (;;)
1096 { 1135 {
1097 f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); 1136 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
1098 1137
1099 if (!f) 1138 if (!f)
1100 { 1139 {
1101 success = false; 1140 success = false;
1102 break; 1141 break;
… …
1111 1150
1112 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1151 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1113 1152
1114 XftUnlockFace (f); 1153 XftUnlockFace (f);
1115 1154
1155 int glheight = height;
1156
1116 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1157 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1117 { 1158 {
1118 FcChar16 ch = *t; 1159 FcChar16 ch = *t;
1119 1160
1120 if (cs != CS_UNICODE 1161 if (cs != CS_UNICODE
… …
1126 bool careful; 1167 bool careful;
1127 if (!has_char (*t, &prop, careful)) 1168 if (!has_char (*t, &prop, careful))
1128 continue; 1169 continue;
1129 1170
1130 XGlyphInfo g; 1171 XGlyphInfo g;
1131 XftTextExtents16 (DISPLAY, f, &ch, 1, &g); 1172 XftTextExtents16 (disp, f, &ch, 1, &g);
1132 1173
1174 g.width -= g.x;
1175
1133 int wcw = wcwidth (ch); 1176 int wcw = WCWIDTH (ch);
1134 if (wcw > 0) g.width = g.width / wcw; 1177 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1135 1178
1136 if (width < g.width) width = g.width; 1179 if (width < g.width ) width = g.width;
1137 if (height < g.height) height = g.height; 1180 if (height < g.height ) height = g.height;
1181 if (glheight < g.height - g.y) glheight = g.height - g.y;
1182 }
1183
1184 if (!width)
1185 {
1186 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1187
1188 XftFontClose (disp, f);
1189 f = 0;
1190
1191 success = false;
1192 break;
1138 } 1193 }
1139 1194
1140 if (prop.height == rxvt_fontprop::unset 1195 if (prop.height == rxvt_fontprop::unset
1141 || height <= prop.height 1196 || (height <= prop.height && glheight <= prop.height)
1142 || height <= 2 1197 || height <= 2
1143 || !scalable) 1198 || !scalable)
1144 break; 1199 break;
1145 1200
1146 if (ftheight) 1201 if (ftheight)
… …
1153 ftheight -= height - prop.height; 1208 ftheight -= height - prop.height;
1154 } 1209 }
1155 else 1210 else
1156 ftheight = prop.height - 1; 1211 ftheight = prop.height - 1;
1157 1212
1158 XftFontClose (DISPLAY, f); 1213 XftFontClose (disp, f);
1159 FcPatternDel (match, FC_PIXEL_SIZE); 1214 FcPatternDel (match, FC_PIXEL_SIZE);
1160 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1215 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1161 } 1216 }
1162 1217
1163 FcPatternDestroy (match); 1218 FcPatternDestroy (match);
1164 1219
1165#if 0 // do it per-character 1220#if 0 // do it per-character
… …
1172 1227
1173 return success; 1228 return success;
1174} 1229}
1175 1230
1176bool 1231bool
1177rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1232rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1178{ 1233{
1179 careful = false; 1234 careful = false;
1180 1235
1181 if (!XftCharExists (DISPLAY, f, unicode)) 1236 if (!XftCharExists (term->dpy, f, unicode))
1182 return false; 1237 return false;
1183 1238
1184 if (!prop || prop->width == rxvt_fontprop::unset) 1239 if (!prop || prop->width == rxvt_fontprop::unset)
1185 return true; 1240 return true;
1186 1241
1187 // check character against base font bounding box 1242 // check character against base font bounding box
1188 FcChar32 ch = unicode; 1243 FcChar32 ch = unicode;
1189 XGlyphInfo g; 1244 XGlyphInfo g;
1190 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1245 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1191 1246
1192 int w = g.width; 1247 int w = g.width - g.x;
1193 int wcw = wcwidth (unicode); 1248 int wcw = max (WCWIDTH (unicode), 1);
1194 if (wcw > 0) w /= wcw;
1195 1249
1196 careful = w > prop->width; 1250 careful = g.x > 0 || w > prop->width * wcw;
1197 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1251
1252 if (careful && !OVERLAP_OK (w, wcw, prop))
1253 return false;
1254
1255 // this weeds out _totally_ broken fonts, or glyphs
1256 if (!OVERLAP_OK (g.xOff, wcw, prop))
1198 return false; 1257 return false;
1199 1258
1200 return true; 1259 return true;
1201} 1260}
1202 1261
1203void 1262void
1204rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1263rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1205 const text_t *text, int len, 1264 const text_t *text, int len,
1206 int fg, int bg) 1265 int fg, int bg)
1207{ 1266{
1208 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
1209
1210 int base = ascent; // should be fbase, but that is incorrect
1211
1212 XGlyphInfo extents; 1267 XGlyphInfo extents;
1213 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1268 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1214 FcChar32 *ep = enc; 1269 XftGlyphSpec *ep = enc;
1215 int ewidth = 0; 1270
1216 int xoff = 0; 1271 dTermDisplay;
1272 dTermGC;
1273
1274 int w = term->fwidth * len;
1275 int h = term->fheight;
1276
1277 bool buffered = bg >= 0 // we don't use a transparent bg
1278#ifndef FORCE_UNBUFFERED_XFT
1279# ifdef ENABLE_TRANSPARENCY
1280 || !term->am_transparent // we aren't transparent
1281# endif
1282#endif
1283 ;
1284
1285 // cut trailing spaces
1286 while (len && text [len - 1] == ' ')
1287 len--;
1288
1289 int x_ = buffered ? 0 : x;
1290 int y_ = buffered ? 0 : y;
1217 1291
1218 while (len) 1292 while (len)
1219 { 1293 {
1220 int cwidth = r->TermWin.fwidth; 1294 int cwidth = term->fwidth;
1221 FcChar32 fc = *text++; len--; 1295 FcChar32 fc = *text++; len--;
1222 FT_UInt gl;
1223 1296
1224 while (len && *text == NOCHAR) 1297 while (len && *text == NOCHAR)
1225 text++, len--, cwidth += r->TermWin.fwidth; 1298 text++, len--, cwidth += term->fwidth;
1226 1299
1227 gl = XftCharIndex (d.display->display, f, fc); 1300 if (fc != ' ') // skip spaces
1228 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1229
1230 if (extents.xOff != cwidth && ep != enc)
1231 {
1232 if (xoff > ewidth) xoff = ewidth;
1233 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1234 x + (ewidth - xoff >> 1),
1235 y + base, enc, ep - enc);
1236 x += ewidth;
1237
1238 ep = enc;
1239 ewidth = 0;
1240 xoff = 0;
1241 } 1301 {
1302 FT_UInt glyph = XftCharIndex (disp, f, fc);
1303 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1242 1304
1243 if (fc == ' ' && ep == enc) // skip leading spaces 1305 ep->glyph = glyph;
1306 ep->x = x_ + (cwidth - extents.xOff >> 1);
1307 ep->y = y_ + ascent;
1308
1309 if (extents.xOff == 0)
1310 ep->x = x_ + cwidth;
1311
1312 ep++;
1244 { 1313 }
1314
1245 x += cwidth; 1315 x_ += cwidth;
1246 continue; 1316 }
1317
1318 if (buffered)
1319 {
1320 if (ep != enc)
1247 } 1321 {
1322 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1248 1323
1324 if (0)
1325 ;
1326#ifdef HAVE_BG_PIXMAP
1327 else if (bg < 0 && term->bgPixmap.pixmap)
1328 {
1329 if (term->bgPixmap.pmap_width >= x + term->window_vt_x+w
1330 && term->bgPixmap.pmap_height >= y + term->window_vt_y+h)
1331 {
1332 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1333 x + term->window_vt_x, y + term->window_vt_y,
1334 w, h, 0, 0);
1335 }
1336 else
1337 {
1338 XGCValues gcv;
1339
1340 gcv.fill_style = FillTiled;
1341 gcv.tile = term->bgPixmap.pixmap;
1342 gcv.ts_x_origin = -x;
1343 gcv.ts_y_origin = -y;
1344
1345#if 0
1346 GC gc2 = XCreateGC (disp, d2,
1347 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1348 &gcv);
1349#endif
1350 XChangeGC (disp, gc,
1351 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1352 &gcv);
1353
1354 XFillRectangle (disp, d2, gc/*gc2*/, 0, 0, w, h);
1355
1356 gcv.fill_style = FillSolid;
1357 XChangeGC (disp, gc, GCFillStyle, &gcv);
1358 /* XFreeGC (disp, gc2); */
1359
1360 }
1361 }
1362#endif
1363 else
1364 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1365
1366 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1367 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1368 }
1249 else 1369 else
1250 { 1370 clear_rect (d, x, y, w, h, bg);
1251 *ep++ = gl;
1252 ewidth += cwidth;
1253 xoff += extents.xOff;
1254 }
1255 }
1256
1257 if (ep != enc)
1258 { 1371 }
1259 if (xoff > ewidth) xoff = ewidth; 1372 else
1260 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1261 x + (ewidth - xoff >> 1),
1262 y + base, enc, ep - enc);
1263 } 1373 {
1374 clear_rect (d, x, y, w, h, bg);
1375 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1376 }
1264} 1377}
1378
1265#endif 1379#endif
1266 1380
1267///////////////////////////////////////////////////////////////////////////// 1381/////////////////////////////////////////////////////////////////////////////
1268 1382
1269rxvt_fontset::rxvt_fontset (rxvt_t r) 1383rxvt_fontset::rxvt_fontset (rxvt_term *term)
1270: r (r), fontdesc (0) 1384: fontdesc (0), term (term)
1271{ 1385{
1272 clear (); 1386 clear ();
1273} 1387}
1274 1388
1275rxvt_fontset::~rxvt_fontset () 1389rxvt_fontset::~rxvt_fontset ()
… …
1278} 1392}
1279 1393
1280void 1394void
1281rxvt_fontset::clear () 1395rxvt_fontset::clear ()
1282{ 1396{
1283 prop.width = prop.height = prop.weight = prop.slant 1397 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1284 = rxvt_fontprop::unset; 1398 = rxvt_fontprop::unset;
1399 force_prop = false;
1285 1400
1286 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1401 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1287 FONT_UNREF (*i); 1402 FONT_UNREF (*i);
1288 1403
1289 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1404 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1319 f = new rxvt_font_x11; 1434 f = new rxvt_font_x11;
1320 } 1435 }
1321 else 1436 else
1322 f = new rxvt_font_x11; 1437 f = new rxvt_font_x11;
1323 1438
1324 f->set_term (r); 1439 f->set_term (term);
1325 f->set_name (strdup (name)); 1440 f->set_name (strdup (name));
1326 1441
1327 f->cs = cs; 1442 f->cs = cs;
1328 f->loaded = false; 1443 f->loaded = false;
1329 1444
… …
1340 char buf[512]; 1455 char buf[512];
1341 const char *end; 1456 const char *end;
1342 1457
1343 do 1458 do
1344 { 1459 {
1345 while (*desc <= ' ') desc++; 1460 while (*desc && *desc <= ' ')
1461 desc++;
1346 1462
1347 codeset cs = CS_UNICODE; 1463 codeset cs = CS_UNICODE;
1348 1464
1349 if (*desc == '[') 1465 if (*desc == '[')
1350 { 1466 {
… …
1400 if (fonts[i]->loaded) 1516 if (fonts[i]->loaded)
1401 return true; 1517 return true;
1402 1518
1403 fonts[i]->loaded = true; 1519 fonts[i]->loaded = true;
1404 1520
1405 if (!fonts[i]->load (prop)) 1521 if (!fonts[i]->load (prop, force_prop))
1406 { 1522 {
1407 fonts[i]->cs = CS_UNKNOWN; 1523 fonts[i]->cs = CS_UNKNOWN;
1408 return false; 1524 return false;
1409 } 1525 }
1410 1526
… …
1460 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1576 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1461 goto next_font; 1577 goto next_font;
1462 1578
1463 if (!realize_font (i)) 1579 if (!realize_font (i))
1464 goto next_font; 1580 goto next_font;
1581
1582 if (prop.ascent != rxvt_fontprop::unset)
1583 max_it (f->ascent, prop.ascent);
1465 } 1584 }
1466 1585
1467 if (f->cs == CS_UNKNOWN) 1586 if (f->cs == CS_UNKNOWN)
1468 goto next_font; 1587 goto next_font;
1469 1588
… …
1508 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1627 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1509 FcPatternAddBool (p, FC_MINSPACE, 1); 1628 FcPatternAddBool (p, FC_MINSPACE, 1);
1510 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1629 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1511 1630
1512 XftResult result; 1631 XftResult result;
1513 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1632 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1514 1633
1515 FcPatternDestroy (p); 1634 FcPatternDestroy (p);
1516 1635
1517 if (match) 1636 if (match)
1518 { 1637 {

Diff Legend

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