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.64 by root, Tue Jan 11 05:45:57 2005 UTC vs.
Revision 1.160 by sf-exg, Wed Mar 31 21:52:05 2010 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-2008 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 "rxvtutil.h" 24#include "rxvtutil.h"
25#include "rxvtfont.h" 25#include "rxvtfont.h"
26 26
27#include <cstdlib> 27#include <cstdlib>
28#include <wchar.h> 28
29#include <inttypes.h> 29#include <inttypes.h>
30 30
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 31#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
32#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
33
34#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
35 (prop)->slant >= rxvt_fontprop::italic \
36 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
37 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
38 ))
35 39
36const struct rxvt_fallback_font { 40const struct rxvt_fallback_font {
37 codeset cs; 41 codeset cs;
38 const char *name; 42 const char *name;
39} fallback_fonts[] = { 43} fallback_fonts[] = {
40 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 44 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
41 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 45 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
42 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
43 47
44#if ENCODING_EU 48#if ENCODING_EU
45 // cyrillic 49 // cyrillic
46 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 50 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
47 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 51 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
48 52
49 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 53 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
50 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 54 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
51 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 55 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
52 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 56 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
53 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 57 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
59 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 63 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
60 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 64 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
61 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 65 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
62 66
63# if XFT 67# if XFT
64 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 68 { CS_KOI8_U, "xft::lang=ru" },
65 69
66 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 70 { CS_ISO8859_5, "xft::lang=ru" },
67 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 71 { CS_ISO8859_6, "xft::lang=ar" },
68 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 72 { CS_ISO8859_7, "xft::lang=el" },
69 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 73 { CS_ISO8859_8, "xft::lang=he" },
70 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 74 { CS_ISO8859_9, "xft::lang=tr" },
71 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 75 { CS_ISO8859_10, "xft::lang=se" },
72 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 76 { CS_ISO8859_11, "xft::lang=th" },
73# endif 77# endif
74#endif 78#endif
75 79
76 // japanese 80 // japanese
77#if ENCODING_JP || ENCODING_JP_EXT 81#if ENCODING_JP || ENCODING_JP_EXT
78# if XFT 82# if XFT
79 // prefer xft for complex scripts 83 // prefer xft for complex scripts
84 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
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" },
82 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 86 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
83 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 87 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
84# endif 88# endif
85 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 89 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
86 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 90 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
87 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 91 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
88 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 92 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
… …
92 96
93#if ENCODING_ZH || ENCODING_ZH_EXT 97#if ENCODING_ZH || ENCODING_ZH_EXT
94# if XFT 98# if XFT
95 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 99 { CS_GBK_0, "xft:AR PL KaitiM GB" },
96 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 100 { CS_GBK_0, "xft:AR PL SungtiL GB" },
97 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 101 { CS_GBK_0, "xft::lang=zh" },
98 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 102 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
99 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
100 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 104 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
101 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
102 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 106 { CS_GB2312_1980_0, "xft::lang=zh" },
103# endif 107# endif
104 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 108 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
105 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 109 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
106 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 110 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
107 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 111 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
120#if ENCODING_KR 124#if ENCODING_KR
121 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 125 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
122 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 126 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
123# if XFT 127# if XFT
124 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 128 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
125 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
126# endif 130# endif
127#endif 131#endif
128 132
129 // generic font fallback
130 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 133 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
131 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 134 //{ 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 135#if XFT
135 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"}, 136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
136 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 137 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Andale Mono:antialias=false" }, 138 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
138 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, 139 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
139 140
140 // FreeMono is usually uglier than x fonts, so try last only. 141 // FreeMono is usually uglier than x fonts, so try after the others
141 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 142 { CS_UNICODE, "xft:FreeMono:autohint=true" },
142#endif 143#endif
143 144
145 // generic font fallback, put this last, as many iso10646 fonts have extents
146 // specified for all glyphs in the range they cover, but most are simply empty
147 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
148 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
144 { CS_UNKNOWN, 0 } 149 { CS_UNKNOWN, 0 }
145}; 150};
146 151
147// these characters are used to guess the font height and width 152// these characters are used to guess the font height and width
148// pango uses a similar algorithm and doesn't trust the font either. 153// pango uses a similar algorithm and doesn't trust the font either.
… …
152 0x304c, 0x672c, // が本 157 0x304c, 0x672c, // が本
153}; 158};
154 159
155#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
156 161
162#define dTermDisplay Display *disp = term->dpy
163#define dTermGC GC gc = term->gc
164
157///////////////////////////////////////////////////////////////////////////// 165/////////////////////////////////////////////////////////////////////////////
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 166
193static const char * 167static const char *
194enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 168enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
195{ 169{
196 uint8_t *buf = (uint8_t *)get_enc_buf (len); 170 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
171 uint8_t *res = buf;
197 172
198 while (len--) 173 while (len--)
199 { 174 {
200 uint32_t c = FROM_UNICODE (cs, *text++); 175 uint32_t c = FROM_UNICODE (cs, *text++);
201 176
… …
206 } 181 }
207 182
208 *buf++ = c; 183 *buf++ = c;
209 } 184 }
210 185
211 return (const char *)enc_buf; 186 return (const char *)res;
212} 187}
213 188
214static const XChar2b * 189static const XChar2b *
215enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 190enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
216{ 191{
217 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 192 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
193 XChar2b *res = buf;
218 194
219 while (len--) 195 while (len--)
220 { 196 {
221 uint32_t c = FROM_UNICODE (cs, *text++); 197 uint32_t c = FROM_UNICODE (cs, *text++);
222 198
… …
229 buf->byte1 = c >> 8; 205 buf->byte1 = c >> 8;
230 buf->byte2 = c; 206 buf->byte2 = c;
231 buf++; 207 buf++;
232 } 208 }
233 209
234 return (XChar2b *)enc_buf; 210 return res;
235} 211}
236 212
237///////////////////////////////////////////////////////////////////////////// 213/////////////////////////////////////////////////////////////////////////////
238 214
215rxvt_font::rxvt_font ()
216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217{
218}
219
239void 220void
240rxvt_font::set_name (char *name) 221rxvt_font::set_name (char *name_)
241{ 222{
242 if (this->name == name) 223 if (name == name_)
243 return; 224 return;
244 225
245 if (this->name) free (this->name); // let the compiler optimize 226 if (name) free (name); // let the compiler optimize
246 this->name = name; 227 name = name_;
247} 228}
248 229
249void 230void
250rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) 231rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
251{ 232{
252 if (color == Color_bg) 233 dTermDisplay;
253 XClearArea (d.display->display, d, x, y, w, h, FALSE); 234 dTermGC;
235
236 if (color == Color_bg || color == Color_transparent)
237 XClearArea (disp, d, x, y, w, h, false);
254 else if (color >= 0) 238 else if (color >= 0)
255 { 239 {
256#if XFT 240#if XFT
241 Picture dst;
242
243# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap
245 && !term->pix_colors[color].is_opaque ()
246 && ((dst = XftDrawPicture (d))))
247 {
248 XClearArea (disp, d, x, y, w, h, false);
249
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 }
253 else
254# endif
257 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 255 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
256
258#else 257#else
259 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 258 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 259 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 260#endif
262 } 261 }
263} 262}
264 263
265#include "table/linedraw.h" 264/////////////////////////////////////////////////////////////////////////////
266 265
267struct rxvt_font_default : rxvt_font { 266struct rxvt_font_default : rxvt_font {
268 struct rxvt_fontset *fs; 267 struct rxvt_fontset *fs;
269 268
270 rxvt_font_default (rxvt_fontset *fs) 269 rxvt_font_default (rxvt_fontset *fs)
… …
276 rxvt_fontprop properties () 275 rxvt_fontprop properties ()
277 { 276 {
278 rxvt_fontprop p; 277 rxvt_fontprop p;
279 278
280 p.width = p.height = 1; 279 p.width = p.height = 1;
280 p.ascent = rxvt_fontprop::unset;
281 p.weight = rxvt_fontprop::medium; 281 p.weight = rxvt_fontprop::medium;
282 p.slant = rxvt_fontprop::roman; 282 p.slant = rxvt_fontprop::roman;
283 283
284 return p; 284 return p;
285 } 285 }
286 286
287 bool load (const rxvt_fontprop &prop) 287 bool load (const rxvt_fontprop &prop, bool force_prop)
288 { 288 {
289 width = 1; height = 1; 289 width = 1; height = 1;
290 ascent = 1; descent = 0; 290 ascent = 1; descent = 0;
291 291
292 set_name (strdup ("built-in support font")); 292 set_name (strdup ("built-in support font"));
293 293
294 return true; 294 return true;
295 } 295 }
296 296
297 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 297 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
298 { 298 {
299 careful = false; 299 careful = false;
300 300
301 if (unicode <= 0x001f) 301 if (unicode <= 0x001f)
302 return true; 302 return true;
… …
305 return false; 305 return false;
306 306
307 if (unicode <= 0x009f) 307 if (unicode <= 0x009f)
308 return true; 308 return true;
309 309
310#ifdef BUILTIN_GLYPHS
310 if (unicode >= 0x2500 && unicode <= 0x259f) 311 if (unicode >= 0x2500 && unicode <= 0x259f &&
312 !term->option (Opt_skipBuiltinGlyphs))
311 return true; 313 return true;
314#endif
312 315
313 if (IS_COMPOSE (unicode)) 316 if (IS_COMPOSE (unicode))
314 return true; 317 return true;
315 318
316 switch (unicode) 319 switch (unicode)
… …
331void 334void
332rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 335rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
333 const text_t *text, int len, 336 const text_t *text, int len,
334 int fg, int bg) 337 int fg, int bg)
335{ 338{
339 dTermDisplay;
340 dTermGC;
341
336 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 342 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
337 343
338 XSetForeground (d.display->display, TGC, r->pix_colors[fg]); 344 XSetForeground (disp, gc, term->pix_colors[fg]);
339 345
340 while (len) 346 while (len)
341 { 347 {
342#if ENABLE_COMBINING 348#if ENABLE_COMBINING
343 compose_char *cc; 349 compose_char *cc;
… …
347 353
348 while (++text, --len && *text == NOCHAR) 354 while (++text, --len && *text == NOCHAR)
349 ; 355 ;
350 356
351 int width = text - tp; 357 int width = text - tp;
352 int fwidth = r->TermWin.fwidth * width; 358 int fwidth = term->fwidth * width;
353 359
360#ifdef BUILTIN_GLYPHS
354 if (0x2500 <= t && t <= 0x259f) 361 if (0x2500 <= t && t <= 0x259f)
355 { 362 {
363# include "table/linedraw.h"
356 uint16_t offs = linedraw_offs[t - 0x2500]; 364 uint16_t offs = linedraw_offs[t - 0x2500];
357 uint32_t *a = linedraw_command + (offs >> 4); 365 uint32_t *a = linedraw_command + (offs >> 4);
358 uint32_t *b = a + (offs & 15); 366 uint32_t *b = a + (offs & 15);
359 367
360 int W = fwidth; 368 int W = fwidth;
361 int H = r->TermWin.fheight; 369 int H = term->fheight;
362 370
363 int x_[16]; 371 int x_[16];
364 int y_[16]; 372 int y_[16];
365 373
366 for (int i = 0; i <= 8; i++) 374 for (int i = 0; i <= 8; i++)
… …
374 382
375 XGCValues gcv; 383 XGCValues gcv;
376 384
377 gcv.cap_style = CapButt; 385 gcv.cap_style = CapButt;
378 gcv.line_width = 0; 386 gcv.line_width = 0;
379 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 387 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
380 388
381 while (a < b) 389 while (a < b)
382 { 390 {
383 uint32_t command = *a++; 391 uint32_t command = *a++;
384 392
… …
391 int y2 = y_[(command >> 0) & 15]; 399 int y2 = y_[(command >> 0) & 15];
392 400
393 switch (op) 401 switch (op)
394 { 402 {
395 case 0: // line 403 case 0: // line
396 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 404 XDrawLine (disp, d, gc, x1, y1, x2, y2);
397 break; 405 break;
398 406
399 case 1: // rectangle, possibly stippled 407 case 1: // rectangle, possibly stippled
400 if (a) 408 if (a)
401 { 409 {
402 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 410 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
403 411
404 gcv.fill_style = FillStippled; 412 gcv.fill_style = FillStippled;
405 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 413 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
406 gcv.ts_x_origin = x; 414 gcv.ts_x_origin = x;
407 gcv.ts_y_origin = y; 415 gcv.ts_y_origin = y;
408 416
409 XChangeGC (d.display->display, TGC, 417 XChangeGC (disp, gc,
410 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 418 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
411 &gcv); 419 &gcv);
412 } 420 }
413 421
414 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 422 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
415 423
416 if (a) 424 if (a)
417 { 425 {
418 XFreePixmap (d.display->display, gcv.stipple); 426 XFreePixmap (disp, gcv.stipple);
419 gcv.stipple = 0; 427 gcv.stipple = 0;
420 gcv.fill_style = FillSolid; 428 gcv.fill_style = FillSolid;
421 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 429 XChangeGC (disp, gc, GCFillStyle, &gcv);
422 } 430 }
423 break; 431 break;
424 case 2: // arc 432 case 2: // arc
425 XDrawArc (d.display->display, d, TGC, 433 XDrawArc (disp, d, gc,
426 x1 - W/2, y1 - H/2, W-1, H-1, 434 x1 - W/2, y1 - H/2, W-1, H-1,
427 (a - 1) * 90*64, (b - 1) * 90*64); 435 (a - 1) * 90*64, (b - 1) * 90*64);
428 break; 436 break;
429 } 437 }
430 } 438 }
431 } 439 }
440#else
441 if (0)
442 ;
443#endif
432#if ENABLE_COMBINING 444#if ENABLE_COMBINING
433 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
434 { 446 {
447 min_it (width, 2); // we only support wcwidth up to 2
448
435 text_t chrs[2]; 449 text_t chrs[2];
436 width = min (2, width);
437 chrs [1] = NOCHAR; 450 chrs [1] = NOCHAR;
438 451
439 *chrs = cc->c1; 452 *chrs = cc->c1;
440 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 453 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
441 f1->draw (d, x, y, chrs, width, fg, bg); 454 f1->draw (d, x, y, chrs, width, fg, bg);
… …
448 *chrs = cc->c2; 461 *chrs = cc->c2;
449 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
450 ? f1 463 ? f1
451 : (*fs)[fs->find_font (cc->c2)]; 464 : (*fs)[fs->find_font (cc->c2)];
452 465
453 f2->draw (d, x, y, chrs, width, fg, -1); 466 f2->draw (d, x, y, chrs, width, fg, Color_none);
454 } 467 }
455 } 468 }
456#endif 469#endif
457 else 470 else
458 switch (t) 471 switch (t)
… …
461 case ZERO_WIDTH_CHAR: 474 case ZERO_WIDTH_CHAR:
462 case NOCHAR: 475 case NOCHAR:
463 break; 476 break;
464 477
465 default: 478 default:
466 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, 479 XDrawRectangle (disp, d, gc, x + 2, y + 2,
467 fwidth - 4, r->TermWin.fheight - 4); 480 fwidth - 4, term->fheight - 4);
468 } 481 }
469 482
470 x += fwidth; 483 x += fwidth;
471 } 484 }
472} 485}
486
487struct rxvt_font_meta : rxvt_font {
488 struct rxvt_fontset *fs;
489
490 rxvt_font_meta (rxvt_fontset *fs)
491 : rxvt_font ()
492 {
493 this->fs = fs;
494 }
495
496 rxvt_fontprop properties ()
497 {
498 rxvt_fontprop p;
499
500 p.width = p.height = 1;
501 p.ascent = rxvt_fontprop::unset;
502 p.weight = rxvt_fontprop::medium;
503 p.slant = rxvt_fontprop::roman;
504
505 return p;
506 }
507
508 bool load (const rxvt_fontprop &prop, bool force_prop)
509 {
510 width = 1; height = 1;
511 ascent = 1; descent = 0;
512
513 set_name (strdup ("built-in meta font"));
514
515 return true;
516 }
517
518 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
519 {
520 return false;
521 }
522
523 void draw (rxvt_drawable &d, int x, int y,
524 const text_t *text, int len,
525 int fg, int bg)
526 {
527 while (len--)
528 {
529 int fid = fs->find_font_idx (*text);
530 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
531 ++text;
532 x += term->fwidth;
533 }
534 }
535};
473 536
474///////////////////////////////////////////////////////////////////////////// 537/////////////////////////////////////////////////////////////////////////////
475 538
476struct rxvt_font_x11 : rxvt_font { 539struct rxvt_font_x11 : rxvt_font {
477 rxvt_font_x11 () { f = 0; } 540 rxvt_font_x11 () { f = 0; }
478 541
479 void clear (); 542 void clear ();
480 543
481 rxvt_fontprop properties (); 544 rxvt_fontprop properties ();
482 545
483 bool load (const rxvt_fontprop &prop); 546 bool load (const rxvt_fontprop &prop, bool force_prop);
484 547
485 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 548 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
486 549
487 void draw (rxvt_drawable &d, int x, int y, 550 void draw (rxvt_drawable &d, int x, int y,
488 const text_t *text, int len, 551 const text_t *text, int len,
489 int fg, int bg); 552 int fg, int bg);
490 553
491 bool slow; // wether this is a proportional font or has other funny characteristics 554 bool slow; // whether this is a proportional font or has other funny characteristics
492 XFontStruct *f; 555 XFontStruct *f;
493 codeset cs;
494 bool enc2b, encm; 556 bool enc2b, encm;
495 557
496 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 558 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
497 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 559 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
498 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 560 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
499 bool set_properties (rxvt_fontprop &p, const char *name); 561 bool set_properties (rxvt_fontprop &p, const char *name);
500}; 562};
501 563
502char * 564char *
503rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 565rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
504{ 566{
505 unsigned long value; 567 unsigned long value;
506 568
507 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 569 if (XGetFontProperty (f, property, &value))
508 return XGetAtomName (DISPLAY, value); 570 return XGetAtomName (term->dpy, value);
509 else 571 else
510 return rxvt_strdup (repl); 572 return repl ? strdup (repl) : 0;
511} 573}
512 574
513rxvt_fontprop 575rxvt_fontprop
514rxvt_font_x11::properties () 576rxvt_font_x11::properties ()
515{ 577{
… …
519} 581}
520 582
521bool 583bool
522rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 584rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
523{ 585{
524 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 586 p.width = width != rxvt_fontprop::unset ? width
587 : avgwidth ? (avgwidth + 1) / 10
588 : (height + 1) / 2;
525 p.height = height; 589 p.height = height;
590 p.ascent = rxvt_fontprop::unset;
526 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 591 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
527 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 592 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
528 593
529 return true; 594 return true;
530} 595}
… …
533rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 598rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
534{ 599{
535 unsigned long height; 600 unsigned long height;
536 601
537#if 0 602#if 0
538 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 603 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
539 return false; 604 return false;
540#else 605#else
541 height = f->ascent + f->descent; 606 height = f->ascent + f->descent;
542#endif 607#endif
543 608
544 unsigned long avgwidth; 609 unsigned long avgwidth;
545 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 610 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
546 avgwidth = 0; 611 avgwidth = 0;
547 612
548 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 613 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
549 char *slant = get_property (f, "SLANT", "r"); 614 char *slant = get_property (f, term->xa [XA_SLANT], "r");
550 615
551 set_properties (p, height, weight, slant, avgwidth); 616 set_properties (p, height, weight, slant, avgwidth);
552 617
553 free (weight); 618 free (weight);
554 free (slant); 619 free (slant);
555 620
621 p.ascent = f->ascent;
622
556 return true; 623 return true;
557} 624}
558 625
559bool 626bool
560rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 627rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
561{ 628{
629 dTermDisplay;
562 int slashes = 0; 630 int slashes = 0;
563 const char *comp[13]; 631 const char *comp[13];
564 632
565 for (const char *c = name; *c; c++) 633 for (const char *c = name; *c; c++)
566 if (*c == '-') 634 if (*c == '-')
… …
574 if (slashes >= 13 642 if (slashes >= 13
575 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 643 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
576 && (*comp[11] >= '0' && *comp[11] <= '9')) 644 && (*comp[11] >= '0' && *comp[11] <= '9'))
577 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 645 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
578 646
579 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 647 XFontStruct *f = XLoadQueryFont (disp, name);
580 648
581 if (f) 649 if (f)
582 { 650 {
583 // the font should really exist now. if not, we have a problem 651 // the font should really exist now. if not, we have a problem
584 // (e.g. if the user did xset fp rehash just when we were searching fonts). 652 // (e.g. if the user did xset fp rehash just when we were searching fonts).
585 // in that case, just return garbage. 653 // in that case, just return garbage.
586 bool ret = set_properties (p, f); 654 bool ret = set_properties (p, f);
587 XFreeFont (DISPLAY, f); 655 XFreeFont (disp, f);
588 return ret; 656 return ret;
589 } 657 }
590 else 658 else
591 return false; 659 return false;
592} 660}
593 661
594// fix the size of scalable fonts 662// fix the size of scalable fonts
595static bool 663static bool
596replace_field (char *buf, const char *name, int index, const char old, const char *replace) 664replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
597{ 665{
598 int slashes = 0; 666 int slashes = 0;
599 const char *field, *end; 667 const char *field, *end;
600 668
601 for (const char *c = name; *c; c++) 669 for (const char *c = name; *c; c++)
… …
611 break; 679 break;
612 } 680 }
613 681
614 if (slashes >= 13 && (!old || *field == old)) 682 if (slashes >= 13 && (!old || *field == old))
615 { 683 {
616 // TODO: check for overflow in font-name 684 size_t len = field - name;
617 strncpy (buf, name, field - name); 685 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
618 buf += field - name; 686 memcpy (*ptr, name, len);
619 strcpy (buf, replace); 687 strcpy (*ptr + len, replace);
620 strcat (buf, end); 688 strcat (*ptr, end);
621 689
622 return true; 690 return true;
623 } 691 }
624 else 692 else
625 { 693 {
626 strcpy (buf, name); 694 *ptr = strdup (name);
627 695
628 return false; 696 return false;
629 } 697 }
630} 698}
631 699
632bool 700bool
633rxvt_font_x11::load (const rxvt_fontprop &prop) 701rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
634{ 702{
703 dTermDisplay;
704
635 clear (); 705 clear ();
636 706
637 char field_str[64]; // enough for 128 bits 707 char field_str[64]; // enough for 128 bits
638 708
639 // first morph the font if required 709 // first morph the font if required
640 if (prop.weight != rxvt_fontprop::unset 710 if (force_prop)
641 || prop.slant != rxvt_fontprop::unset)
642 { 711 {
643 char fname[1024]; 712 char *fname;
644 713
645 if (name[0] != '-') 714 if (name[0] != '-')
646 { 715 {
647 f = XLoadQueryFont (DISPLAY, name); 716 f = XLoadQueryFont (disp, name);
648 717
649 if (!f) 718 if (!f)
650 return false; 719 return false;
651 720
652 char *new_name = get_property (f, "FONT", name); 721 char *new_name = get_property (f, XA_FONT, name);
653 722
654 if (new_name) 723 if (new_name)
655 set_name (new_name); 724 set_name (new_name);
656 else 725 else
657 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 726 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
658 727
659 XFreeFont (DISPLAY, f); 728 XFreeFont (disp, f);
660 f = 0; 729 f = 0;
661 } 730 }
662 731
663 if (prop.weight != rxvt_fontprop::unset) 732 if (prop.weight != rxvt_fontprop::unset)
664 { 733 {
665 replace_field (fname, name, 2, 0, 734 replace_field (&fname, name, 2, 0,
666 prop.weight < rxvt_fontprop::bold 735 prop.weight < rxvt_fontprop::bold
667 ? "medium" : "bold"); 736 ? "medium" : "bold");
668 set_name (strdup (fname)); 737 set_name (fname);
669 } 738 }
670 739
671 if (prop.slant != rxvt_fontprop::unset) 740 if (prop.slant != rxvt_fontprop::unset)
672 { 741 {
673 replace_field (fname, name, 3, 0, 742 replace_field (&fname, name, 3, 0,
674 prop.slant < rxvt_fontprop::italic 743 prop.slant < rxvt_fontprop::italic
675 ? "r" : "i"); // TODO: handle "o"blique, too 744 ? "r" : "i"); // TODO: handle "o"blique, too
676 set_name (strdup (fname)); 745 set_name (fname);
677 } 746 }
678 } 747 }
679 748
680 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 749 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
681 ? 0 : prop.height); 750 ? 0 : prop.height);
… …
694 ~font_weight () { free (name); } 763 ~font_weight () { free (name); }
695 }; 764 };
696 765
697 char **list; 766 char **list;
698 int count; 767 int count;
699 list = XListFonts (DISPLAY, name, 4000, &count); 768 list = XListFonts (disp, name, 4000, &count);
700 769
701 set_name (0); 770 set_name (0);
702 771
703 if (!list) 772 if (!list)
704 return false; 773 return false;
… …
706 font_weight *fonts = new font_weight[count]; 775 font_weight *fonts = new font_weight[count];
707 776
708 for (int i = 0; i < count; i++) 777 for (int i = 0; i < count; i++)
709 { 778 {
710 rxvt_fontprop p; 779 rxvt_fontprop p;
711 char fname[1024]; 780 char *fname;
712 781
713 int diff = 0; 782 int diff = 0;
714 783
715 if (replace_field (fname, list[i], 6, '0', field_str)) 784 if (replace_field (&fname, list[i], 6, '0', field_str))
716 diff += 10; // slightly penalize scalable fonts 785 diff += 10; // slightly penalize scalable fonts
786 else
787 {
788 free (fname);
789 if (replace_field (&fname, list[i], 11, '0', "0"))
790 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
791 }
717 792
718 if (!set_properties (p, fname)) 793 if (!set_properties (p, fname))
719 continue; 794 continue;
720 795
721 if (prop.height != rxvt_fontprop::unset 796 if (prop.height != rxvt_fontprop::unset
… …
725 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 800 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
726 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 801 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
727 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 802 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
728 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 803 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
729 804
730 fonts[i].name = strdup (fname); 805 fonts[i].name = fname;
731 fonts[i].diff = diff; 806 fonts[i].diff = diff;
732 } 807 }
733 808
734 XFreeFontNames (list); 809 XFreeFontNames (list);
735 810
… …
737 for (;;) 812 for (;;)
738 { 813 {
739 font_weight *best = fonts + count - 1; 814 font_weight *best = fonts + count - 1;
740 815
741 for (font_weight *w = best; w-- > fonts; ) 816 for (font_weight *w = best; w-- > fonts; )
742 if (w->diff < best->diff) 817 if (w->diff <= best->diff)
743 best = w; 818 best = w;
744 819
745 if (!best->name 820 if (!best->name
746 || !(f = XLoadQueryFont (DISPLAY, best->name))) 821 || !(f = XLoadQueryFont (disp, best->name)))
747 break; 822 break;
748 823
749 set_name (best->name); 824 set_name (best->name);
750 best->clear (); 825 best->clear ();
751 826
… …
764 delete [] fonts; 839 delete [] fonts;
765 840
766 if (!f) 841 if (!f)
767 return false; 842 return false;
768 843
769 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 844 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
770 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 845 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
846
847 cs = CS_UNKNOWN;
771 848
772 if (registry && encoding) 849 if (registry && encoding)
773 { 850 {
774 char charset[64]; 851 char charset[64];
775 snprintf (charset, 64, "%s-%s", registry, encoding); 852 snprintf (charset, 64, "%s-%s", registry, encoding);
776 853
777 cs = codeset_from_name (charset); 854 cs = codeset_from_name (charset);
778 } 855
779 else 856 if (cs == CS_UNKNOWN)
857 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
780 { 858 }
859
860 free (registry);
861 free (encoding);
862
863 if (cs == CS_UNKNOWN)
864 {
781 const char *charset = get_property (f, "FONT", 0); 865 const char *charset = get_property (f, XA_FONT, 0);
782 866
783 if (!charset) 867 if (!charset)
784 charset = name; 868 charset = name;
785 869
786 int count = 13; 870 int count = 13;
787 while (*charset) 871 while (*charset)
788 if (*charset++ == '-' && !--count) 872 if (*charset++ == '-' && !--count)
789 break; 873 break;
790 874
791 cs = codeset_from_name (charset); 875 cs = codeset_from_name (charset);
876 if (cs == CS_UNKNOWN)
877 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
878 }
879
880 if (cs == CS_UNKNOWN)
792 } 881 {
793 882 clear ();
794 free (registry); 883 return false;
795 free (encoding); 884 }
796 885
797 if (cs == CS_UNICODE) 886 if (cs == CS_UNICODE)
798 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 887 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
799 888
800 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 889 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
801 enc2b = encm || f->max_char_or_byte2 > 255; 890 enc2b = encm || f->max_char_or_byte2 > 255;
802 891
803 slow = false; 892 slow = false;
804 893
805#if 1 // only used for slow detection, TODO optimize 894#if 1 // only used for slow detection, TODO optimize
806 if (f->min_bounds.width == f->max_bounds.width) 895 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
807 width = f->min_bounds.width;
808 else if (f->per_char == NULL)
809 width = f->max_bounds.width; 896 width = f->max_bounds.width;
810 else 897 else
811 { 898 {
812 slow = true; 899 slow = true;
813 900
814 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 901 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
815 902
816 if (encm) 903 if (encm)
817 N += (f->max_byte1 - f->min_byte1) 904 N += (f->max_byte1 - f->min_byte1)
818 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 905 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
819 906
820 while (N) 907 while (N)
821 { 908 {
822 if (f->per_char[N].width > width) 909 if (f->per_char[N].width > width)
823 width = f->per_char[N].width; 910 width = f->per_char[N].width;
824 911
… …
829 916
830 width = 1; 917 width = 1;
831 918
832 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 919 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
833 { 920 {
834 if (cs != CS_UNICODE
835 && *t > 0x100
836 && FROM_UNICODE (cs, *t) == NOCHAR) 921 if (FROM_UNICODE (cs, *t) == NOCHAR)
837 continue; 922 continue;
838 923
839 // ignore characters we wouldn't use anyways 924 // ignore characters we wouldn't use anyways
840 bool careful; 925 bool careful;
841 if (!has_char (*t, &prop, careful)) 926 if (!has_char (*t, &prop, careful))
… …
845 930
846 XCharStruct g; 931 XCharStruct g;
847 int dir_ret, asc_ret, des_ret; 932 int dir_ret, asc_ret, des_ret;
848 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 933 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
849 934
850 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 935 int wcw = WCWIDTH (*t);
936 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
851 937
852 if (width < g.width) width = g.width; 938 if (width < g.width) width = g.width;
853 }
854
855 if (cs == CS_UNKNOWN)
856 { 939 }
857 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
858 940
941#if 0 // do it per-character
942 if (prop && width > prop->width)
943 {
859 clear (); 944 clear ();
860 return false; 945 return false;
861 } 946 }
862
863#if 0 // do it per-character
864 if (prop && width > prop->width)
865 {
866 clear ();
867 return false;
868 }
869#endif 947#endif
870 948
871 return true; 949 return true;
872} 950}
873 951
874void 952void
875rxvt_font_x11::clear () 953rxvt_font_x11::clear ()
876{ 954{
877 if (f) 955 if (f)
878 { 956 {
879 XFreeFont (DISPLAY, f); 957 XFreeFont (term->dpy, f);
880 f = 0; 958 f = 0;
881 } 959 }
882} 960}
883 961
884bool 962bool
885rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 963rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
886{ 964{
887 uint32_t ch = FROM_UNICODE (cs, unicode); 965 uint32_t ch = FROM_UNICODE (cs, unicode);
888 966
889 if (ch == NOCHAR) 967 if (ch == NOCHAR)
890 return false; 968 return false;
891 969
892 /* check wether the character exists in _this_ font. horrible. */ 970 /* check whether the character exists in _this_ font. horrible. */
893 XCharStruct *xcs; 971 XCharStruct *xcs;
894 972
895 if (encm) 973 if (encm)
896 { 974 {
897 unsigned char byte1 = ch >> 8; 975 unsigned char byte1 = ch >> 8;
… …
927 return false; 1005 return false;
928 1006
929 if (!prop || prop->width == rxvt_fontprop::unset) 1007 if (!prop || prop->width == rxvt_fontprop::unset)
930 return true; 1008 return true;
931 1009
932 // check character against base font bounding box 1010 // check whether character overlaps previous/next character
933 int w = xcs->width; 1011 int w = xcs->rbearing - xcs->lbearing;
934 int wcw = wcwidth (unicode); 1012 int wcw = max (WCWIDTH (unicode), 1);
935 if (wcw > 0) w /= wcw;
936 1013
937 careful = w > prop->width; 1014 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
938 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1015
1016 if (careful && !OVERLAP_OK (w, wcw, prop))
939 return false; 1017 return false;
940 1018
941 return true; 1019 return true;
942} 1020}
943 1021
… …
949 // this looks like a mess /. 1027 // this looks like a mess /.
950 // and it is a mess /. 1028 // and it is a mess /.
951 // yet we are trying to be perfect /. 1029 // yet we are trying to be perfect /.
952 // but the result still isn't perfect /. 1030 // but the result still isn't perfect /.
953 1031
1032 dTermDisplay;
1033 dTermGC;
1034
954 bool slow = this->slow 1035 bool slow = this->slow
955 || width != r->TermWin.fwidth 1036 || width != term->fwidth
956 || height != r->TermWin.fheight; 1037 || height != term->fheight;
957 1038
958 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 1039 int base = ascent; // sorry, incorrect: term->fbase;
959 1040
960 XGCValues v; 1041 XGCValues v;
961 v.foreground = r->pix_colors[fg]; 1042 v.foreground = term->pix_colors[fg];
962 v.font = f->fid; 1043 v.font = f->fid;
963 1044
964 if (enc2b) 1045 if (enc2b)
965 { 1046 {
966 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 1047 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
967 1048
968 if (bg == Color_bg && !slow) 1049 if (bg == Color_bg && !slow)
969 { 1050 {
970 v.background = r->pix_colors[bg]; 1051 v.background = term->pix_colors[bg];
971 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1052 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
972 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 1053 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
973 } 1054 }
974 else 1055 else
975 { 1056 {
976 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1057 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
977 1058
978 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1059 XChangeGC (disp, gc, GCForeground | GCFont, &v);
979 1060
980 if (slow) 1061 if (slow)
981 { 1062 {
982 do 1063 do
983 { 1064 {
984 if (xc->byte1 || xc->byte2) 1065 if (xc->byte1 || xc->byte2)
985 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1066 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
986 1067
987 x += r->TermWin.fwidth; 1068 x += term->fwidth;
988 xc++; len--; 1069 xc++; len--;
989 } 1070 }
990 while (len); 1071 while (len);
991 } 1072 }
992 else 1073 else
993 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1074 XDrawString16 (disp, d, gc, x, y + base, xc, len);
994 } 1075 }
995 } 1076 }
996 else 1077 else
997 { 1078 {
998 const char *xc = enc_char (text, len, cs, slow); 1079 const char *xc = enc_char (text, len, cs, slow);
999 1080
1000 if (bg == Color_bg && !slow) 1081 if (bg == Color_bg && !slow)
1001 { 1082 {
1002 v.background = r->pix_colors[bg]; 1083 v.background = term->pix_colors[bg];
1003 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1084 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1004 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1085 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1005 } 1086 }
1006 else 1087 else
1007 { 1088 {
1008 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1089 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1009 1090
1010 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1091 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1011 1092
1012 if (slow) 1093 if (slow)
1013 { 1094 {
1014 do 1095 do
1015 { 1096 {
1016 if (*xc) 1097 if (*xc)
1017 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1098 XDrawString (disp, d, gc, x, y + base, xc, 1);
1018 1099
1019 x += r->TermWin.fwidth; 1100 x += term->fwidth;
1020 xc++; len--; 1101 xc++; len--;
1021 } 1102 }
1022 while (len); 1103 while (len);
1023 } 1104 }
1024 else 1105 else
1025 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1106 XDrawString (disp, d, gc, x, y + base, xc, len);
1026 } 1107 }
1027 } 1108 }
1028} 1109}
1029 1110
1030///////////////////////////////////////////////////////////////////////////// 1111/////////////////////////////////////////////////////////////////////////////
… …
1036 1117
1037 void clear (); 1118 void clear ();
1038 1119
1039 rxvt_fontprop properties (); 1120 rxvt_fontprop properties ();
1040 1121
1041 bool load (const rxvt_fontprop &prop); 1122 bool load (const rxvt_fontprop &prop, bool force_prop);
1042 1123
1043 void draw (rxvt_drawable &d, int x, int y, 1124 void draw (rxvt_drawable &d, int x, int y,
1044 const text_t *text, int len, 1125 const text_t *text, int len,
1045 int fg, int bg); 1126 int fg, int bg);
1046 1127
1047 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1128 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1048 1129
1049protected: 1130protected:
1050 XftFont *f; 1131 XftFont *f;
1051}; 1132};
1052 1133
1053void 1134void
1054rxvt_font_xft::clear () 1135rxvt_font_xft::clear ()
1055{ 1136{
1056 if (f) 1137 if (f)
1057 { 1138 {
1058 XftFontClose (DISPLAY, f); 1139 XftFontClose (term->dpy, f);
1059 f = 0; 1140 f = 0;
1060 } 1141 }
1061} 1142}
1062 1143
1063rxvt_fontprop 1144rxvt_fontprop
… …
1067 1148
1068 FT_Face face = XftLockFace (f); 1149 FT_Face face = XftLockFace (f);
1069 1150
1070 p.width = width; 1151 p.width = width;
1071 p.height = height; 1152 p.height = height;
1153 p.ascent = ascent;
1072 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1154 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1073 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1155 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1074 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1156 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1075 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1157 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1076 1158
… …
1078 1160
1079 return p; 1161 return p;
1080} 1162}
1081 1163
1082bool 1164bool
1083rxvt_font_xft::load (const rxvt_fontprop &prop) 1165rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1084{ 1166{
1167 dTermDisplay;
1168
1085 clear (); 1169 clear ();
1086 1170
1087 FcPattern *p = FcNameParse ((FcChar8 *) name); 1171 FcPattern *p = FcNameParse ((FcChar8 *) name);
1088 1172
1089 if (!p) 1173 if (!p)
1090 return false; 1174 return false;
1091 1175
1092 FcValue v; 1176 FcValue v;
1093 1177
1094 if (prop.height != rxvt_fontprop::unset 1178 if (prop.height != rxvt_fontprop::unset
1095 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1179 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1096 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1180 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1097 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1181 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1098 1182
1099 if (prop.weight != rxvt_fontprop::unset 1183 if (prop.weight != rxvt_fontprop::unset
1100 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1184 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1101 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1185 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1102 1186
1103 if (prop.slant != rxvt_fontprop::unset 1187 if (prop.slant != rxvt_fontprop::unset
1104 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1188 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1105 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1189 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1106 1190
1107#if 0 // clipping unfortunately destroys our precious double-width-characters 1191#if 0 // clipping unfortunately destroys our precious double-width-characters
1108 // clip width, we can't do better, or can we? 1192 // clip width, we can't do better, or can we?
1109 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1193 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1110 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1194 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1111#endif 1195#endif
1112 1196
1113 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1197 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1114 FcPatternAddBool (p, FC_MINSPACE, 1); 1198 FcPatternAddBool (p, FC_MINSPACE, 1);
1115 1199
1116 // store generated name so iso14755 view gives better results 1200 // store generated name so iso14755 view gives better results
1117 set_name ((char *)FcNameUnparse (p)); 1201 set_name ((char *)FcNameUnparse (p));
1118 1202
1119 XftResult result; 1203 XftResult result;
1120 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1204 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1121 1205
1122 FcPatternDestroy (p); 1206 FcPatternDestroy (p);
1123 1207
1124 if (!match) 1208 if (!match)
1125 return false; 1209 return false;
… …
1127 int ftheight = 0; 1211 int ftheight = 0;
1128 bool success = true; 1212 bool success = true;
1129 1213
1130 for (;;) 1214 for (;;)
1131 { 1215 {
1132 f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); 1216 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
1133 1217
1134 if (!f) 1218 if (!f)
1135 { 1219 {
1136 success = false; 1220 success = false;
1137 break; 1221 break;
… …
1146 1230
1147 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1231 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1148 1232
1149 XftUnlockFace (f); 1233 XftUnlockFace (f);
1150 1234
1235 int glheight = height;
1236
1151 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1237 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1152 { 1238 {
1153 FcChar16 ch = *t; 1239 FcChar16 ch = *t;
1154 1240
1155 if (cs != CS_UNICODE 1241 if (cs != CS_UNICODE
… …
1161 bool careful; 1247 bool careful;
1162 if (!has_char (*t, &prop, careful)) 1248 if (!has_char (*t, &prop, careful))
1163 continue; 1249 continue;
1164 1250
1165 XGlyphInfo g; 1251 XGlyphInfo g;
1166 XftTextExtents16 (DISPLAY, f, &ch, 1, &g); 1252 XftTextExtents16 (disp, f, &ch, 1, &g);
1167 1253
1254 g.width -= g.x;
1255
1168 int wcw = wcwidth (ch); 1256 int wcw = WCWIDTH (ch);
1169 if (wcw > 0) g.width = g.width / wcw; 1257 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1170 1258
1171 if (width < g.width) width = g.width; 1259 if (width < g.width ) width = g.width;
1172 if (height < g.height) height = g.height; 1260 if (height < g.height ) height = g.height;
1261 if (glheight < g.height - g.y) glheight = g.height - g.y;
1262 }
1263
1264 if (!width)
1265 {
1266 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1267
1268 XftFontClose (disp, f);
1269 f = 0;
1270
1271 success = false;
1272 break;
1173 } 1273 }
1174 1274
1175 if (prop.height == rxvt_fontprop::unset 1275 if (prop.height == rxvt_fontprop::unset
1176 || height <= prop.height 1276 || (height <= prop.height && glheight <= prop.height)
1177 || height <= 2 1277 || height <= 2
1178 || !scalable) 1278 || !scalable)
1179 break; 1279 break;
1180 1280
1181 if (ftheight) 1281 if (ftheight)
… …
1188 ftheight -= height - prop.height; 1288 ftheight -= height - prop.height;
1189 } 1289 }
1190 else 1290 else
1191 ftheight = prop.height - 1; 1291 ftheight = prop.height - 1;
1192 1292
1193 XftFontClose (DISPLAY, f); 1293 XftFontClose (disp, f);
1194 FcPatternDel (match, FC_PIXEL_SIZE); 1294 FcPatternDel (match, FC_PIXEL_SIZE);
1195 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1295 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1196 } 1296 }
1197 1297
1198 FcPatternDestroy (match); 1298 FcPatternDestroy (match);
1199 1299
1200#if 0 // do it per-character 1300#if 0 // do it per-character
… …
1207 1307
1208 return success; 1308 return success;
1209} 1309}
1210 1310
1211bool 1311bool
1212rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1312rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1213{ 1313{
1214 careful = false; 1314 careful = false;
1215 1315
1216 if (!XftCharExists (DISPLAY, f, unicode)) 1316 if (!XftCharExists (term->dpy, f, unicode))
1217 return false; 1317 return false;
1218 1318
1219 if (!prop || prop->width == rxvt_fontprop::unset) 1319 if (!prop || prop->width == rxvt_fontprop::unset)
1220 return true; 1320 return true;
1221 1321
1222 // check character against base font bounding box 1322 // check character against base font bounding box
1223 FcChar32 ch = unicode; 1323 FcChar32 ch = unicode;
1224 XGlyphInfo g; 1324 XGlyphInfo g;
1225 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1325 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1226 1326
1227 int w = g.width; 1327 int w = g.width - g.x;
1228 int wcw = wcwidth (unicode); 1328 int wcw = max (WCWIDTH (unicode), 1);
1229 if (wcw > 0) w /= wcw;
1230 1329
1231 careful = w > prop->width; 1330 careful = g.x > 0 || w > prop->width * wcw;
1232 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1331
1332 if (careful && !OVERLAP_OK (w, wcw, prop))
1333 return false;
1334
1335 // this weeds out _totally_ broken fonts, or glyphs
1336 if (!OVERLAP_OK (g.xOff, wcw, prop))
1233 return false; 1337 return false;
1234 1338
1235 return true; 1339 return true;
1236} 1340}
1237 1341
1238void 1342void
1239rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1343rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1240 const text_t *text, int len, 1344 const text_t *text, int len,
1241 int fg, int bg) 1345 int fg, int bg)
1242{ 1346{
1243 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
1244
1245 int base = ascent; // should be fbase, but that is incorrect
1246
1247 XGlyphInfo extents; 1347 XGlyphInfo extents;
1248 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1348 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1249 FcChar32 *ep = enc; 1349 XftGlyphSpec *ep = enc;
1250 int ewidth = 0; 1350
1251 int xoff = 0; 1351 dTermDisplay;
1352 dTermGC;
1353
1354 int w = term->fwidth * len;
1355 int h = term->fheight;
1356
1357 bool buffered = bg >= Color_transparent
1358 && term->option (Opt_buffered);
1359
1360 // cut trailing spaces
1361 while (len && text [len - 1] == ' ')
1362 len--;
1363
1364 int x_ = buffered ? 0 : x;
1365 int y_ = buffered ? 0 : y;
1252 1366
1253 while (len) 1367 while (len)
1254 { 1368 {
1255 int cwidth = r->TermWin.fwidth; 1369 int cwidth = term->fwidth;
1256 FcChar32 fc = *text++; len--; 1370 FcChar32 fc = *text++; len--;
1257 FT_UInt gl;
1258 1371
1259 while (len && *text == NOCHAR) 1372 while (len && *text == NOCHAR)
1260 text++, len--, cwidth += r->TermWin.fwidth; 1373 text++, len--, cwidth += term->fwidth;
1261
1262 gl = XftCharIndex (d.display->display, f, fc);
1263 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1264 1374
1265 if (extents.xOff != cwidth && ep != enc) 1375 if (fc != ' ') // skip spaces
1266 {
1267 if (xoff > ewidth) xoff = ewidth;
1268 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1269 x + (ewidth - xoff >> 1),
1270 y + base, enc, ep - enc);
1271 x += ewidth;
1272
1273 ep = enc;
1274 ewidth = 0;
1275 xoff = 0;
1276 } 1376 {
1377 FT_UInt glyph = XftCharIndex (disp, f, fc);
1378 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1277 1379
1278 if (fc == ' ' && ep == enc) // skip leading spaces 1380 ep->glyph = glyph;
1381 ep->x = x_ + (cwidth - extents.xOff >> 1);
1382 ep->y = y_ + ascent;
1383
1384 if (extents.xOff == 0)
1385 ep->x = x_ + cwidth;
1386
1387 ep++;
1279 { 1388 }
1389
1280 x += cwidth; 1390 x_ += cwidth;
1281 continue; 1391 }
1392
1393 if (buffered)
1394 {
1395 if (ep != enc)
1282 } 1396 {
1397 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1283 1398
1399#ifdef HAVE_BG_PIXMAP
1400 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1401
1402 if (term->bgPixmap.pixmap
1403 && (bg == Color_transparent || bg == Color_bg
1404 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1405 {
1406 int src_x = x, src_y = y;
1407
1408 if (term->bgPixmap.is_parentOrigin ())
1409 {
1410 src_x += term->window_vt_x;
1411 src_y += term->window_vt_y;
1412 }
1413
1414 if (term->bgPixmap.pmap_width >= src_x + w
1415 && term->bgPixmap.pmap_height >= src_y + h)
1416 {
1417 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1418 src_x, src_y, w, h, 0, 0);
1419 }
1420 else
1421 {
1422 XGCValues gcv;
1423
1424 gcv.fill_style = FillTiled;
1425 gcv.tile = term->bgPixmap.pixmap;
1426 gcv.ts_x_origin = -src_x;
1427 gcv.ts_y_origin = -src_y;
1428
1429 XChangeGC (disp, gc,
1430 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1431 &gcv);
1432
1433 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1434
1435 gcv.fill_style = FillSolid;
1436 XChangeGC (disp, gc, GCFillStyle, &gcv);
1437 }
1438
1439 if (dst)
1440 {
1441 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1442
1443 // dst can only be set when bg >= 0
1444 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1445 }
1446 }
1447 else
1448#endif
1449 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1450
1451 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1452 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1453 }
1284 else 1454 else
1285 { 1455 clear_rect (d, x, y, w, h, bg);
1286 *ep++ = gl;
1287 ewidth += cwidth;
1288 xoff += extents.xOff;
1289 }
1290 }
1291
1292 if (ep != enc)
1293 { 1456 }
1294 if (xoff > ewidth) xoff = ewidth; 1457 else
1295 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1296 x + (ewidth - xoff >> 1),
1297 y + base, enc, ep - enc);
1298 } 1458 {
1459 clear_rect (d, x, y, w, h, bg);
1460 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1461 }
1299} 1462}
1463
1300#endif 1464#endif
1301 1465
1302///////////////////////////////////////////////////////////////////////////// 1466/////////////////////////////////////////////////////////////////////////////
1303 1467
1304rxvt_fontset::rxvt_fontset (rxvt_t r) 1468rxvt_fontset::rxvt_fontset (rxvt_term *term)
1305: r (r), fontdesc (0) 1469: fontdesc (0), term (term)
1306{ 1470{
1307 clear (); 1471 clear ();
1308} 1472}
1309 1473
1310rxvt_fontset::~rxvt_fontset () 1474rxvt_fontset::~rxvt_fontset ()
… …
1313} 1477}
1314 1478
1315void 1479void
1316rxvt_fontset::clear () 1480rxvt_fontset::clear ()
1317{ 1481{
1318 prop.width = prop.height = prop.weight = prop.slant 1482 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1319 = rxvt_fontprop::unset; 1483 = rxvt_fontprop::unset;
1484 force_prop = false;
1320 1485
1321 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1486 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1322 FONT_UNREF (*i); 1487 FONT_UNREF (*i);
1323 1488
1324 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1489 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1333 1498
1334rxvt_font * 1499rxvt_font *
1335rxvt_fontset::new_font (const char *name, codeset cs) 1500rxvt_fontset::new_font (const char *name, codeset cs)
1336{ 1501{
1337 rxvt_font *f; 1502 rxvt_font *f;
1338 1503
1339 if (!name || !*name) 1504 if (!name || !*name)
1340 { 1505 {
1341 name = ""; 1506 name = "";
1342 f = new rxvt_font_default (this); 1507 f = new rxvt_font_default (this);
1343 } 1508 }
… …
1354 f = new rxvt_font_x11; 1519 f = new rxvt_font_x11;
1355 } 1520 }
1356 else 1521 else
1357 f = new rxvt_font_x11; 1522 f = new rxvt_font_x11;
1358 1523
1359 f->set_term (r); 1524 f->set_term (term);
1360 f->set_name (strdup (name)); 1525 f->set_name (strdup (name));
1361 1526
1362 f->cs = cs; 1527 f->cs = cs;
1363 f->loaded = false; 1528 f->loaded = false;
1364 1529
… …
1375 char buf[512]; 1540 char buf[512];
1376 const char *end; 1541 const char *end;
1377 1542
1378 do 1543 do
1379 { 1544 {
1380 while (*desc <= ' ') desc++; 1545 while (*desc && *desc <= ' ')
1546 desc++;
1381 1547
1382 codeset cs = CS_UNICODE; 1548 codeset cs = CS_UNICODE;
1383 1549
1384 if (*desc == '[') 1550 if (*desc == '[')
1385 { 1551 {
… …
1410 if (!end) 1576 if (!end)
1411 end = desc + strlen (desc); 1577 end = desc + strlen (desc);
1412 1578
1413 if (end - desc < 511) 1579 if (end - desc < 511)
1414 { 1580 {
1415 strncpy (buf, desc, end - desc); 1581 memcpy (buf, desc, end - desc);
1416 buf[end - desc] = 0; 1582 buf[end - desc] = 0;
1417 1583
1418 fonts.push_back (new_font (buf, cs)); 1584 fonts.push_back (new_font (buf, cs));
1419 } 1585 }
1420 else 1586 else
… …
1435 if (fonts[i]->loaded) 1601 if (fonts[i]->loaded)
1436 return true; 1602 return true;
1437 1603
1438 fonts[i]->loaded = true; 1604 fonts[i]->loaded = true;
1439 1605
1440 if (!fonts[i]->load (prop)) 1606 if (!fonts[i]->load (prop, force_prop))
1441 { 1607 {
1442 fonts[i]->cs = CS_UNKNOWN; 1608 fonts[i]->cs = CS_UNKNOWN;
1443 return false; 1609 return false;
1444 } 1610 }
1445 1611
… …
1470 1636
1471 return -1; 1637 return -1;
1472} 1638}
1473 1639
1474int 1640int
1475rxvt_fontset::find_font (unicode_t unicode) 1641rxvt_fontset::find_font_idx (unicode_t unicode)
1476{ 1642{
1477 if (unicode >= 1<<20) 1643 if (unicode >= 1<<20)
1478 return 0; 1644 return 0;
1479 1645
1480 unicode_t hi = unicode >> 8; 1646 unicode_t hi = unicode >> 8;
… …
1495 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1661 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1496 goto next_font; 1662 goto next_font;
1497 1663
1498 if (!realize_font (i)) 1664 if (!realize_font (i))
1499 goto next_font; 1665 goto next_font;
1666
1667 if (prop.ascent != rxvt_fontprop::unset)
1668 max_it (f->ascent, prop.ascent);
1500 } 1669 }
1501 1670
1502 if (f->cs == CS_UNKNOWN) 1671 if (f->cs == CS_UNKNOWN)
1503 goto next_font; 1672 goto next_font;
1504 1673
… …
1543 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1712 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1544 FcPatternAddBool (p, FC_MINSPACE, 1); 1713 FcPatternAddBool (p, FC_MINSPACE, 1);
1545 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1714 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1546 1715
1547 XftResult result; 1716 XftResult result;
1548 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1717 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1549 1718
1550 FcPatternDestroy (p); 1719 FcPatternDestroy (p);
1551 1720
1552 if (match) 1721 if (match)
1553 { 1722 {
… …
1556 FcPatternDestroy (match); 1725 FcPatternDestroy (match);
1557 1726
1558 if (find_font (font) < 0) 1727 if (find_font (font) < 0)
1559 { 1728 {
1560 char fontname[4096]; 1729 char fontname[4096];
1561 sprintf (fontname, "xft:%-.4090s", font); 1730 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1562 1731
1563 fonts.push_back (new_font (fontname, CS_UNICODE)); 1732 fonts.push_back (new_font (fontname, CS_UNICODE));
1564 } 1733 }
1565 1734
1566 free (font); 1735 free (font);
1567 } 1736 }
1568#endif 1737#endif
… …
1590 } 1759 }
1591 1760
1592 return i; 1761 return i;
1593} 1762}
1594 1763
1764int
1765rxvt_fontset::find_font (unicode_t unicode)
1766{
1767 int id = find_font_idx (unicode);
1595 1768
1596 1769 return min<int> (fontCount, id & 127) | (id & 128 ? Careful : 0);
1770}

Diff Legend

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