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

Diff Legend

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