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

Diff Legend

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