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

Diff Legend

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