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.56 by root, Fri Dec 10 19:55:55 2004 UTC vs.
Revision 1.120 by ayin, Mon Oct 22 07:36:51 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" },
… …
92 97
93#if ENCODING_ZH || ENCODING_ZH_EXT 98#if ENCODING_ZH || ENCODING_ZH_EXT
94# if XFT 99# if XFT
95 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 100 { CS_GBK_0, "xft:AR PL KaitiM GB" },
96 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 101 { CS_GBK_0, "xft:AR PL SungtiL GB" },
97 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 102 { CS_GBK_0, "xft::lang=zh" },
98 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
99 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 104 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
100 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
101 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 106 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
102 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 107 { CS_GB2312_1980_0, "xft::lang=zh" },
103# endif 108# endif
104 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 109 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
105 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 110 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
106 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 111 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
107 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 112 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
120#if ENCODING_KR 125#if ENCODING_KR
121 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 126 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
122 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 127 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
123# if XFT 128# if XFT
124 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
125 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
126# endif 131# endif
127#endif 132#endif
128 133
129 // generic font fallback
130 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 134 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
131 { 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.
132 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
133 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
134#if XFT 136#if XFT
135 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"}, 137 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
136 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 138 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Andale Mono:antialias=false" }, 139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
138 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, 140 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
139 141
140 // FreeMono is usually uglier than x fonts, so try last only. 142 // FreeMono is usually uglier than x fonts, so try after the others
141 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 143 { CS_UNICODE, "xft:FreeMono:autohint=true" },
142#endif 144#endif
143 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" },
144 { CS_UNKNOWN, 0 } 150 { CS_UNKNOWN, 0 }
145}; 151};
146 152
147// these characters are used to guess the font height and width 153// these characters are used to guess the font height and width
148// 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.
149static uint16_t extent_test_chars[] = { 155static uint16_t extent_test_chars[] = {
150 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 156 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
151 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 157 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
152 0x304c, 0x672c, // が本 158 0x304c, 0x672c, // が本
153}; 159};
154 160
155#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]))
156 162
163#define dTermDisplay Display *disp = term->dpy
164#define dTermGC GC gc = term->gc
165
157///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
158
159#if XFT
160rxvt_drawable::~rxvt_drawable ()
161{
162 if (xftdrawable)
163 XftDrawDestroy (xftdrawable);
164}
165
166rxvt_drawable::operator XftDraw *()
167{
168 if (!xftdrawable)
169 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
170
171 return xftdrawable;
172}
173#endif
174
175/////////////////////////////////////////////////////////////////////////////
176
177static void *enc_buf;
178static uint32_t enc_len;
179
180static inline void *
181get_enc_buf (uint32_t len)
182{
183 if (len > enc_len)
184 {
185 free (enc_buf);
186 enc_buf = malloc (len);
187 enc_len = len;
188 }
189
190 return enc_buf;
191}
192 167
193static const char * 168static const char *
194enc_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)
195{ 170{
196 uint8_t *buf = (uint8_t *)get_enc_buf (len); 171 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
172 uint8_t *res = buf;
197 173
198 while (len--) 174 while (len--)
199 { 175 {
200 uint32_t c = FROM_UNICODE (cs, *text++); 176 uint32_t c = FROM_UNICODE (cs, *text++);
201 177
… …
206 } 182 }
207 183
208 *buf++ = c; 184 *buf++ = c;
209 } 185 }
210 186
211 return (const char *)enc_buf; 187 return (const char *)res;
212} 188}
213 189
214static const XChar2b * 190static const XChar2b *
215enc_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)
216{ 192{
217 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 193 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
194 XChar2b *res = buf;
218 195
219 while (len--) 196 while (len--)
220 { 197 {
221 uint32_t c = FROM_UNICODE (cs, *text++); 198 uint32_t c = FROM_UNICODE (cs, *text++);
222 199
… …
229 buf->byte1 = c >> 8; 206 buf->byte1 = c >> 8;
230 buf->byte2 = c; 207 buf->byte2 = c;
231 buf++; 208 buf++;
232 } 209 }
233 210
234 return (XChar2b *)enc_buf; 211 return res;
235} 212}
236 213
237///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
215
216rxvt_font::rxvt_font ()
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{
219}
238 220
239void 221void
240rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name)
241{ 223{
242 if (this->name == name) 224 if (this->name == name)
… …
245 if (this->name) free (this->name); // let the compiler optimize 227 if (this->name) free (this->name); // let the compiler optimize
246 this->name = name; 228 this->name = name;
247} 229}
248 230
249void 231void
250rxvt_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
251{ 233{
252 if (color == Color_bg) 234 dTermDisplay;
253 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);
254 else if (color >= 0) 239 else if (color >= 0)
255 { 240 {
256#if XFT 241#if XFT
242 bool done = false;
243#ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00)
245 {
246 Picture dst = XftDrawPicture (d);
247 if (dst != 0)
248 {
249 XClearArea (disp, d, x, y, w, h, false);
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
251 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 done = true;
253 }
254 }
255#endif
256 if (!done)
257 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258#else 258#else
259 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 261#endif
262 } 262 }
263} 263}
264
265/////////////////////////////////////////////////////////////////////////////
264 266
265#include "table/linedraw.h" 267#include "table/linedraw.h"
266 268
267struct rxvt_font_default : rxvt_font { 269struct rxvt_font_default : rxvt_font {
268 struct rxvt_fontset *fs; 270 struct rxvt_fontset *fs;
… …
276 rxvt_fontprop properties () 278 rxvt_fontprop properties ()
277 { 279 {
278 rxvt_fontprop p; 280 rxvt_fontprop p;
279 281
280 p.width = p.height = 1; 282 p.width = p.height = 1;
283 p.ascent = rxvt_fontprop::unset;
281 p.weight = rxvt_fontprop::medium; 284 p.weight = rxvt_fontprop::medium;
282 p.slant = rxvt_fontprop::roman; 285 p.slant = rxvt_fontprop::roman;
283 286
284 return p; 287 return p;
285 } 288 }
286 289
287 bool load (const rxvt_fontprop &prop) 290 bool load (const rxvt_fontprop &prop, bool force_prop)
288 { 291 {
289 width = 1; height = 1; 292 width = 1; height = 1;
290 ascent = 1; descent = 0; 293 ascent = 1; descent = 0;
291 294
292 set_name (strdup ("built-in support font")); 295 set_name (strdup ("built-in support font"));
293 296
294 return true; 297 return true;
295 } 298 }
296 299
297 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 300 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
298 { 301 {
299 careful = false; 302 careful = false;
300 303
301 if (unicode <= 0x001f) 304 if (unicode <= 0x001f)
302 return true; 305 return true;
… …
305 return false; 308 return false;
306 309
307 if (unicode <= 0x009f) 310 if (unicode <= 0x009f)
308 return true; 311 return true;
309 312
310 if (unicode >= 0x2500 && unicode <= 0x259f) 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
314 !term->option (Opt_skipBuiltinGlyphs))
311 return true; 315 return true;
312 316
313 if (IS_COMPOSE (unicode)) 317 if (IS_COMPOSE (unicode))
314 return true; 318 return true;
315 319
… …
331void 335void
332rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 336rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
333 const text_t *text, int len, 337 const text_t *text, int len,
334 int fg, int bg) 338 int fg, int bg)
335{ 339{
340 dTermDisplay;
341 dTermGC;
342
336 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 343 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
337 344
338 XSetForeground (d.display->display, TGC, r->pix_colors[fg]); 345 XSetForeground (disp, gc, term->pix_colors[fg]);
339 346
340 while (len) 347 while (len)
341 { 348 {
342#if ENABLE_COMBINING 349#if ENABLE_COMBINING
343 compose_char *cc; 350 compose_char *cc;
… …
347 354
348 while (++text, --len && *text == NOCHAR) 355 while (++text, --len && *text == NOCHAR)
349 ; 356 ;
350 357
351 int width = text - tp; 358 int width = text - tp;
352 int fwidth = r->TermWin.fwidth * width; 359 int fwidth = term->fwidth * width;
353 360
354 if (0x2500 <= t && t <= 0x259f) 361 if (0x2500 <= t && t <= 0x259f)
355 { 362 {
356 uint16_t offs = linedraw_offs[t - 0x2500]; 363 uint16_t offs = linedraw_offs[t - 0x2500];
357 uint32_t *a = linedraw_command + (offs >> 4); 364 uint32_t *a = linedraw_command + (offs >> 4);
358 uint32_t *b = a + (offs & 15); 365 uint32_t *b = a + (offs & 15);
359 366
360 int W = fwidth; 367 int W = fwidth;
361 int H = r->TermWin.fheight; 368 int H = term->fheight;
362 369
363 int x_[16]; 370 int x_[16];
364 int y_[16]; 371 int y_[16];
365 372
366 for (int i = 0; i <= 8; i++) 373 for (int i = 0; i <= 8; i++)
… …
374 381
375 XGCValues gcv; 382 XGCValues gcv;
376 383
377 gcv.cap_style = CapButt; 384 gcv.cap_style = CapButt;
378 gcv.line_width = 0; 385 gcv.line_width = 0;
379 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 386 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
380 387
381 while (a < b) 388 while (a < b)
382 { 389 {
383 uint32_t command = *a++; 390 uint32_t command = *a++;
384 391
… …
391 int y2 = y_[(command >> 0) & 15]; 398 int y2 = y_[(command >> 0) & 15];
392 399
393 switch (op) 400 switch (op)
394 { 401 {
395 case 0: // line 402 case 0: // line
396 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 403 XDrawLine (disp, d, gc, x1, y1, x2, y2);
397 break; 404 break;
398 405
399 case 1: // rectangle, possibly stippled 406 case 1: // rectangle, possibly stippled
400 if (a) 407 if (a)
401 { 408 {
402 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 409 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
403 410
404 gcv.fill_style = FillStippled; 411 gcv.fill_style = FillStippled;
405 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 412 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
406 gcv.ts_x_origin = x; 413 gcv.ts_x_origin = x;
407 gcv.ts_y_origin = y; 414 gcv.ts_y_origin = y;
408 415
409 XChangeGC (d.display->display, TGC, 416 XChangeGC (disp, gc,
410 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 417 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
411 &gcv); 418 &gcv);
412 } 419 }
413 420
414 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 421 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
415 422
416 if (a) 423 if (a)
417 { 424 {
418 XFreePixmap (d.display->display, gcv.stipple); 425 XFreePixmap (disp, gcv.stipple);
419 gcv.stipple = 0; 426 gcv.stipple = 0;
420 gcv.fill_style = FillSolid; 427 gcv.fill_style = FillSolid;
421 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 428 XChangeGC (disp, gc, GCFillStyle, &gcv);
422 } 429 }
423 break; 430 break;
424 case 2: // arc 431 case 2: // arc
425 XDrawArc (d.display->display, d, TGC, 432 XDrawArc (disp, d, gc,
426 x1 - W/2, y1 - H/2, W-1, H-1, 433 x1 - W/2, y1 - H/2, W-1, H-1,
427 (a - 1) * 90*64, (b - 1) * 90*64); 434 (a - 1) * 90*64, (b - 1) * 90*64);
428 break; 435 break;
429 } 436 }
430 } 437 }
431 } 438 }
432#if ENABLE_COMBINING 439#if ENABLE_COMBINING
433 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 440 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
434 { 441 {
442 min_it (width, 2); // we only support wcwidth up to 2
443
435 text_t chrs[2]; 444 text_t chrs[2];
436 width = min (2, width);
437 chrs [1] = NOCHAR; 445 chrs [1] = NOCHAR;
438 446
439 *chrs = cc->c1; 447 *chrs = cc->c1;
440 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 448 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
441 f1->draw (d, x, y, chrs, width, fg, bg); 449 f1->draw (d, x, y, chrs, width, fg, bg);
… …
448 *chrs = cc->c2; 456 *chrs = cc->c2;
449 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 457 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
450 ? f1 458 ? f1
451 : (*fs)[fs->find_font (cc->c2)]; 459 : (*fs)[fs->find_font (cc->c2)];
452 460
453 f2->draw (d, x, y, chrs, width, fg, -1); 461 f2->draw (d, x, y, chrs, width, fg, Color_none);
454 } 462 }
455 } 463 }
456#endif 464#endif
457 else 465 else
458 switch (t) 466 switch (t)
… …
461 case ZERO_WIDTH_CHAR: 469 case ZERO_WIDTH_CHAR:
462 case NOCHAR: 470 case NOCHAR:
463 break; 471 break;
464 472
465 default: 473 default:
466 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, 474 XDrawRectangle (disp, d, gc, x + 2, y + 2,
467 fwidth - 4, r->TermWin.fheight - 4); 475 fwidth - 4, term->fheight - 4);
468 } 476 }
469 477
470 x += fwidth; 478 x += fwidth;
471 } 479 }
472} 480}
… …
478 486
479 void clear (); 487 void clear ();
480 488
481 rxvt_fontprop properties (); 489 rxvt_fontprop properties ();
482 490
483 bool load (const rxvt_fontprop &prop); 491 bool load (const rxvt_fontprop &prop, bool force_prop);
484 492
485 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 493 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
486 494
487 void draw (rxvt_drawable &d, int x, int y, 495 void draw (rxvt_drawable &d, int x, int y,
488 const text_t *text, int len, 496 const text_t *text, int len,
489 int fg, int bg); 497 int fg, int bg);
490 498
491 bool slow; // wether this is a proportional font or has other funny characteristics 499 bool slow; // wether this is a proportional font or has other funny characteristics
492 XFontStruct *f; 500 XFontStruct *f;
493 codeset cs;
494 bool enc2b, encm; 501 bool enc2b, encm;
495 502
496 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 503 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
497 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 504 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
498 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 505 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
499 bool set_properties (rxvt_fontprop &p, const char *name); 506 bool set_properties (rxvt_fontprop &p, const char *name);
500}; 507};
501 508
502char * 509char *
503rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 510rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
504{ 511{
505 unsigned long value; 512 unsigned long value;
506 513
507 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 514 if (XGetFontProperty (f, property, &value))
508 return XGetAtomName (DISPLAY, value); 515 return XGetAtomName (term->dpy, value);
509 else 516 else
510 return rxvt_strdup (repl); 517 return rxvt_strdup (repl);
511} 518}
512 519
513rxvt_fontprop 520rxvt_fontprop
… …
519} 526}
520 527
521bool 528bool
522rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 529rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
523{ 530{
524 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 531 p.width = width != rxvt_fontprop::unset ? width
532 : avgwidth ? (avgwidth + 1) / 10
533 : (height + 1) / 2;
525 p.height = height; 534 p.height = height;
535 p.ascent = rxvt_fontprop::unset;
526 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 536 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
527 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 537 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
528 538
529 return true; 539 return true;
530} 540}
531 541
532bool 542bool
533rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 543rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
534{ 544{
535 unsigned long height; 545 unsigned long height;
546
547#if 0
536 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 548 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
537 return false; 549 return false;
550#else
551 height = f->ascent + f->descent;
552#endif
538 553
539 unsigned long avgwidth; 554 unsigned long avgwidth;
540 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 555 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
541 avgwidth = 0; 556 avgwidth = 0;
542 557
543 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 558 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
544 char *slant = get_property (f, "SLANT", "r"); 559 char *slant = get_property (f, term->xa [XA_SLANT], "r");
545 560
546 set_properties (p, height, weight, slant, avgwidth); 561 set_properties (p, height, weight, slant, avgwidth);
547 562
548 free (weight); 563 free (weight);
549 free (slant); 564 free (slant);
550 565
566 p.ascent = f->ascent;
567
551 return true; 568 return true;
552} 569}
553 570
554bool 571bool
555rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 572rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
556{ 573{
574 dTermDisplay;
557 int slashes = 0; 575 int slashes = 0;
558 const char *comp[13]; 576 const char *comp[13];
559 577
560 for (const char *c = name; *c; c++) 578 for (const char *c = name; *c; c++)
561 if (*c == '-') 579 if (*c == '-')
… …
569 if (slashes >= 13 587 if (slashes >= 13
570 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 588 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
571 && (*comp[11] >= '0' && *comp[11] <= '9')) 589 && (*comp[11] >= '0' && *comp[11] <= '9'))
572 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 590 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
573 591
574 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 592 XFontStruct *f = XLoadQueryFont (disp, name);
575 593
576 if (f) 594 if (f)
577 { 595 {
578 // the font should really exist now. if not, we have a problem 596 // the font should really exist now. if not, we have a problem
579 // (e.g. if the user did xset fp rehash just when we were searching fonts). 597 // (e.g. if the user did xset fp rehash just when we were searching fonts).
580 // in that case, just return garbage. 598 // in that case, just return garbage.
581 bool ret = set_properties (p, f); 599 bool ret = set_properties (p, f);
582 XFreeFont (DISPLAY, f); 600 XFreeFont (disp, f);
583 return ret; 601 return ret;
584 } 602 }
585 else 603 else
586 return false; 604 return false;
587} 605}
… …
623 return false; 641 return false;
624 } 642 }
625} 643}
626 644
627bool 645bool
628rxvt_font_x11::load (const rxvt_fontprop &prop) 646rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
629{ 647{
648 dTermDisplay;
649
630 clear (); 650 clear ();
631 651
632 char field_str[64]; // enough for 128 bits 652 char field_str[64]; // enough for 128 bits
633 653
634 // first morph the font if required 654 // first morph the font if required
635 if (prop.weight != rxvt_fontprop::unset 655 if (force_prop)
636 || prop.slant != rxvt_fontprop::unset)
637 { 656 {
638 char fname[1024]; 657 char fname[1024];
639 658
640 if (name[0] != '-') 659 if (name[0] != '-')
641 { 660 {
642 f = XLoadQueryFont (DISPLAY, name); 661 f = XLoadQueryFont (disp, name);
643 662
644 if (!f) 663 if (!f)
645 return false; 664 return false;
646 665
647 char *new_name = get_property (f, "FONT", name); 666 char *new_name = get_property (f, XA_FONT, name);
648 667
649 if (new_name) 668 if (new_name)
650 set_name (new_name); 669 set_name (new_name);
651 else 670 else
652 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 671 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
653 672
654 XFreeFont (DISPLAY, f); 673 XFreeFont (disp, f);
655 f = 0; 674 f = 0;
656 } 675 }
657 676
658 if (prop.weight != rxvt_fontprop::unset) 677 if (prop.weight != rxvt_fontprop::unset)
659 { 678 {
… …
670 ? "r" : "i"); // TODO: handle "o"blique, too 689 ? "r" : "i"); // TODO: handle "o"blique, too
671 set_name (strdup (fname)); 690 set_name (strdup (fname));
672 } 691 }
673 } 692 }
674 693
694 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
695 ? 0 : prop.height);
696
697 struct font_weight {
698 char *name;
699 int diff;
700
701 void clear ()
702 {
703 name = 0;
704 diff = 0x7fffffff;
705 }
706
707 font_weight () { clear (); }
708 ~font_weight () { free (name); }
709 };
710
675 char **list; 711 char **list;
676 int count; 712 int count;
677 list = XListFonts (DISPLAY, name, 1024, &count); 713 list = XListFonts (disp, name, 4000, &count);
678 714
679 set_name (0); 715 set_name (0);
680 716
681 if (!list) 717 if (!list)
682 return false; 718 return false;
683 719
684 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 720 font_weight *fonts = new font_weight[count];
685 ? 0 : prop.height);
686 721
687 int bestdiff = 0x7fffffff;
688 for (int i = 0; i < count; i++) 722 for (int i = 0; i < count; i++)
689 { 723 {
690 rxvt_fontprop p; 724 rxvt_fontprop p;
691 char fname[1024]; 725 char fname[1024];
692 726
693 int diff = 0; 727 int diff = 0;
694 728
695 if (replace_field (fname, list[i], 6, '0', field_str)) 729 if (replace_field (fname, list[i], 6, '0', field_str))
696 diff += 10; // slightly penalize scalable fonts 730 diff += 10; // slightly penalize scalable fonts
731 else if (replace_field (fname, list[i], 11, '0', "0"))
732 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
697 733
698 if (!set_properties (p, fname)) 734 if (!set_properties (p, fname))
699 continue; 735 continue;
700 736
701 if (prop.height != rxvt_fontprop::unset 737 if (prop.height != rxvt_fontprop::unset
… …
705 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 741 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
706 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 742 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
707 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 743 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
708 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 744 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
709 745
710 if (!name // compare against best found so far 746 fonts[i].name = strdup (fname);
711 || diff < bestdiff) 747 fonts[i].diff = diff;
712 {
713 set_name (strdup (fname));
714 bestdiff = diff;
715 }
716 } 748 }
717 749
718 XFreeFontNames (list); 750 XFreeFontNames (list);
719 751
720 if (!name) 752 // this loop only iterates when the guessed font-size is too small
721 return false; 753 for (;;)
754 {
755 font_weight *best = fonts + count - 1;
722 756
723 f = XLoadQueryFont (DISPLAY, name); 757 for (font_weight *w = best; w-- > fonts; )
758 if (w->diff <= best->diff)
759 best = w;
760
761 if (!best->name
762 || !(f = XLoadQueryFont (disp, best->name)))
763 break;
764
765 set_name (best->name);
766 best->clear ();
767
768 ascent = f->ascent;
769 descent = f->descent;
770 height = ascent + descent;
771
772 if (prop.height == rxvt_fontprop::unset
773 || height <= prop.height)
774 break; // font is ready for use
775
776 // PIXEL_SIZE small enough, but real height too large
777 clear ();
778 }
779
780 delete [] fonts;
724 781
725 if (!f) 782 if (!f)
726 return false; 783 return false;
727 784
728 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 785 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
729 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 786 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
730 787
731 if (registry && encoding) 788 if (registry && encoding)
732 { 789 {
733 char charset[64]; 790 char charset[64];
734 snprintf (charset, 64, "%s-%s", registry, encoding); 791 snprintf (charset, 64, "%s-%s", registry, encoding);
735 792
736 cs = codeset_from_name (charset); 793 cs = codeset_from_name (charset);
737 } 794 }
738 else 795 else
739 { 796 {
740 const char *charset = get_property (f, "FONT", 0); 797 const char *charset = get_property (f, XA_FONT, 0);
741 798
742 if (!charset) 799 if (!charset)
743 charset = name; 800 charset = name;
744 801
745 int count = 13; 802 int count = 13;
… …
757 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 814 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
758 815
759 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 816 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
760 enc2b = encm || f->max_char_or_byte2 > 255; 817 enc2b = encm || f->max_char_or_byte2 > 255;
761 818
762 ascent = f->ascent;
763 descent = f->descent;
764 height = ascent + descent;
765
766 slow = false; 819 slow = false;
767 820
768#if 1 // only used for slow detection, TODO optimize 821#if 1 // only used for slow detection, TODO optimize
769 if (f->min_bounds.width == f->max_bounds.width) 822 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
770 width = f->min_bounds.width;
771 else if (f->per_char == NULL)
772 width = f->max_bounds.width; 823 width = f->max_bounds.width;
773 else 824 else
774 { 825 {
775 slow = true; 826 slow = true;
776 827
… …
792 843
793 width = 1; 844 width = 1;
794 845
795 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 846 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
796 { 847 {
797 if (cs != CS_UNICODE
798 && *t > 0x100
799 && FROM_UNICODE (cs, *t) == NOCHAR) 848 if (FROM_UNICODE (cs, *t) == NOCHAR)
800 continue; 849 continue;
801 850
802 // ignore characters we wouldn't use anyways 851 // ignore characters we wouldn't use anyways
803 bool careful; 852 bool careful;
804 if (!has_char (*t, &prop, careful)) 853 if (!has_char (*t, &prop, careful))
… …
808 857
809 XCharStruct g; 858 XCharStruct g;
810 int dir_ret, asc_ret, des_ret; 859 int dir_ret, asc_ret, des_ret;
811 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 860 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
812 861
813 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 862 int wcw = WCWIDTH (*t);
863 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
814 864
815 if (width < g.width) width = g.width; 865 if (width < g.width) width = g.width;
816 } 866 }
817 867
818 if (cs == CS_UNKNOWN) 868 if (cs == CS_UNKNOWN)
819 { 869 {
820 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 870 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
837void 887void
838rxvt_font_x11::clear () 888rxvt_font_x11::clear ()
839{ 889{
840 if (f) 890 if (f)
841 { 891 {
842 XFreeFont (DISPLAY, f); 892 XFreeFont (term->dpy, f);
843 f = 0; 893 f = 0;
844 } 894 }
845} 895}
846 896
847bool 897bool
848rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 898rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
849{ 899{
850 uint32_t ch = FROM_UNICODE (cs, unicode); 900 uint32_t ch = FROM_UNICODE (cs, unicode);
851 901
852 if (ch == NOCHAR) 902 if (ch == NOCHAR)
853 return false; 903 return false;
… …
890 return false; 940 return false;
891 941
892 if (!prop || prop->width == rxvt_fontprop::unset) 942 if (!prop || prop->width == rxvt_fontprop::unset)
893 return true; 943 return true;
894 944
895 // check character against base font bounding box 945 // check wether character overlaps previous/next character
896 int w = xcs->width; 946 int w = xcs->rbearing - xcs->lbearing;
897 int wcw = wcwidth (unicode); 947 int wcw = max (WCWIDTH (unicode), 1);
898 if (wcw > 0) w /= wcw;
899 948
900 careful = w > prop->width; 949 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
901 if (careful && w > prop->width * MAX_OVERLAP >> 2) 950
951 if (careful && !OVERLAP_OK (w, wcw, prop))
902 return false; 952 return false;
903 953
904 return true; 954 return true;
905} 955}
906 956
… …
912 // this looks like a mess /. 962 // this looks like a mess /.
913 // and it is a mess /. 963 // and it is a mess /.
914 // yet we are trying to be perfect /. 964 // yet we are trying to be perfect /.
915 // but the result still isn't perfect /. 965 // but the result still isn't perfect /.
916 966
967 dTermDisplay;
968 dTermGC;
969
917 bool slow = this->slow 970 bool slow = this->slow
918 || width != r->TermWin.fwidth 971 || width != term->fwidth
919 || height != r->TermWin.fheight; 972 || height != term->fheight;
920 973
921 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 974 int base = ascent; // sorry, incorrect: term->fbase;
922 975
923 XGCValues v; 976 XGCValues v;
924 v.foreground = r->pix_colors[fg]; 977 v.foreground = term->pix_colors[fg];
925 v.font = f->fid; 978 v.font = f->fid;
926 979
927 if (enc2b) 980 if (enc2b)
928 { 981 {
929 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 982 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
930 983
931 if (bg == Color_bg && !slow) 984 if (bg == Color_bg && !slow)
932 { 985 {
933 v.background = r->pix_colors[bg]; 986 v.background = term->pix_colors[bg];
934 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 987 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
935 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 988 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
936 } 989 }
937 else 990 else
938 { 991 {
939 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 992 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
940 993
941 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 994 XChangeGC (disp, gc, GCForeground | GCFont, &v);
942 995
943 if (slow) 996 if (slow)
944 { 997 {
945 do 998 do
946 { 999 {
947 if (xc->byte1 || xc->byte2) 1000 if (xc->byte1 || xc->byte2)
948 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1001 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
949 1002
950 x += r->TermWin.fwidth; 1003 x += term->fwidth;
951 xc++; len--; 1004 xc++; len--;
952 } 1005 }
953 while (len); 1006 while (len);
954 } 1007 }
955 else 1008 else
956 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1009 XDrawString16 (disp, d, gc, x, y + base, xc, len);
957 } 1010 }
958 } 1011 }
959 else 1012 else
960 { 1013 {
961 const char *xc = enc_char (text, len, cs, slow); 1014 const char *xc = enc_char (text, len, cs, slow);
962 1015
963 if (bg == Color_bg && !slow) 1016 if (bg == Color_bg && !slow)
964 { 1017 {
965 v.background = r->pix_colors[bg]; 1018 v.background = term->pix_colors[bg];
966 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1019 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
967 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1020 XDrawImageString (disp, d, gc, x, y + base, xc, len);
968 } 1021 }
969 else 1022 else
970 { 1023 {
971 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1024 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
972 1025
973 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1026 XChangeGC (disp, gc, GCForeground | GCFont, &v);
974 1027
975 if (slow) 1028 if (slow)
976 { 1029 {
977 do 1030 do
978 { 1031 {
979 if (*xc) 1032 if (*xc)
980 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1033 XDrawString (disp, d, gc, x, y + base, xc, 1);
981 1034
982 x += r->TermWin.fwidth; 1035 x += term->fwidth;
983 xc++; len--; 1036 xc++; len--;
984 } 1037 }
985 while (len); 1038 while (len);
986 } 1039 }
987 else 1040 else
988 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1041 XDrawString (disp, d, gc, x, y + base, xc, len);
989 } 1042 }
990 } 1043 }
991} 1044}
992 1045
993///////////////////////////////////////////////////////////////////////////// 1046/////////////////////////////////////////////////////////////////////////////
… …
999 1052
1000 void clear (); 1053 void clear ();
1001 1054
1002 rxvt_fontprop properties (); 1055 rxvt_fontprop properties ();
1003 1056
1004 bool load (const rxvt_fontprop &prop); 1057 bool load (const rxvt_fontprop &prop, bool force_prop);
1005 1058
1006 void draw (rxvt_drawable &d, int x, int y, 1059 void draw (rxvt_drawable &d, int x, int y,
1007 const text_t *text, int len, 1060 const text_t *text, int len,
1008 int fg, int bg); 1061 int fg, int bg);
1009 1062
1010 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1063 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1011 1064
1012protected: 1065protected:
1013 XftFont *f; 1066 XftFont *f;
1014}; 1067};
1015 1068
1016void 1069void
1017rxvt_font_xft::clear () 1070rxvt_font_xft::clear ()
1018{ 1071{
1019 if (f) 1072 if (f)
1020 { 1073 {
1021 XftFontClose (DISPLAY, f); 1074 XftFontClose (term->dpy, f);
1022 f = 0; 1075 f = 0;
1023 } 1076 }
1024} 1077}
1025 1078
1026rxvt_fontprop 1079rxvt_fontprop
… …
1030 1083
1031 FT_Face face = XftLockFace (f); 1084 FT_Face face = XftLockFace (f);
1032 1085
1033 p.width = width; 1086 p.width = width;
1034 p.height = height; 1087 p.height = height;
1088 p.ascent = ascent;
1035 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1089 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1036 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1090 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1037 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1091 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1038 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1092 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1039 1093
… …
1041 1095
1042 return p; 1096 return p;
1043} 1097}
1044 1098
1045bool 1099bool
1046rxvt_font_xft::load (const rxvt_fontprop &prop) 1100rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1047{ 1101{
1102 dTermDisplay;
1103
1048 clear (); 1104 clear ();
1049 1105
1050 FcPattern *p = FcNameParse ((FcChar8 *) name); 1106 FcPattern *p = FcNameParse ((FcChar8 *) name);
1051 1107
1052 if (!p) 1108 if (!p)
1053 return false; 1109 return false;
1054 1110
1055 FcValue v; 1111 FcValue v;
1056 1112
1057 if (prop.height != rxvt_fontprop::unset 1113 if (prop.height != rxvt_fontprop::unset
1058 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1114 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1059 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1115 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1060 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1116 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1061 1117
1062 if (prop.weight != rxvt_fontprop::unset 1118 if (prop.weight != rxvt_fontprop::unset
1063 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1119 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1064 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1120 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1065 1121
1066 if (prop.slant != rxvt_fontprop::unset 1122 if (prop.slant != rxvt_fontprop::unset
1067 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1123 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1068 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1124 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1069 1125
1070#if 0 // clipping unfortunately destroys our precious double-width-characters 1126#if 0 // clipping unfortunately destroys our precious double-width-characters
1071 // clip width, we can't do better, or can we? 1127 // clip width, we can't do better, or can we?
1072 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1128 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1078 1134
1079 // store generated name so iso14755 view gives better results 1135 // store generated name so iso14755 view gives better results
1080 set_name ((char *)FcNameUnparse (p)); 1136 set_name ((char *)FcNameUnparse (p));
1081 1137
1082 XftResult result; 1138 XftResult result;
1083 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1139 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1084 1140
1085 FcPatternDestroy (p); 1141 FcPatternDestroy (p);
1086 1142
1087 if (!match) 1143 if (!match)
1088 return false; 1144 return false;
… …
1090 int ftheight = 0; 1146 int ftheight = 0;
1091 bool success = true; 1147 bool success = true;
1092 1148
1093 for (;;) 1149 for (;;)
1094 { 1150 {
1095 f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); 1151 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
1096 1152
1097 if (!f) 1153 if (!f)
1098 { 1154 {
1099 success = false; 1155 success = false;
1100 break; 1156 break;
… …
1109 1165
1110 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1166 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1111 1167
1112 XftUnlockFace (f); 1168 XftUnlockFace (f);
1113 1169
1170 int glheight = height;
1171
1114 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1172 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1115 { 1173 {
1116 FcChar16 ch = *t; 1174 FcChar16 ch = *t;
1117 1175
1118 if (cs != CS_UNICODE 1176 if (cs != CS_UNICODE
… …
1124 bool careful; 1182 bool careful;
1125 if (!has_char (*t, &prop, careful)) 1183 if (!has_char (*t, &prop, careful))
1126 continue; 1184 continue;
1127 1185
1128 XGlyphInfo g; 1186 XGlyphInfo g;
1129 XftTextExtents16 (DISPLAY, f, &ch, 1, &g); 1187 XftTextExtents16 (disp, f, &ch, 1, &g);
1130 1188
1189 g.width -= g.x;
1190
1131 int wcw = wcwidth (ch); 1191 int wcw = WCWIDTH (ch);
1132 if (wcw > 0) g.width = g.width / wcw; 1192 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1133 1193
1134 if (width < g.width) width = g.width; 1194 if (width < g.width ) width = g.width;
1135 if (height < g.height) height = g.height; 1195 if (height < g.height ) height = g.height;
1196 if (glheight < g.height - g.y) glheight = g.height - g.y;
1197 }
1198
1199 if (!width)
1200 {
1201 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1202
1203 XftFontClose (disp, f);
1204 f = 0;
1205
1206 success = false;
1207 break;
1136 } 1208 }
1137 1209
1138 if (prop.height == rxvt_fontprop::unset 1210 if (prop.height == rxvt_fontprop::unset
1139 || height <= prop.height 1211 || (height <= prop.height && glheight <= prop.height)
1140 || height <= 2 1212 || height <= 2
1141 || !scalable) 1213 || !scalable)
1142 break; 1214 break;
1143 1215
1144 if (ftheight) 1216 if (ftheight)
… …
1151 ftheight -= height - prop.height; 1223 ftheight -= height - prop.height;
1152 } 1224 }
1153 else 1225 else
1154 ftheight = prop.height - 1; 1226 ftheight = prop.height - 1;
1155 1227
1156 XftFontClose (DISPLAY, f); 1228 XftFontClose (disp, f);
1157 FcPatternDel (match, FC_PIXEL_SIZE); 1229 FcPatternDel (match, FC_PIXEL_SIZE);
1158 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1230 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1159 } 1231 }
1160 1232
1161 FcPatternDestroy (match); 1233 FcPatternDestroy (match);
1162 1234
1163#if 0 // do it per-character 1235#if 0 // do it per-character
… …
1170 1242
1171 return success; 1243 return success;
1172} 1244}
1173 1245
1174bool 1246bool
1175rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1247rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1176{ 1248{
1177 careful = false; 1249 careful = false;
1178 1250
1179 if (!XftCharExists (DISPLAY, f, unicode)) 1251 if (!XftCharExists (term->dpy, f, unicode))
1180 return false; 1252 return false;
1181 1253
1182 if (!prop || prop->width == rxvt_fontprop::unset) 1254 if (!prop || prop->width == rxvt_fontprop::unset)
1183 return true; 1255 return true;
1184 1256
1185 // check character against base font bounding box 1257 // check character against base font bounding box
1186 FcChar32 ch = unicode; 1258 FcChar32 ch = unicode;
1187 XGlyphInfo g; 1259 XGlyphInfo g;
1188 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1260 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1189 1261
1190 int w = g.width; 1262 int w = g.width - g.x;
1191 int wcw = wcwidth (unicode); 1263 int wcw = max (WCWIDTH (unicode), 1);
1192 if (wcw > 0) w /= wcw;
1193 1264
1194 careful = w > prop->width; 1265 careful = g.x > 0 || w > prop->width * wcw;
1195 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1266
1267 if (careful && !OVERLAP_OK (w, wcw, prop))
1268 return false;
1269
1270 // this weeds out _totally_ broken fonts, or glyphs
1271 if (!OVERLAP_OK (g.xOff, wcw, prop))
1196 return false; 1272 return false;
1197 1273
1198 return true; 1274 return true;
1199} 1275}
1200 1276
1201void 1277void
1202rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1278rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1203 const text_t *text, int len, 1279 const text_t *text, int len,
1204 int fg, int bg) 1280 int fg, int bg)
1205{ 1281{
1206 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
1207
1208 int base = ascent; // should be fbase, but that is incorrect
1209
1210 XGlyphInfo extents; 1282 XGlyphInfo extents;
1211 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1283 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1212 FcChar32 *ep = enc; 1284 XftGlyphSpec *ep = enc;
1213 int ewidth = 0; 1285
1214 int xoff = 0; 1286 dTermDisplay;
1287 dTermGC;
1288
1289 int w = term->fwidth * len;
1290 int h = term->fheight;
1291
1292 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
1293 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1294 * good idea from the perspective of packaging for wide variety of user configs.
1295 */
1296 bool buffered = true
1297#ifdef FORCE_UNBUFFERED_XFT
1298 && bg >= 0
1299#endif
1300 ;
1301 // cut trailing spaces
1302 while (len && text [len - 1] == ' ')
1303 len--;
1304
1305 int x_ = buffered ? 0 : x;
1306 int y_ = buffered ? 0 : y;
1215 1307
1216 while (len) 1308 while (len)
1217 { 1309 {
1218 int cwidth = r->TermWin.fwidth; 1310 int cwidth = term->fwidth;
1219 FcChar32 fc = *text++; len--; 1311 FcChar32 fc = *text++; len--;
1220 FT_UInt gl;
1221 1312
1222 while (len && *text == NOCHAR) 1313 while (len && *text == NOCHAR)
1223 text++, len--, cwidth += r->TermWin.fwidth; 1314 text++, len--, cwidth += term->fwidth;
1224 1315
1225 gl = XftCharIndex (d.display->display, f, fc); 1316 if (fc != ' ') // skip spaces
1226 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1227
1228 if (extents.xOff != cwidth && ep != enc)
1229 {
1230 if (xoff > ewidth) xoff = ewidth;
1231 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1232 x + (ewidth - xoff >> 1),
1233 y + base, enc, ep - enc);
1234 x += ewidth;
1235
1236 ep = enc;
1237 ewidth = 0;
1238 xoff = 0;
1239 } 1317 {
1318 FT_UInt glyph = XftCharIndex (disp, f, fc);
1319 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1240 1320
1241 if (fc == ' ' && ep == enc) // skip leading spaces 1321 ep->glyph = glyph;
1322 ep->x = x_ + (cwidth - extents.xOff >> 1);
1323 ep->y = y_ + ascent;
1324
1325 if (extents.xOff == 0)
1326 ep->x = x_ + cwidth;
1327
1328 ep++;
1242 { 1329 }
1330
1243 x += cwidth; 1331 x_ += cwidth;
1244 continue; 1332 }
1333
1334 if (buffered)
1335 {
1336 bool back_rendered = false;
1337 if (ep != enc)
1245 } 1338 {
1339 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1246 1340
1341#ifdef HAVE_BG_PIXMAP
1342 if (term->bgPixmap.pixmap)
1343 {
1344 Picture dst = 0;
1345
1346 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
1347 dst = XftDrawPicture (d2);
1348
1349 if (bg < 0 || dst != 0)
1350 {
1351 int src_x = x, src_y = y ;
1352
1353 if (term->bgPixmap.is_parentOrigin ())
1354 {
1355 src_x += term->window_vt_x;
1356 src_y += term->window_vt_y;
1357 }
1358
1359 if (term->bgPixmap.pmap_width >= src_x+w
1360 && term->bgPixmap.pmap_height >= src_y+h)
1361 {
1362 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1363 src_x, src_y, w, h, 0, 0);
1364 }
1365 else
1366 {
1367 XGCValues gcv;
1368
1369 gcv.fill_style = FillTiled;
1370 gcv.tile = term->bgPixmap.pixmap;
1371 gcv.ts_x_origin = -src_x;
1372 gcv.ts_y_origin = -src_y;
1373
1374 XChangeGC (disp, gc,
1375 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1376 &gcv);
1377
1378 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1379
1380 gcv.fill_style = FillSolid;
1381 XChangeGC (disp, gc, GCFillStyle, &gcv);
1382 }
1383
1384 if (bg >= 0)
1385 {
1386 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1387 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1388 }
1389
1390 back_rendered = true;
1391 }
1392 }
1393#endif
1394
1395 if (bg >= 0 && !back_rendered)
1396 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1397
1398 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1399 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1400 }
1247 else 1401 else
1248 { 1402 clear_rect (d, x, y, w, h, bg);
1249 *ep++ = gl;
1250 ewidth += cwidth;
1251 xoff += extents.xOff;
1252 }
1253 }
1254
1255 if (ep != enc)
1256 { 1403 }
1257 if (xoff > ewidth) xoff = ewidth; 1404 else
1258 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1259 x + (ewidth - xoff >> 1),
1260 y + base, enc, ep - enc);
1261 } 1405 {
1406 clear_rect (d, x, y, w, h, bg);
1407 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1408 }
1262} 1409}
1410
1263#endif 1411#endif
1264 1412
1265///////////////////////////////////////////////////////////////////////////// 1413/////////////////////////////////////////////////////////////////////////////
1266 1414
1267rxvt_fontset::rxvt_fontset (rxvt_t r) 1415rxvt_fontset::rxvt_fontset (rxvt_term *term)
1268: r (r), fontdesc (0) 1416: fontdesc (0), term (term)
1269{ 1417{
1270 clear (); 1418 clear ();
1271} 1419}
1272 1420
1273rxvt_fontset::~rxvt_fontset () 1421rxvt_fontset::~rxvt_fontset ()
… …
1276} 1424}
1277 1425
1278void 1426void
1279rxvt_fontset::clear () 1427rxvt_fontset::clear ()
1280{ 1428{
1281 prop.width = prop.height = prop.weight = prop.slant 1429 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1282 = rxvt_fontprop::unset; 1430 = rxvt_fontprop::unset;
1431 force_prop = false;
1283 1432
1284 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1433 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1285 FONT_UNREF (*i); 1434 FONT_UNREF (*i);
1286 1435
1287 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1436 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1317 f = new rxvt_font_x11; 1466 f = new rxvt_font_x11;
1318 } 1467 }
1319 else 1468 else
1320 f = new rxvt_font_x11; 1469 f = new rxvt_font_x11;
1321 1470
1322 f->set_term (r); 1471 f->set_term (term);
1323 f->set_name (strdup (name)); 1472 f->set_name (strdup (name));
1324 1473
1325 f->cs = cs; 1474 f->cs = cs;
1326 f->loaded = false; 1475 f->loaded = false;
1327 1476
… …
1338 char buf[512]; 1487 char buf[512];
1339 const char *end; 1488 const char *end;
1340 1489
1341 do 1490 do
1342 { 1491 {
1343 while (*desc <= ' ') desc++; 1492 while (*desc && *desc <= ' ')
1493 desc++;
1344 1494
1345 codeset cs = CS_UNICODE; 1495 codeset cs = CS_UNICODE;
1346 1496
1347 if (*desc == '[') 1497 if (*desc == '[')
1348 { 1498 {
… …
1398 if (fonts[i]->loaded) 1548 if (fonts[i]->loaded)
1399 return true; 1549 return true;
1400 1550
1401 fonts[i]->loaded = true; 1551 fonts[i]->loaded = true;
1402 1552
1403 if (!fonts[i]->load (prop)) 1553 if (!fonts[i]->load (prop, force_prop))
1404 { 1554 {
1405 fonts[i]->cs = CS_UNKNOWN; 1555 fonts[i]->cs = CS_UNKNOWN;
1406 return false; 1556 return false;
1407 } 1557 }
1408 1558
… …
1458 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1608 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1459 goto next_font; 1609 goto next_font;
1460 1610
1461 if (!realize_font (i)) 1611 if (!realize_font (i))
1462 goto next_font; 1612 goto next_font;
1613
1614 if (prop.ascent != rxvt_fontprop::unset)
1615 max_it (f->ascent, prop.ascent);
1463 } 1616 }
1464 1617
1465 if (f->cs == CS_UNKNOWN) 1618 if (f->cs == CS_UNKNOWN)
1466 goto next_font; 1619 goto next_font;
1467 1620
… …
1506 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1659 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1507 FcPatternAddBool (p, FC_MINSPACE, 1); 1660 FcPatternAddBool (p, FC_MINSPACE, 1);
1508 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1661 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1509 1662
1510 XftResult result; 1663 XftResult result;
1511 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1664 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1512 1665
1513 FcPatternDestroy (p); 1666 FcPatternDestroy (p);
1514 1667
1515 if (match) 1668 if (match)
1516 { 1669 {

Diff Legend

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