ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtfont.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.67 by root, Sat Feb 12 18:55:04 2005 UTC vs.
Revision 1.123 by ayin, Sat Nov 24 10:32:33 2007 UTC

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

Diff Legend

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