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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.67 by root, Sat Feb 12 18:55:04 2005 UTC vs.
Revision 1.161 by root, Wed Mar 31 22:22:32 2010 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-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{
336 Display *disp = d.display->display; 339 dTermDisplay;
340 dTermGC;
337 341
338 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);
339 343
340 XSetForeground (disp, TGC, r->pix_colors[fg]); 344 XSetForeground (disp, gc, term->pix_colors[fg]);
341 345
342 while (len) 346 while (len)
343 { 347 {
344#if ENABLE_COMBINING 348#if ENABLE_COMBINING
345 compose_char *cc; 349 compose_char *cc;
… …
349 353
350 while (++text, --len && *text == NOCHAR) 354 while (++text, --len && *text == NOCHAR)
351 ; 355 ;
352 356
353 int width = text - tp; 357 int width = text - tp;
354 int fwidth = r->TermWin.fwidth * width; 358 int fwidth = term->fwidth * width;
355 359
360#ifdef BUILTIN_GLYPHS
356 if (0x2500 <= t && t <= 0x259f) 361 if (0x2500 <= t && t <= 0x259f)
357 { 362 {
363# include "table/linedraw.h"
358 uint16_t offs = linedraw_offs[t - 0x2500]; 364 uint16_t offs = linedraw_offs[t - 0x2500];
359 uint32_t *a = linedraw_command + (offs >> 4); 365 uint32_t *a = linedraw_command + (offs >> 4);
360 uint32_t *b = a + (offs & 15); 366 uint32_t *b = a + (offs & 15);
361 367
362 int W = fwidth; 368 int W = fwidth;
363 int H = r->TermWin.fheight; 369 int H = term->fheight;
364 370
365 int x_[16]; 371 int x_[16];
366 int y_[16]; 372 int y_[16];
367 373
368 for (int i = 0; i <= 8; i++) 374 for (int i = 0; i <= 8; i++)
… …
376 382
377 XGCValues gcv; 383 XGCValues gcv;
378 384
379 gcv.cap_style = CapButt; 385 gcv.cap_style = CapButt;
380 gcv.line_width = 0; 386 gcv.line_width = 0;
381 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 387 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
382 388
383 while (a < b) 389 while (a < b)
384 { 390 {
385 uint32_t command = *a++; 391 uint32_t command = *a++;
386 392
… …
393 int y2 = y_[(command >> 0) & 15]; 399 int y2 = y_[(command >> 0) & 15];
394 400
395 switch (op) 401 switch (op)
396 { 402 {
397 case 0: // line 403 case 0: // line
398 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 404 XDrawLine (disp, d, gc, x1, y1, x2, y2);
399 break; 405 break;
400 406
401 case 1: // rectangle, possibly stippled 407 case 1: // rectangle, possibly stippled
402 if (a) 408 if (a)
403 { 409 {
404 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 410 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
405 411
406 gcv.fill_style = FillStippled; 412 gcv.fill_style = FillStippled;
407 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 413 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
408 gcv.ts_x_origin = x; 414 gcv.ts_x_origin = x;
409 gcv.ts_y_origin = y; 415 gcv.ts_y_origin = y;
410 416
411 XChangeGC (disp, TGC, 417 XChangeGC (disp, gc,
412 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 418 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
413 &gcv); 419 &gcv);
414 } 420 }
415 421
416 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 422 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
417 423
418 if (a) 424 if (a)
419 { 425 {
420 XFreePixmap (disp, gcv.stipple); 426 XFreePixmap (disp, gcv.stipple);
421 gcv.stipple = 0; 427 gcv.stipple = 0;
422 gcv.fill_style = FillSolid; 428 gcv.fill_style = FillSolid;
423 XChangeGC (disp, TGC, GCFillStyle, &gcv); 429 XChangeGC (disp, gc, GCFillStyle, &gcv);
424 } 430 }
425 break; 431 break;
426 case 2: // arc 432 case 2: // arc
427 XDrawArc (disp, d, TGC, 433 XDrawArc (disp, d, gc,
428 x1 - W/2, y1 - H/2, W-1, H-1, 434 x1 - W/2, y1 - H/2, W-1, H-1,
429 (a - 1) * 90*64, (b - 1) * 90*64); 435 (a - 1) * 90*64, (b - 1) * 90*64);
430 break; 436 break;
431 } 437 }
432 } 438 }
433 } 439 }
440#else
441 if (0)
442 ;
443#endif
434#if ENABLE_COMBINING 444#if ENABLE_COMBINING
435 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
436 { 446 {
447 min_it (width, 2); // we only support wcwidth up to 2
448
437 text_t chrs[2]; 449 text_t chrs[2];
438 width = min (2, width);
439 chrs [1] = NOCHAR; 450 chrs [1] = NOCHAR;
440 451
441 *chrs = cc->c1; 452 *chrs = cc->c1;
442 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 453 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
443 f1->draw (d, x, y, chrs, width, fg, bg); 454 f1->draw (d, x, y, chrs, width, fg, bg);
… …
450 *chrs = cc->c2; 461 *chrs = cc->c2;
451 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
452 ? f1 463 ? f1
453 : (*fs)[fs->find_font (cc->c2)]; 464 : (*fs)[fs->find_font (cc->c2)];
454 465
455 f2->draw (d, x, y, chrs, width, fg, -1); 466 f2->draw (d, x, y, chrs, width, fg, Color_none);
456 } 467 }
457 } 468 }
458#endif 469#endif
459 else 470 else
460 switch (t) 471 switch (t)
… …
463 case ZERO_WIDTH_CHAR: 474 case ZERO_WIDTH_CHAR:
464 case NOCHAR: 475 case NOCHAR:
465 break; 476 break;
466 477
467 default: 478 default:
468 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 479 XDrawRectangle (disp, d, gc, x + 2, y + 2,
469 fwidth - 4, r->TermWin.fheight - 4); 480 fwidth - 4, term->fheight - 4);
470 } 481 }
471 482
472 x += fwidth; 483 x += fwidth;
473 } 484 }
474} 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};
475 536
476///////////////////////////////////////////////////////////////////////////// 537/////////////////////////////////////////////////////////////////////////////
477 538
478struct rxvt_font_x11 : rxvt_font { 539struct rxvt_font_x11 : rxvt_font {
479 rxvt_font_x11 () { f = 0; } 540 rxvt_font_x11 () { f = 0; }
480 541
481 void clear (); 542 void clear ();
482 543
483 rxvt_fontprop properties (); 544 rxvt_fontprop properties ();
484 545
485 bool load (const rxvt_fontprop &prop); 546 bool load (const rxvt_fontprop &prop, bool force_prop);
486 547
487 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;
488 549
489 void draw (rxvt_drawable &d, int x, int y, 550 void draw (rxvt_drawable &d, int x, int y,
490 const text_t *text, int len, 551 const text_t *text, int len,
491 int fg, int bg); 552 int fg, int bg);
492 553
493 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
494 XFontStruct *f; 555 XFontStruct *f;
495 codeset cs;
496 bool enc2b, encm; 556 bool enc2b, encm;
497 557
498 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 558 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
499 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 559 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
500 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 560 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
501 bool set_properties (rxvt_fontprop &p, const char *name); 561 bool set_properties (rxvt_fontprop &p, const char *name);
502}; 562};
503 563
504char * 564char *
505rxvt_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
506{ 566{
507 unsigned long value; 567 unsigned long value;
508 568
509 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 569 if (XGetFontProperty (f, property, &value))
510 return XGetAtomName (DISPLAY, value); 570 return XGetAtomName (term->dpy, value);
511 else 571 else
512 return rxvt_strdup (repl); 572 return repl ? strdup (repl) : 0;
513} 573}
514 574
515rxvt_fontprop 575rxvt_fontprop
516rxvt_font_x11::properties () 576rxvt_font_x11::properties ()
517{ 577{
… …
521} 581}
522 582
523bool 583bool
524rxvt_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)
525{ 585{
526 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;
527 p.height = height; 589 p.height = height;
590 p.ascent = rxvt_fontprop::unset;
528 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;
529 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;
530 593
531 return true; 594 return true;
532} 595}
… …
535rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 598rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
536{ 599{
537 unsigned long height; 600 unsigned long height;
538 601
539#if 0 602#if 0
540 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 603 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
541 return false; 604 return false;
542#else 605#else
543 height = f->ascent + f->descent; 606 height = f->ascent + f->descent;
544#endif 607#endif
545 608
546 unsigned long avgwidth; 609 unsigned long avgwidth;
547 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 610 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
548 avgwidth = 0; 611 avgwidth = 0;
549 612
550 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 613 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
551 char *slant = get_property (f, "SLANT", "r"); 614 char *slant = get_property (f, term->xa [XA_SLANT], "r");
552 615
553 set_properties (p, height, weight, slant, avgwidth); 616 set_properties (p, height, weight, slant, avgwidth);
554 617
555 free (weight); 618 free (weight);
556 free (slant); 619 free (slant);
557 620
621 p.ascent = f->ascent;
622
558 return true; 623 return true;
559} 624}
560 625
561bool 626bool
562rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 627rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
563{ 628{
629 dTermDisplay;
564 int slashes = 0; 630 int slashes = 0;
565 const char *comp[13]; 631 const char *comp[13];
566 632
567 for (const char *c = name; *c; c++) 633 for (const char *c = name; *c; c++)
568 if (*c == '-') 634 if (*c == '-')
… …
576 if (slashes >= 13 642 if (slashes >= 13
577 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 643 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
578 && (*comp[11] >= '0' && *comp[11] <= '9')) 644 && (*comp[11] >= '0' && *comp[11] <= '9'))
579 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]));
580 646
581 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 647 XFontStruct *f = XLoadQueryFont (disp, name);
582 648
583 if (f) 649 if (f)
584 { 650 {
585 // 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
586 // (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).
587 // in that case, just return garbage. 653 // in that case, just return garbage.
588 bool ret = set_properties (p, f); 654 bool ret = set_properties (p, f);
589 XFreeFont (DISPLAY, f); 655 XFreeFont (disp, f);
590 return ret; 656 return ret;
591 } 657 }
592 else 658 else
593 return false; 659 return false;
594} 660}
595 661
596// fix the size of scalable fonts 662// fix the size of scalable fonts
597static bool 663static bool
598replace_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)
599{ 665{
600 int slashes = 0; 666 int slashes = 0;
601 const char *field, *end; 667 const char *field, *end;
602 668
603 for (const char *c = name; *c; c++) 669 for (const char *c = name; *c; c++)
… …
613 break; 679 break;
614 } 680 }
615 681
616 if (slashes >= 13 && (!old || *field == old)) 682 if (slashes >= 13 && (!old || *field == old))
617 { 683 {
618 // TODO: check for overflow in font-name 684 size_t len = field - name;
619 strncpy (buf, name, field - name); 685 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
620 buf += field - name; 686 memcpy (*ptr, name, len);
621 strcpy (buf, replace); 687 strcpy (*ptr + len, replace);
622 strcat (buf, end); 688 strcat (*ptr, end);
623 689
624 return true; 690 return true;
625 } 691 }
626 else 692 else
627 { 693 {
628 strcpy (buf, name); 694 *ptr = strdup (name);
629 695
630 return false; 696 return false;
631 } 697 }
632} 698}
633 699
634bool 700bool
635rxvt_font_x11::load (const rxvt_fontprop &prop) 701rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
636{ 702{
637 Display *disp = DISPLAY; 703 dTermDisplay;
638 704
639 clear (); 705 clear ();
640 706
641 char field_str[64]; // enough for 128 bits 707 char field_str[64]; // enough for 128 bits
642 708
643 // first morph the font if required 709 // first morph the font if required
644 if (prop.weight != rxvt_fontprop::unset 710 if (force_prop)
645 || prop.slant != rxvt_fontprop::unset)
646 { 711 {
647 char fname[1024]; 712 char *fname;
648 713
649 if (name[0] != '-') 714 if (name[0] != '-')
650 { 715 {
651 f = XLoadQueryFont (disp, name); 716 f = XLoadQueryFont (disp, name);
652 717
653 if (!f) 718 if (!f)
654 return false; 719 return false;
655 720
656 char *new_name = get_property (f, "FONT", name); 721 char *new_name = get_property (f, XA_FONT, name);
657 722
658 if (new_name) 723 if (new_name)
659 set_name (new_name); 724 set_name (new_name);
660 else 725 else
661 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 726 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
664 f = 0; 729 f = 0;
665 } 730 }
666 731
667 if (prop.weight != rxvt_fontprop::unset) 732 if (prop.weight != rxvt_fontprop::unset)
668 { 733 {
669 replace_field (fname, name, 2, 0, 734 replace_field (&fname, name, 2, 0,
670 prop.weight < rxvt_fontprop::bold 735 prop.weight < rxvt_fontprop::bold
671 ? "medium" : "bold"); 736 ? "medium" : "bold");
672 set_name (strdup (fname)); 737 set_name (fname);
673 } 738 }
674 739
675 if (prop.slant != rxvt_fontprop::unset) 740 if (prop.slant != rxvt_fontprop::unset)
676 { 741 {
677 replace_field (fname, name, 3, 0, 742 replace_field (&fname, name, 3, 0,
678 prop.slant < rxvt_fontprop::italic 743 prop.slant < rxvt_fontprop::italic
679 ? "r" : "i"); // TODO: handle "o"blique, too 744 ? "r" : "i"); // TODO: handle "o"blique, too
680 set_name (strdup (fname)); 745 set_name (fname);
681 } 746 }
682 } 747 }
683 748
684 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 749 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
685 ? 0 : prop.height); 750 ? 0 : prop.height);
… …
710 font_weight *fonts = new font_weight[count]; 775 font_weight *fonts = new font_weight[count];
711 776
712 for (int i = 0; i < count; i++) 777 for (int i = 0; i < count; i++)
713 { 778 {
714 rxvt_fontprop p; 779 rxvt_fontprop p;
715 char fname[1024]; 780 char *fname;
716 781
717 int diff = 0; 782 int diff = 0;
718 783
719 if (replace_field (fname, list[i], 6, '0', field_str)) 784 if (replace_field (&fname, list[i], 6, '0', field_str))
720 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 }
721 792
722 if (!set_properties (p, fname)) 793 if (!set_properties (p, fname))
723 continue; 794 continue;
724 795
725 if (prop.height != rxvt_fontprop::unset 796 if (prop.height != rxvt_fontprop::unset
… …
729 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;
730 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);
731 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);
732 //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);
733 804
734 fonts[i].name = strdup (fname); 805 fonts[i].name = fname;
735 fonts[i].diff = diff; 806 fonts[i].diff = diff;
736 } 807 }
737 808
738 XFreeFontNames (list); 809 XFreeFontNames (list);
739 810
… …
741 for (;;) 812 for (;;)
742 { 813 {
743 font_weight *best = fonts + count - 1; 814 font_weight *best = fonts + count - 1;
744 815
745 for (font_weight *w = best; w-- > fonts; ) 816 for (font_weight *w = best; w-- > fonts; )
746 if (w->diff < best->diff) 817 if (w->diff <= best->diff)
747 best = w; 818 best = w;
748 819
749 if (!best->name 820 if (!best->name
750 || !(f = XLoadQueryFont (disp, best->name))) 821 || !(f = XLoadQueryFont (disp, best->name)))
751 break; 822 break;
… …
768 delete [] fonts; 839 delete [] fonts;
769 840
770 if (!f) 841 if (!f)
771 return false; 842 return false;
772 843
773 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 844 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
774 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;
775 848
776 if (registry && encoding) 849 if (registry && encoding)
777 { 850 {
778 char charset[64]; 851 char charset[64];
779 snprintf (charset, 64, "%s-%s", registry, encoding); 852 snprintf (charset, 64, "%s-%s", registry, encoding);
780 853
781 cs = codeset_from_name (charset); 854 cs = codeset_from_name (charset);
782 } 855
783 else 856 if (cs == CS_UNKNOWN)
857 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
784 { 858 }
859
860 free (registry);
861 free (encoding);
862
863 if (cs == CS_UNKNOWN)
864 {
785 const char *charset = get_property (f, "FONT", 0); 865 const char *charset = get_property (f, XA_FONT, 0);
786 866
787 if (!charset) 867 if (!charset)
788 charset = name; 868 charset = name;
789 869
790 int count = 13; 870 int count = 13;
791 while (*charset) 871 while (*charset)
792 if (*charset++ == '-' && !--count) 872 if (*charset++ == '-' && !--count)
793 break; 873 break;
794 874
795 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)
796 } 881 {
797 882 clear ();
798 free (registry); 883 return false;
799 free (encoding); 884 }
800 885
801 if (cs == CS_UNICODE) 886 if (cs == CS_UNICODE)
802 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
803 888
804 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 889 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
805 enc2b = encm || f->max_char_or_byte2 > 255; 890 enc2b = encm || f->max_char_or_byte2 > 255;
806 891
807 slow = false; 892 slow = false;
808 893
809#if 1 // only used for slow detection, TODO optimize 894#if 1 // only used for slow detection, TODO optimize
810 if (f->min_bounds.width == f->max_bounds.width) 895 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
811 width = f->min_bounds.width;
812 else if (f->per_char == NULL)
813 width = f->max_bounds.width; 896 width = f->max_bounds.width;
814 else 897 else
815 { 898 {
816 slow = true; 899 slow = true;
817 900
818 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;
819 902
820 if (encm) 903 if (encm)
821 N += (f->max_byte1 - f->min_byte1) 904 N += (f->max_byte1 - f->min_byte1)
822 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 905 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
823 906
824 while (N) 907 while (N)
825 { 908 {
826 if (f->per_char[N].width > width) 909 if (f->per_char[N].width > width)
827 width = f->per_char[N].width; 910 width = f->per_char[N].width;
828 911
… …
833 916
834 width = 1; 917 width = 1;
835 918
836 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; )
837 { 920 {
838 if (cs != CS_UNICODE
839 && *t > 0x100
840 && FROM_UNICODE (cs, *t) == NOCHAR) 921 if (FROM_UNICODE (cs, *t) == NOCHAR)
841 continue; 922 continue;
842 923
843 // ignore characters we wouldn't use anyways 924 // ignore characters we wouldn't use anyways
844 bool careful; 925 bool careful;
845 if (!has_char (*t, &prop, careful)) 926 if (!has_char (*t, &prop, careful))
… …
849 930
850 XCharStruct g; 931 XCharStruct g;
851 int dir_ret, asc_ret, des_ret; 932 int dir_ret, asc_ret, des_ret;
852 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 933 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
853 934
854 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;
855 937
856 if (width < g.width) width = g.width; 938 if (width < g.width) width = g.width;
857 }
858
859 if (cs == CS_UNKNOWN)
860 { 939 }
861 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
862 940
941#if 0 // do it per-character
942 if (prop && width > prop->width)
943 {
863 clear (); 944 clear ();
864 return false; 945 return false;
865 } 946 }
866
867#if 0 // do it per-character
868 if (prop && width > prop->width)
869 {
870 clear ();
871 return false;
872 }
873#endif 947#endif
874 948
875 return true; 949 return true;
876} 950}
877 951
878void 952void
879rxvt_font_x11::clear () 953rxvt_font_x11::clear ()
880{ 954{
881 if (f) 955 if (f)
882 { 956 {
883 XFreeFont (DISPLAY, f); 957 XFreeFont (term->dpy, f);
884 f = 0; 958 f = 0;
885 } 959 }
886} 960}
887 961
888bool 962bool
889rxvt_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
890{ 964{
891 uint32_t ch = FROM_UNICODE (cs, unicode); 965 uint32_t ch = FROM_UNICODE (cs, unicode);
892 966
893 if (ch == NOCHAR) 967 if (ch == NOCHAR)
894 return false; 968 return false;
895 969
896 /* check wether the character exists in _this_ font. horrible. */ 970 /* check whether the character exists in _this_ font. horrible. */
897 XCharStruct *xcs; 971 XCharStruct *xcs;
898 972
899 if (encm) 973 if (encm)
900 { 974 {
901 unsigned char byte1 = ch >> 8; 975 unsigned char byte1 = ch >> 8;
… …
931 return false; 1005 return false;
932 1006
933 if (!prop || prop->width == rxvt_fontprop::unset) 1007 if (!prop || prop->width == rxvt_fontprop::unset)
934 return true; 1008 return true;
935 1009
936 // check character against base font bounding box 1010 // check whether character overlaps previous/next character
937 int w = xcs->width; 1011 int w = xcs->rbearing - xcs->lbearing;
938 int wcw = wcwidth (unicode); 1012 int wcw = max (WCWIDTH (unicode), 1);
939 if (wcw > 0) w /= wcw;
940 1013
941 careful = w > prop->width; 1014 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
942 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1015
1016 if (careful && !OVERLAP_OK (w, wcw, prop))
943 return false; 1017 return false;
944 1018
945 return true; 1019 return true;
946} 1020}
947 1021
… …
953 // this looks like a mess /. 1027 // this looks like a mess /.
954 // and it is a mess /. 1028 // and it is a mess /.
955 // yet we are trying to be perfect /. 1029 // yet we are trying to be perfect /.
956 // but the result still isn't perfect /. 1030 // but the result still isn't perfect /.
957 1031
1032 dTermDisplay;
1033 dTermGC;
1034
958 bool slow = this->slow 1035 bool slow = this->slow
959 || width != r->TermWin.fwidth 1036 || width != term->fwidth
960 || height != r->TermWin.fheight; 1037 || height != term->fheight;
961 1038
962 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 1039 int base = ascent; // sorry, incorrect: term->fbase;
963 1040
964 XGCValues v; 1041 XGCValues v;
965 v.foreground = r->pix_colors[fg]; 1042 v.foreground = term->pix_colors[fg];
966 v.font = f->fid; 1043 v.font = f->fid;
967 1044
968 if (enc2b) 1045 if (enc2b)
969 { 1046 {
970 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 1047 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
971 1048
972 if (bg == Color_bg && !slow) 1049 if (bg == Color_bg && !slow)
973 { 1050 {
974 v.background = r->pix_colors[bg]; 1051 v.background = term->pix_colors[bg];
975 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1052 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
976 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 1053 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
977 } 1054 }
978 else 1055 else
979 { 1056 {
980 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);
981 1058
982 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1059 XChangeGC (disp, gc, GCForeground | GCFont, &v);
983 1060
984 if (slow) 1061 if (slow)
985 { 1062 {
986 do 1063 do
987 { 1064 {
988 if (xc->byte1 || xc->byte2) 1065 if (xc->byte1 || xc->byte2)
989 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1066 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
990 1067
991 x += r->TermWin.fwidth; 1068 x += term->fwidth;
992 xc++; len--; 1069 xc++; len--;
993 } 1070 }
994 while (len); 1071 while (len);
995 } 1072 }
996 else 1073 else
997 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1074 XDrawString16 (disp, d, gc, x, y + base, xc, len);
998 } 1075 }
999 } 1076 }
1000 else 1077 else
1001 { 1078 {
1002 const char *xc = enc_char (text, len, cs, slow); 1079 const char *xc = enc_char (text, len, cs, slow);
1003 1080
1004 if (bg == Color_bg && !slow) 1081 if (bg == Color_bg && !slow)
1005 { 1082 {
1006 v.background = r->pix_colors[bg]; 1083 v.background = term->pix_colors[bg];
1007 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1084 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1008 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1085 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1009 } 1086 }
1010 else 1087 else
1011 { 1088 {
1012 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);
1013 1090
1014 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1091 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1015 1092
1016 if (slow) 1093 if (slow)
1017 { 1094 {
1018 do 1095 do
1019 { 1096 {
1020 if (*xc) 1097 if (*xc)
1021 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1098 XDrawString (disp, d, gc, x, y + base, xc, 1);
1022 1099
1023 x += r->TermWin.fwidth; 1100 x += term->fwidth;
1024 xc++; len--; 1101 xc++; len--;
1025 } 1102 }
1026 while (len); 1103 while (len);
1027 } 1104 }
1028 else 1105 else
1029 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1106 XDrawString (disp, d, gc, x, y + base, xc, len);
1030 } 1107 }
1031 } 1108 }
1032} 1109}
1033 1110
1034///////////////////////////////////////////////////////////////////////////// 1111/////////////////////////////////////////////////////////////////////////////
… …
1040 1117
1041 void clear (); 1118 void clear ();
1042 1119
1043 rxvt_fontprop properties (); 1120 rxvt_fontprop properties ();
1044 1121
1045 bool load (const rxvt_fontprop &prop); 1122 bool load (const rxvt_fontprop &prop, bool force_prop);
1046 1123
1047 void draw (rxvt_drawable &d, int x, int y, 1124 void draw (rxvt_drawable &d, int x, int y,
1048 const text_t *text, int len, 1125 const text_t *text, int len,
1049 int fg, int bg); 1126 int fg, int bg);
1050 1127
1051 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;
1052 1129
1053protected: 1130protected:
1054 XftFont *f; 1131 XftFont *f;
1055}; 1132};
1056 1133
1057void 1134void
1058rxvt_font_xft::clear () 1135rxvt_font_xft::clear ()
1059{ 1136{
1060 if (f) 1137 if (f)
1061 { 1138 {
1062 XftFontClose (DISPLAY, f); 1139 XftFontClose (term->dpy, f);
1063 f = 0; 1140 f = 0;
1064 } 1141 }
1065} 1142}
1066 1143
1067rxvt_fontprop 1144rxvt_fontprop
… …
1071 1148
1072 FT_Face face = XftLockFace (f); 1149 FT_Face face = XftLockFace (f);
1073 1150
1074 p.width = width; 1151 p.width = width;
1075 p.height = height; 1152 p.height = height;
1153 p.ascent = ascent;
1076 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1154 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1077 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1155 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1078 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1156 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1079 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1157 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1080 1158
… …
1082 1160
1083 return p; 1161 return p;
1084} 1162}
1085 1163
1086bool 1164bool
1087rxvt_font_xft::load (const rxvt_fontprop &prop) 1165rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1088{ 1166{
1089 Display *disp = DISPLAY; 1167 dTermDisplay;
1090 1168
1091 clear (); 1169 clear ();
1092 1170
1093 FcPattern *p = FcNameParse ((FcChar8 *) name); 1171 FcPattern *p = FcNameParse ((FcChar8 *) name);
1094 1172
… …
1096 return false; 1174 return false;
1097 1175
1098 FcValue v; 1176 FcValue v;
1099 1177
1100 if (prop.height != rxvt_fontprop::unset 1178 if (prop.height != rxvt_fontprop::unset
1101 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1179 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1180 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1181 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104 1182
1105 if (prop.weight != rxvt_fontprop::unset 1183 if (prop.weight != rxvt_fontprop::unset
1106 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1184 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1107 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1185 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1108 1186
1109 if (prop.slant != rxvt_fontprop::unset 1187 if (prop.slant != rxvt_fontprop::unset
1110 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1188 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1111 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1189 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1112 1190
1113#if 0 // clipping unfortunately destroys our precious double-width-characters 1191#if 0 // clipping unfortunately destroys our precious double-width-characters
1114 // clip width, we can't do better, or can we? 1192 // clip width, we can't do better, or can we?
1115 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1193 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1116 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1194 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1117#endif 1195#endif
1118 1196
1119 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1197 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1120 FcPatternAddBool (p, FC_MINSPACE, 1); 1198 FcPatternAddBool (p, FC_MINSPACE, 1);
1121 1199
1122 // store generated name so iso14755 view gives better results 1200 // store generated name so iso14755 view gives better results
1123 set_name ((char *)FcNameUnparse (p)); 1201 set_name ((char *)FcNameUnparse (p));
1124 1202
1125 XftResult result; 1203 XftResult result;
1126 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1204 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1127 1205
1128 FcPatternDestroy (p); 1206 FcPatternDestroy (p);
1129 1207
1130 if (!match) 1208 if (!match)
1131 return false; 1209 return false;
… …
1152 1230
1153 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1231 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1154 1232
1155 XftUnlockFace (f); 1233 XftUnlockFace (f);
1156 1234
1235 int glheight = height;
1236
1157 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; )
1158 { 1238 {
1159 FcChar16 ch = *t; 1239 FcChar16 ch = *t;
1160 1240
1161 if (cs != CS_UNICODE 1241 if (cs != CS_UNICODE
… …
1169 continue; 1249 continue;
1170 1250
1171 XGlyphInfo g; 1251 XGlyphInfo g;
1172 XftTextExtents16 (disp, f, &ch, 1, &g); 1252 XftTextExtents16 (disp, f, &ch, 1, &g);
1173 1253
1254 g.width -= g.x;
1255
1174 int wcw = wcwidth (ch); 1256 int wcw = WCWIDTH (ch);
1175 if (wcw > 0) g.width = g.width / wcw; 1257 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1176 1258
1177 if (width < g.width) width = g.width; 1259 if (width < g.width ) width = g.width;
1178 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;
1179 } 1273 }
1180 1274
1181 if (prop.height == rxvt_fontprop::unset 1275 if (prop.height == rxvt_fontprop::unset
1182 || height <= prop.height 1276 || (height <= prop.height && glheight <= prop.height)
1183 || height <= 2 1277 || height <= 2
1184 || !scalable) 1278 || !scalable)
1185 break; 1279 break;
1186 1280
1187 if (ftheight) 1281 if (ftheight)
… …
1194 ftheight -= height - prop.height; 1288 ftheight -= height - prop.height;
1195 } 1289 }
1196 else 1290 else
1197 ftheight = prop.height - 1; 1291 ftheight = prop.height - 1;
1198 1292
1199 XftFontClose (disp, f); 1293 XftFontClose (disp, f);
1200 FcPatternDel (match, FC_PIXEL_SIZE); 1294 FcPatternDel (match, FC_PIXEL_SIZE);
1201 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1295 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1202 } 1296 }
1203 1297
1204 FcPatternDestroy (match); 1298 FcPatternDestroy (match);
1205 1299
1206#if 0 // do it per-character 1300#if 0 // do it per-character
… …
1213 1307
1214 return success; 1308 return success;
1215} 1309}
1216 1310
1217bool 1311bool
1218rxvt_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
1219{ 1313{
1220 careful = false; 1314 careful = false;
1221 1315
1222 if (!XftCharExists (DISPLAY, f, unicode)) 1316 if (!XftCharExists (term->dpy, f, unicode))
1223 return false; 1317 return false;
1224 1318
1225 if (!prop || prop->width == rxvt_fontprop::unset) 1319 if (!prop || prop->width == rxvt_fontprop::unset)
1226 return true; 1320 return true;
1227 1321
1228 // check character against base font bounding box 1322 // check character against base font bounding box
1229 FcChar32 ch = unicode; 1323 FcChar32 ch = unicode;
1230 XGlyphInfo g; 1324 XGlyphInfo g;
1231 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1325 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1232 1326
1233 int w = g.width; 1327 int w = g.width - g.x;
1234 int wcw = wcwidth (unicode); 1328 int wcw = max (WCWIDTH (unicode), 1);
1235 if (wcw > 0) w /= wcw;
1236 1329
1237 careful = w > prop->width; 1330 careful = g.x > 0 || w > prop->width * wcw;
1238 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))
1239 return false; 1337 return false;
1240 1338
1241 return true; 1339 return true;
1242} 1340}
1243 1341
1244void 1342void
1245rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1343rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1246 const text_t *text, int len, 1344 const text_t *text, int len,
1247 int fg, int bg) 1345 int fg, int bg)
1248{ 1346{
1249 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
1250
1251 int base = ascent; // should be fbase, but that is incorrect
1252
1253 XGlyphInfo extents; 1347 XGlyphInfo extents;
1254 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1348 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1255 FcChar32 *ep = enc; 1349 XftGlyphSpec *ep = enc;
1256 int ewidth = 0; 1350
1257 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;
1258 1366
1259 while (len) 1367 while (len)
1260 { 1368 {
1261 int cwidth = r->TermWin.fwidth; 1369 int cwidth = term->fwidth;
1262 FcChar32 fc = *text++; len--; 1370 FcChar32 fc = *text++; len--;
1263 FT_UInt gl;
1264 1371
1265 while (len && *text == NOCHAR) 1372 while (len && *text == NOCHAR)
1266 text++, len--, cwidth += r->TermWin.fwidth; 1373 text++, len--, cwidth += term->fwidth;
1267
1268 gl = XftCharIndex (d.display->display, f, fc);
1269 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1270 1374
1271 if (extents.xOff != cwidth && ep != enc) 1375 if (fc != ' ') // skip spaces
1272 {
1273 if (xoff > ewidth) xoff = ewidth;
1274 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1275 x + (ewidth - xoff >> 1),
1276 y + base, enc, ep - enc);
1277 x += ewidth;
1278
1279 ep = enc;
1280 ewidth = 0;
1281 xoff = 0;
1282 } 1376 {
1377 FT_UInt glyph = XftCharIndex (disp, f, fc);
1378 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1283 1379
1284 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++;
1285 { 1388 }
1389
1286 x += cwidth; 1390 x_ += cwidth;
1287 continue; 1391 }
1392
1393 if (buffered)
1394 {
1395 if (ep != enc)
1288 } 1396 {
1397 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1289 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 }
1290 else 1454 else
1291 { 1455 clear_rect (d, x, y, w, h, bg);
1292 *ep++ = gl;
1293 ewidth += cwidth;
1294 xoff += extents.xOff;
1295 }
1296 }
1297
1298 if (ep != enc)
1299 { 1456 }
1300 if (xoff > ewidth) xoff = ewidth; 1457 else
1301 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1302 x + (ewidth - xoff >> 1),
1303 y + base, enc, ep - enc);
1304 } 1458 {
1459 clear_rect (d, x, y, w, h, bg);
1460 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1461 }
1305} 1462}
1463
1306#endif 1464#endif
1307 1465
1308///////////////////////////////////////////////////////////////////////////// 1466/////////////////////////////////////////////////////////////////////////////
1309 1467
1310rxvt_fontset::rxvt_fontset (rxvt_t r) 1468rxvt_fontset::rxvt_fontset (rxvt_term *term)
1311: r (r), fontdesc (0) 1469: fontdesc (0), term (term)
1312{ 1470{
1313 clear (); 1471 clear ();
1314} 1472}
1315 1473
1316rxvt_fontset::~rxvt_fontset () 1474rxvt_fontset::~rxvt_fontset ()
… …
1319} 1477}
1320 1478
1321void 1479void
1322rxvt_fontset::clear () 1480rxvt_fontset::clear ()
1323{ 1481{
1324 prop.width = prop.height = prop.weight = prop.slant 1482 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1325 = rxvt_fontprop::unset; 1483 = rxvt_fontprop::unset;
1484 force_prop = false;
1326 1485
1327 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1486 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1328 FONT_UNREF (*i); 1487 FONT_UNREF (*i);
1329 1488
1330 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1489 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1339 1498
1340rxvt_font * 1499rxvt_font *
1341rxvt_fontset::new_font (const char *name, codeset cs) 1500rxvt_fontset::new_font (const char *name, codeset cs)
1342{ 1501{
1343 rxvt_font *f; 1502 rxvt_font *f;
1344 1503
1345 if (!name || !*name) 1504 if (!name || !*name)
1346 { 1505 {
1347 name = ""; 1506 name = "";
1348 f = new rxvt_font_default (this); 1507 f = new rxvt_font_default (this);
1349 } 1508 }
… …
1360 f = new rxvt_font_x11; 1519 f = new rxvt_font_x11;
1361 } 1520 }
1362 else 1521 else
1363 f = new rxvt_font_x11; 1522 f = new rxvt_font_x11;
1364 1523
1365 f->set_term (r); 1524 f->set_term (term);
1366 f->set_name (strdup (name)); 1525 f->set_name (strdup (name));
1367 1526
1368 f->cs = cs; 1527 f->cs = cs;
1369 f->loaded = false; 1528 f->loaded = false;
1370 1529
… …
1417 if (!end) 1576 if (!end)
1418 end = desc + strlen (desc); 1577 end = desc + strlen (desc);
1419 1578
1420 if (end - desc < 511) 1579 if (end - desc < 511)
1421 { 1580 {
1422 strncpy (buf, desc, end - desc); 1581 memcpy (buf, desc, end - desc);
1423 buf[end - desc] = 0; 1582 buf[end - desc] = 0;
1424 1583
1425 fonts.push_back (new_font (buf, cs)); 1584 fonts.push_back (new_font (buf, cs));
1426 } 1585 }
1427 else 1586 else
… …
1442 if (fonts[i]->loaded) 1601 if (fonts[i]->loaded)
1443 return true; 1602 return true;
1444 1603
1445 fonts[i]->loaded = true; 1604 fonts[i]->loaded = true;
1446 1605
1447 if (!fonts[i]->load (prop)) 1606 if (!fonts[i]->load (prop, force_prop))
1448 { 1607 {
1449 fonts[i]->cs = CS_UNKNOWN; 1608 fonts[i]->cs = CS_UNKNOWN;
1450 return false; 1609 return false;
1451 } 1610 }
1452 1611
… …
1477 1636
1478 return -1; 1637 return -1;
1479} 1638}
1480 1639
1481int 1640int
1482rxvt_fontset::find_font (unicode_t unicode) 1641rxvt_fontset::find_font_idx (unicode_t unicode)
1483{ 1642{
1484 if (unicode >= 1<<20) 1643 if (unicode >= 1<<20)
1485 return 0; 1644 return 0;
1486 1645
1487 unicode_t hi = unicode >> 8; 1646 unicode_t hi = unicode >> 8;
… …
1502 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1661 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1503 goto next_font; 1662 goto next_font;
1504 1663
1505 if (!realize_font (i)) 1664 if (!realize_font (i))
1506 goto next_font; 1665 goto next_font;
1666
1667 if (prop.ascent != rxvt_fontprop::unset)
1668 max_it (f->ascent, prop.ascent);
1507 } 1669 }
1508 1670
1509 if (f->cs == CS_UNKNOWN) 1671 if (f->cs == CS_UNKNOWN)
1510 goto next_font; 1672 goto next_font;
1511 1673
1512 bool careful; 1674 bool careful;
1513 if (f->has_char (unicode, &prop, careful)) 1675 if (f->has_char (unicode, &prop, careful))
1514 { 1676 {
1515 if (careful) 1677 i = (i << 1) | careful;
1516 i |= 128;
1517 1678
1518 goto found; 1679 goto found;
1519 } 1680 }
1520 1681
1521 next_font: 1682 next_font:
… …
1550 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1711 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1551 FcPatternAddBool (p, FC_MINSPACE, 1); 1712 FcPatternAddBool (p, FC_MINSPACE, 1);
1552 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1713 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1553 1714
1554 XftResult result; 1715 XftResult result;
1555 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1716 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1556 1717
1557 FcPatternDestroy (p); 1718 FcPatternDestroy (p);
1558 1719
1559 if (match) 1720 if (match)
1560 { 1721 {
… …
1563 FcPatternDestroy (match); 1724 FcPatternDestroy (match);
1564 1725
1565 if (find_font (font) < 0) 1726 if (find_font (font) < 0)
1566 { 1727 {
1567 char fontname[4096]; 1728 char fontname[4096];
1568 sprintf (fontname, "xft:%-.4090s", font); 1729 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1569 1730
1570 fonts.push_back (new_font (fontname, CS_UNICODE)); 1731 fonts.push_back (new_font (fontname, CS_UNICODE));
1571 } 1732 }
1572 1733
1573 free (font); 1734 free (font);
1574 } 1735 }
1575#endif 1736#endif
… …
1597 } 1758 }
1598 1759
1599 return i; 1760 return i;
1600} 1761}
1601 1762
1763int
1764rxvt_fontset::find_font (unicode_t unicode)
1765{
1766 return min<int> ((fontCount << 1) | 1, find_font_idx (unicode));
1767}
1602 1768
1603

Diff Legend

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