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.171 by sf-exg, Thu Dec 30 17:28:29 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.
… …
151 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 159 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
152 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 160 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
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 dTermDisplay Display *disp = term->dpy
165#define dTermGC GC gc = term->gc
157 166
158///////////////////////////////////////////////////////////////////////////// 167/////////////////////////////////////////////////////////////////////////////
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 168
194static const char * 169static const char *
195enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 170enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
196{ 171{
197 uint8_t *buf = (uint8_t *)get_enc_buf (len); 172 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
173 uint8_t *res = buf;
198 174
199 while (len--) 175 while (len--)
200 { 176 {
201 uint32_t c = FROM_UNICODE (cs, *text++); 177 uint32_t c = FROM_UNICODE (cs, *text++);
202 178
… …
207 } 183 }
208 184
209 *buf++ = c; 185 *buf++ = c;
210 } 186 }
211 187
212 return (const char *)enc_buf; 188 return (const char *)res;
213} 189}
214 190
215static const XChar2b * 191static const XChar2b *
216enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 192enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
217{ 193{
218 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 194 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
195 XChar2b *res = buf;
219 196
220 while (len--) 197 while (len--)
221 { 198 {
222 uint32_t c = FROM_UNICODE (cs, *text++); 199 uint32_t c = FROM_UNICODE (cs, *text++);
223 200
… …
230 buf->byte1 = c >> 8; 207 buf->byte1 = c >> 8;
231 buf->byte2 = c; 208 buf->byte2 = c;
232 buf++; 209 buf++;
233 } 210 }
234 211
235 return (XChar2b *)enc_buf; 212 return res;
236} 213}
237 214
238///////////////////////////////////////////////////////////////////////////// 215/////////////////////////////////////////////////////////////////////////////
239 216
217rxvt_font::rxvt_font ()
218: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
219{
220}
221
240void 222void
241rxvt_font::set_name (char *name) 223rxvt_font::set_name (char *name_)
242{ 224{
243 if (this->name == name) 225 if (name == name_)
244 return; 226 return;
245 227
246 if (this->name) free (this->name); // let the compiler optimize 228 if (name) free (name); // let the compiler optimize
247 this->name = name; 229 name = name_;
248} 230}
249 231
250void 232void
251rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) 233rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
252{ 234{
253 if (color == Color_bg) 235 dTermDisplay;
254 XClearArea (d.display->display, d, x, y, w, h, FALSE); 236 dTermGC;
237
238 if (color == Color_bg || color == Color_transparent)
239 XClearArea (disp, d, x, y, w, h, false);
255 else if (color >= 0) 240 else if (color >= 0)
256 { 241 {
257#if XFT 242#if XFT
243 Picture dst;
244
245# ifdef HAVE_BG_PIXMAP
246 if (term->bgPixmap.pixmap
247 && !term->pix_colors[color].is_opaque ()
248 && ((dst = XftDrawPicture (d))))
249 {
250 XClearArea (disp, d, x, y, w, h, false);
251
252 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
253 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
254 }
255 else
256# endif
258 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258
259#else 259#else
260 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 260 XSetForeground (disp, gc, term->pix_colors[color]);
261 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 261 XFillRectangle (disp, d, gc, x, y, w, h);
262#endif 262#endif
263 } 263 }
264} 264}
265 265
266#include "table/linedraw.h" 266/////////////////////////////////////////////////////////////////////////////
267 267
268struct rxvt_font_default : rxvt_font { 268struct rxvt_font_default : rxvt_font {
269 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
270 270
271 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
… …
284 p.slant = rxvt_fontprop::roman; 284 p.slant = rxvt_fontprop::roman;
285 285
286 return p; 286 return p;
287 } 287 }
288 288
289 bool load (const rxvt_fontprop &prop) 289 bool load (const rxvt_fontprop &prop, bool force_prop)
290 { 290 {
291 width = 1; height = 1; 291 width = 1; height = 1;
292 ascent = 1; descent = 0; 292 ascent = 1; descent = 0;
293 293
294 set_name (strdup ("built-in support font")); 294 set_name (strdup ("built-in support font"));
295 295
296 return true; 296 return true;
297 } 297 }
298 298
299 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 299 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
300 { 300 {
301 careful = false; 301 careful = false;
302 302
303 if (unicode <= 0x001f) 303 if (unicode <= 0x001f)
304 return true; 304 return true;
… …
307 return false; 307 return false;
308 308
309 if (unicode <= 0x009f) 309 if (unicode <= 0x009f)
310 return true; 310 return true;
311 311
312#ifdef BUILTIN_GLYPHS
312 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
313 ! OPTION_R (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
314 return true; 315 return true;
316#endif
315 317
316 if (IS_COMPOSE (unicode)) 318 if (IS_COMPOSE (unicode))
317 return true; 319 return true;
318 320
319 switch (unicode) 321 switch (unicode)
… …
334void 336void
335rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 337rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
336 const text_t *text, int len, 338 const text_t *text, int len,
337 int fg, int bg) 339 int fg, int bg)
338{ 340{
339 Display *disp = d.display->display; 341 dTermDisplay;
342 dTermGC;
340 343
341 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 344 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
342 345
343 XSetForeground (disp, TGC, r->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
344 347
345 while (len) 348 while (len)
346 { 349 {
347#if ENABLE_COMBINING 350#if ENABLE_COMBINING
348 compose_char *cc; 351 compose_char *cc;
… …
352 355
353 while (++text, --len && *text == NOCHAR) 356 while (++text, --len && *text == NOCHAR)
354 ; 357 ;
355 358
356 int width = text - tp; 359 int width = text - tp;
357 int fwidth = r->fwidth * width; 360 int fwidth = term->fwidth * width;
358 361
362#ifdef BUILTIN_GLYPHS
359 if (0x2500 <= t && t <= 0x259f && 363 if (0x2500 <= t && t <= 0x259f)
360 ! OPTION_R (Opt_skipBuiltinGlyphs))
361 { 364 {
365# include "table/linedraw.h"
362 uint16_t offs = linedraw_offs[t - 0x2500]; 366 uint16_t offs = linedraw_offs[t - 0x2500];
363 uint32_t *a = linedraw_command + (offs >> 4); 367 uint32_t *a = linedraw_command + (offs >> 4);
364 uint32_t *b = a + (offs & 15); 368 uint32_t *b = a + (offs & 15);
365 369
366 int W = fwidth; 370 int W = fwidth;
367 int H = r->fheight; 371 int H = term->fheight;
368 372
369 int x_[16]; 373 int x_[16];
370 int y_[16]; 374 int y_[16];
371 375
372 for (int i = 0; i <= 8; i++) 376 for (int i = 0; i <= 8; i++)
… …
380 384
381 XGCValues gcv; 385 XGCValues gcv;
382 386
383 gcv.cap_style = CapButt; 387 gcv.cap_style = CapButt;
384 gcv.line_width = 0; 388 gcv.line_width = 0;
385 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 389 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
386 390
387 while (a < b) 391 while (a < b)
388 { 392 {
389 uint32_t command = *a++; 393 uint32_t command = *a++;
390 394
… …
397 int y2 = y_[(command >> 0) & 15]; 401 int y2 = y_[(command >> 0) & 15];
398 402
399 switch (op) 403 switch (op)
400 { 404 {
401 case 0: // line 405 case 0: // line
402 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 406 XDrawLine (disp, d, gc, x1, y1, x2, y2);
403 break; 407 break;
404 408
405 case 1: // rectangle, possibly stippled 409 case 1: // rectangle, possibly stippled
406 if (a) 410 if (a)
407 { 411 {
408 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
409 413
410 gcv.fill_style = FillStippled; 414 gcv.fill_style = FillStippled;
411 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
412 gcv.ts_x_origin = x; 416 gcv.ts_x_origin = x;
413 gcv.ts_y_origin = y; 417 gcv.ts_y_origin = y;
414 418
415 XChangeGC (disp, TGC, 419 XChangeGC (disp, gc,
416 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 420 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
417 &gcv); 421 &gcv);
418 } 422 }
419 423
420 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 424 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
421 425
422 if (a) 426 if (a)
423 { 427 {
424 XFreePixmap (disp, gcv.stipple); 428 XFreePixmap (disp, gcv.stipple);
425 gcv.stipple = 0; 429 gcv.stipple = 0;
426 gcv.fill_style = FillSolid; 430 gcv.fill_style = FillSolid;
427 XChangeGC (disp, TGC, GCFillStyle, &gcv); 431 XChangeGC (disp, gc, GCFillStyle, &gcv);
428 } 432 }
429 break; 433 break;
430 case 2: // arc 434 case 2: // arc
431 XDrawArc (disp, d, TGC, 435 XDrawArc (disp, d, gc,
432 x1 - W/2, y1 - H/2, W-1, H-1, 436 x1 - W/2, y1 - H/2, W-1, H-1,
433 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
434 break; 438 break;
435 } 439 }
436 } 440 }
437 } 441 }
442#else
443 if (0)
444 ;
445#endif
438#if ENABLE_COMBINING 446#if ENABLE_COMBINING
439 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
440 { 448 {
449 min_it (width, 2); // we only support wcwidth up to 2
450
441 text_t chrs[2]; 451 text_t chrs[2];
442 width = min (2, width);
443 chrs [1] = NOCHAR; 452 chrs [1] = NOCHAR;
444 453
445 *chrs = cc->c1; 454 *chrs = cc->c1;
446 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
447 f1->draw (d, x, y, chrs, width, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
448 457
449 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
450 { 459 {
451 bool careful; 460 bool careful;
452 461
453 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
454 *chrs = cc->c2; 463 *chrs = cc->c2;
455 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
456 ? f1 465 ? f1
457 : (*fs)[fs->find_font (cc->c2)]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
458 467
459 f2->draw (d, x, y, chrs, width, fg, -1); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
460 } 469 }
461 } 470 }
462#endif 471#endif
463 else 472 else
464 switch (t) 473 switch (t)
… …
467 case ZERO_WIDTH_CHAR: 476 case ZERO_WIDTH_CHAR:
468 case NOCHAR: 477 case NOCHAR:
469 break; 478 break;
470 479
471 default: 480 default:
472 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 481 XDrawRectangle (disp, d, gc, x + 2, y + 2,
473 fwidth - 4, r->fheight - 4); 482 fwidth - 4, term->fheight - 4);
474 } 483 }
475 484
476 x += fwidth; 485 x += fwidth;
477 } 486 }
478} 487}
488
489struct rxvt_font_overflow : rxvt_font {
490 struct rxvt_fontset *fs;
491
492 rxvt_font_overflow (rxvt_fontset *fs)
493 : rxvt_font ()
494 {
495 this->fs = fs;
496 }
497
498 rxvt_fontprop properties ()
499 {
500 rxvt_fontprop p;
501
502 p.width = p.height = 1;
503 p.ascent = rxvt_fontprop::unset;
504 p.weight = rxvt_fontprop::medium;
505 p.slant = rxvt_fontprop::roman;
506
507 return p;
508 }
509
510 bool load (const rxvt_fontprop &prop, bool force_prop)
511 {
512 width = 1; height = 1;
513 ascent = 1; descent = 0;
514
515 set_name (strdup ("built-in rendition overflow font"));
516
517 return true;
518 }
519
520 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
521 {
522 return false;
523 }
524
525 void draw (rxvt_drawable &d, int x, int y,
526 const text_t *text, int len,
527 int fg, int bg)
528 {
529 while (len--)
530 {
531 int fid = fs->find_font_idx (*text);
532 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
533 ++text;
534 x += term->fwidth;
535 }
536 }
537};
479 538
480///////////////////////////////////////////////////////////////////////////// 539/////////////////////////////////////////////////////////////////////////////
481 540
482struct rxvt_font_x11 : rxvt_font { 541struct rxvt_font_x11 : rxvt_font {
483 rxvt_font_x11 () { f = 0; } 542 rxvt_font_x11 () { f = 0; }
484 543
485 void clear (); 544 void clear ();
486 545
487 rxvt_fontprop properties (); 546 rxvt_fontprop properties ();
488 547
489 bool load (const rxvt_fontprop &prop); 548 bool load (const rxvt_fontprop &prop, bool force_prop);
490 549
491 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 550 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
492 551
493 void draw (rxvt_drawable &d, int x, int y, 552 void draw (rxvt_drawable &d, int x, int y,
494 const text_t *text, int len, 553 const text_t *text, int len,
495 int fg, int bg); 554 int fg, int bg);
496 555
497 bool slow; // wether this is a proportional font or has other funny characteristics 556 bool slow; // whether this is a proportional font or has other funny characteristics
498 XFontStruct *f; 557 XFontStruct *f;
499 codeset cs;
500 bool enc2b, encm; 558 bool enc2b, encm;
501 559
502 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 560 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); 561 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); 562 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
505 bool set_properties (rxvt_fontprop &p, const char *name); 563 bool set_properties (rxvt_fontprop &p, const char *name);
506}; 564};
507 565
508char * 566char *
509rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 567rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
510{ 568{
511 unsigned long value; 569 unsigned long value;
512 570
513 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 571 if (XGetFontProperty (f, property, &value))
514 return XGetAtomName (DISPLAY, value); 572 return XGetAtomName (term->dpy, value);
515 else 573 else
516 return rxvt_strdup (repl); 574 return repl ? strdup (repl) : 0;
517} 575}
518 576
519rxvt_fontprop 577rxvt_fontprop
520rxvt_font_x11::properties () 578rxvt_font_x11::properties ()
521{ 579{
… …
525} 583}
526 584
527bool 585bool
528rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 586rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
529{ 587{
530 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 588 p.width = width != rxvt_fontprop::unset ? width
589 : avgwidth ? (avgwidth + 1) / 10
590 : (height + 1) / 2;
531 p.height = height; 591 p.height = height;
532 p.ascent = rxvt_fontprop::unset; 592 p.ascent = rxvt_fontprop::unset;
533 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 593 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; 594 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
535 595
… …
540rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 600rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
541{ 601{
542 unsigned long height; 602 unsigned long height;
543 603
544#if 0 604#if 0
545 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 605 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
546 return false; 606 return false;
547#else 607#else
548 height = f->ascent + f->descent; 608 height = f->ascent + f->descent;
549#endif 609#endif
550 610
551 unsigned long avgwidth; 611 unsigned long avgwidth;
552 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 612 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
553 avgwidth = 0; 613 avgwidth = 0;
554 614
555 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 615 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
556 char *slant = get_property (f, "SLANT", "r"); 616 char *slant = get_property (f, term->xa [XA_SLANT], "r");
557 617
558 set_properties (p, height, weight, slant, avgwidth); 618 set_properties (p, height, weight, slant, avgwidth);
559 619
560 free (weight); 620 free (weight);
561 free (slant); 621 free (slant);
… …
566} 626}
567 627
568bool 628bool
569rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 629rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
570{ 630{
631 dTermDisplay;
571 int slashes = 0; 632 int slashes = 0;
572 const char *comp[13]; 633 const char *comp[13];
573 634
574 for (const char *c = name; *c; c++) 635 for (const char *c = name; *c; c++)
575 if (*c == '-') 636 if (*c == '-')
… …
583 if (slashes >= 13 644 if (slashes >= 13
584 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 645 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
585 && (*comp[11] >= '0' && *comp[11] <= '9')) 646 && (*comp[11] >= '0' && *comp[11] <= '9'))
586 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 647 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
587 648
588 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 649 XFontStruct *f = XLoadQueryFont (disp, name);
589 650
590 if (f) 651 if (f)
591 { 652 {
592 // the font should really exist now. if not, we have a problem 653 // 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). 654 // (e.g. if the user did xset fp rehash just when we were searching fonts).
594 // in that case, just return garbage. 655 // in that case, just return garbage.
595 bool ret = set_properties (p, f); 656 bool ret = set_properties (p, f);
596 XFreeFont (DISPLAY, f); 657 XFreeFont (disp, f);
597 return ret; 658 return ret;
598 } 659 }
599 else 660 else
600 return false; 661 return false;
601} 662}
602 663
603// fix the size of scalable fonts 664// fix the size of scalable fonts
604static bool 665static bool
605replace_field (char *buf, const char *name, int index, const char old, const char *replace) 666replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
606{ 667{
607 int slashes = 0; 668 int slashes = 0;
608 const char *field, *end; 669 const char *field, *end;
609 670
610 for (const char *c = name; *c; c++) 671 for (const char *c = name; *c; c++)
… …
620 break; 681 break;
621 } 682 }
622 683
623 if (slashes >= 13 && (!old || *field == old)) 684 if (slashes >= 13 && (!old || *field == old))
624 { 685 {
625 // TODO: check for overflow in font-name 686 size_t len = field - name;
626 strncpy (buf, name, field - name); 687 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
627 buf += field - name; 688 memcpy (*ptr, name, len);
628 strcpy (buf, replace); 689 strcpy (*ptr + len, replace);
629 strcat (buf, end); 690 strcat (*ptr, end);
630 691
631 return true; 692 return true;
632 } 693 }
633 else 694 else
634 { 695 {
635 strcpy (buf, name); 696 *ptr = strdup (name);
636 697
637 return false; 698 return false;
638 } 699 }
639} 700}
640 701
641bool 702bool
642rxvt_font_x11::load (const rxvt_fontprop &prop) 703rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
643{ 704{
644 Display *disp = DISPLAY; 705 dTermDisplay;
645 706
646 clear (); 707 clear ();
647 708
648 char field_str[64]; // enough for 128 bits 709 char field_str[64]; // enough for 128 bits
649 710
650 // first morph the font if required 711 // first morph the font if required
651 if (prop.weight != rxvt_fontprop::unset 712 if (force_prop)
652 || prop.slant != rxvt_fontprop::unset)
653 { 713 {
654 char fname[1024]; 714 char *fname;
655 715
656 if (name[0] != '-') 716 if (name[0] != '-')
657 { 717 {
658 f = XLoadQueryFont (disp, name); 718 f = XLoadQueryFont (disp, name);
659 719
660 if (!f) 720 if (!f)
661 return false; 721 return false;
662 722
663 char *new_name = get_property (f, "FONT", name); 723 char *new_name = get_property (f, XA_FONT, name);
664 724
665 if (new_name) 725 if (new_name)
666 set_name (new_name); 726 set_name (new_name);
667 else 727 else
668 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 728 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
671 f = 0; 731 f = 0;
672 } 732 }
673 733
674 if (prop.weight != rxvt_fontprop::unset) 734 if (prop.weight != rxvt_fontprop::unset)
675 { 735 {
676 replace_field (fname, name, 2, 0, 736 replace_field (&fname, name, 2, 0,
677 prop.weight < rxvt_fontprop::bold 737 prop.weight < rxvt_fontprop::bold
678 ? "medium" : "bold"); 738 ? "medium" : "bold");
679 set_name (strdup (fname)); 739 set_name (fname);
680 } 740 }
681 741
682 if (prop.slant != rxvt_fontprop::unset) 742 if (prop.slant != rxvt_fontprop::unset)
683 { 743 {
684 replace_field (fname, name, 3, 0, 744 replace_field (&fname, name, 3, 0,
685 prop.slant < rxvt_fontprop::italic 745 prop.slant < rxvt_fontprop::italic
686 ? "r" : "i"); // TODO: handle "o"blique, too 746 ? "r" : "i"); // TODO: handle "o"blique, too
687 set_name (strdup (fname)); 747 set_name (fname);
688 } 748 }
689 } 749 }
690 750
691 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 751 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
692 ? 0 : prop.height); 752 ? 0 : prop.height);
… …
717 font_weight *fonts = new font_weight[count]; 777 font_weight *fonts = new font_weight[count];
718 778
719 for (int i = 0; i < count; i++) 779 for (int i = 0; i < count; i++)
720 { 780 {
721 rxvt_fontprop p; 781 rxvt_fontprop p;
722 char fname[1024]; 782 char *fname;
723 783
724 int diff = 0; 784 int diff = 0;
725 785
726 if (replace_field (fname, list[i], 6, '0', field_str)) 786 if (replace_field (&fname, list[i], 6, '0', field_str))
727 diff += 10; // slightly penalize scalable fonts 787 diff += 10; // slightly penalize scalable fonts
788 else
789 {
790 free (fname);
728 else if (replace_field (fname, list[i], 11, '0', "0")) 791 if (replace_field (&fname, list[i], 11, '0', "0"))
729 diff += 300; // more heavily penalize what looks like scaled bitmap fotns 792 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
793 }
730 794
731 if (!set_properties (p, fname)) 795 if (!set_properties (p, fname)
796 // also weed out too large fonts
797 || (prop.height != rxvt_fontprop::unset
798 && p.height > prop.height))
799 {
800 free (fname);
732 continue; 801 continue;
733 802 }
734 if (prop.height != rxvt_fontprop::unset
735 && p.height > prop.height) // weed out too large fonts
736 continue;
737 803
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 char *value = get_property (f, XA_FONT, 0);
870 const char *charset = value;
795 871
796 if (!charset) 872 if (!charset)
797 charset = name; 873 charset = name;
798 874
799 int count = 13; 875 int count = 13;
800 while (*charset) 876 while (*charset)
801 if (*charset++ == '-' && !--count) 877 if (*charset++ == '-' && !--count)
802 break; 878 break;
803 879
804 cs = codeset_from_name (charset); 880 cs = codeset_from_name (charset);
881 if (cs == CS_UNKNOWN)
882 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
883
884 free (value);
885 }
886
887 if (cs == CS_UNKNOWN)
805 } 888 {
806 889 clear ();
807 free (registry); 890 return false;
808 free (encoding); 891 }
809 892
810 if (cs == CS_UNICODE) 893 if (cs == CS_UNICODE)
811 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 894 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
812 895
813 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 896 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
814 enc2b = encm || f->max_char_or_byte2 > 255; 897 enc2b = encm || f->max_char_or_byte2 > 255;
815 898
816 slow = false; 899 slow = false;
817 900
818#if 1 // only used for slow detection, TODO optimize 901#if 1 // only used for slow detection, TODO optimize
819 if (f->min_bounds.width == f->max_bounds.width) 902 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; 903 width = f->max_bounds.width;
823 else 904 else
824 { 905 {
825 slow = true; 906 slow = true;
826 907
827 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 908 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
828 909
829 if (encm) 910 if (encm)
830 N += (f->max_byte1 - f->min_byte1) 911 N += (f->max_byte1 - f->min_byte1)
831 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 912 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
832 913
833 while (N) 914 while (N)
834 { 915 {
835 if (f->per_char[N].width > width) 916 if (f->per_char[N].width > width)
836 width = f->per_char[N].width; 917 width = f->per_char[N].width;
837 918
… …
840 } 921 }
841#endif 922#endif
842 923
843 width = 1; 924 width = 1;
844 925
845 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 926 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
846 { 927 {
847 if (cs != CS_UNICODE
848 && *t > 0x100
849 && FROM_UNICODE (cs, *t) == NOCHAR) 928 if (FROM_UNICODE (cs, *t) == NOCHAR)
850 continue; 929 continue;
851 930
852 // ignore characters we wouldn't use anyways 931 // ignore characters we wouldn't use anyways
853 bool careful; 932 bool careful;
854 if (!has_char (*t, &prop, careful)) 933 if (!has_char (*t, &prop, careful))
… …
858 937
859 XCharStruct g; 938 XCharStruct g;
860 int dir_ret, asc_ret, des_ret; 939 int dir_ret, asc_ret, des_ret;
861 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 940 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
862 941
942 int wcw = WCWIDTH (*t);
863 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 943 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
864 944
865 if (width < g.width) width = g.width; 945 if (width < g.width) width = g.width;
866 }
867
868 if (cs == CS_UNKNOWN)
869 { 946 }
870 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
871 947
948#if 0 // do it per-character
949 if (prop && width > prop->width)
950 {
872 clear (); 951 clear ();
873 return false; 952 return false;
874 } 953 }
875
876#if 0 // do it per-character
877 if (prop && width > prop->width)
878 {
879 clear ();
880 return false;
881 }
882#endif 954#endif
883 955
884 return true; 956 return true;
885} 957}
886 958
887void 959void
888rxvt_font_x11::clear () 960rxvt_font_x11::clear ()
889{ 961{
890 if (f) 962 if (f)
891 { 963 {
892 XFreeFont (DISPLAY, f); 964 XFreeFont (term->dpy, f);
893 f = 0; 965 f = 0;
894 } 966 }
895} 967}
896 968
897bool 969bool
898rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 970rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
899{ 971{
900 uint32_t ch = FROM_UNICODE (cs, unicode); 972 uint32_t ch = FROM_UNICODE (cs, unicode);
901 973
902 if (ch == NOCHAR) 974 if (ch == NOCHAR)
903 return false; 975 return false;
904 976
905 /* check wether the character exists in _this_ font. horrible. */ 977 /* check whether the character exists in _this_ font. horrible. */
906 XCharStruct *xcs; 978 XCharStruct *xcs;
907 979
908 if (encm) 980 if (encm)
909 { 981 {
910 unsigned char byte1 = ch >> 8; 982 unsigned char byte1 = ch >> 8;
… …
940 return false; 1012 return false;
941 1013
942 if (!prop || prop->width == rxvt_fontprop::unset) 1014 if (!prop || prop->width == rxvt_fontprop::unset)
943 return true; 1015 return true;
944 1016
945 // check character against base font bounding box 1017 // check whether character overlaps previous/next character
946 int w = xcs->width; 1018 int w = xcs->rbearing - xcs->lbearing;
947 int wcw = wcwidth (unicode); 1019 int wcw = max (WCWIDTH (unicode), 1);
948 if (wcw > 0) w = (w + wcw - 1) / wcw;
949 1020
950 careful = w > prop->width; 1021 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
951 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1022
1023 if (careful && !OVERLAP_OK (w, wcw, prop))
952 return false; 1024 return false;
953 1025
954 return true; 1026 return true;
955} 1027}
956 1028
… …
962 // this looks like a mess /. 1034 // this looks like a mess /.
963 // and it is a mess /. 1035 // and it is a mess /.
964 // yet we are trying to be perfect /. 1036 // yet we are trying to be perfect /.
965 // but the result still isn't perfect /. 1037 // but the result still isn't perfect /.
966 1038
1039 dTermDisplay;
1040 dTermGC;
1041
967 bool slow = this->slow 1042 bool slow = this->slow
968 || width != r->fwidth 1043 || width != term->fwidth
969 || height != r->fheight; 1044 || height != term->fheight;
970 1045
971 int base = ascent; // sorry, incorrect: r->fbase; 1046 int base = ascent; // sorry, incorrect: term->fbase;
972 1047
973 XGCValues v; 1048 XGCValues v;
974 v.foreground = r->pix_colors[fg]; 1049 v.foreground = term->pix_colors[fg];
975 v.font = f->fid; 1050 v.font = f->fid;
976 1051
977 if (enc2b) 1052 if (enc2b)
978 { 1053 {
979 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 1054 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
980 1055
981 if (bg == Color_bg && !slow) 1056 if (bg == Color_bg && !slow)
982 { 1057 {
983 v.background = r->pix_colors[bg]; 1058 v.background = term->pix_colors[bg];
984 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1059 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
985 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 1060 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
986 } 1061 }
987 else 1062 else
988 { 1063 {
989 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1064 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
990 1065
991 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1066 XChangeGC (disp, gc, GCForeground | GCFont, &v);
992 1067
993 if (slow) 1068 if (slow)
994 { 1069 {
995 do 1070 do
996 { 1071 {
997 if (xc->byte1 || xc->byte2) 1072 if (xc->byte1 || xc->byte2)
998 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1073 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
999 1074
1000 x += r->fwidth; 1075 x += term->fwidth;
1001 xc++; len--; 1076 xc++; len--;
1002 } 1077 }
1003 while (len); 1078 while (len);
1004 } 1079 }
1005 else 1080 else
1006 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1081 XDrawString16 (disp, d, gc, x, y + base, xc, len);
1007 } 1082 }
1008 } 1083 }
1009 else 1084 else
1010 { 1085 {
1011 const char *xc = enc_char (text, len, cs, slow); 1086 const char *xc = enc_char (text, len, cs, slow);
1012 1087
1013 if (bg == Color_bg && !slow) 1088 if (bg == Color_bg && !slow)
1014 { 1089 {
1015 v.background = r->pix_colors[bg]; 1090 v.background = term->pix_colors[bg];
1016 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1091 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1017 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1092 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1018 } 1093 }
1019 else 1094 else
1020 { 1095 {
1021 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1096 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1022 1097
1023 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1098 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1024 1099
1025 if (slow) 1100 if (slow)
1026 { 1101 {
1027 do 1102 do
1028 { 1103 {
1029 if (*xc) 1104 if (*xc)
1030 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1105 XDrawString (disp, d, gc, x, y + base, xc, 1);
1031 1106
1032 x += r->fwidth; 1107 x += term->fwidth;
1033 xc++; len--; 1108 xc++; len--;
1034 } 1109 }
1035 while (len); 1110 while (len);
1036 } 1111 }
1037 else 1112 else
1038 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1113 XDrawString (disp, d, gc, x, y + base, xc, len);
1039 } 1114 }
1040 } 1115 }
1041} 1116}
1042 1117
1043///////////////////////////////////////////////////////////////////////////// 1118/////////////////////////////////////////////////////////////////////////////
… …
1049 1124
1050 void clear (); 1125 void clear ();
1051 1126
1052 rxvt_fontprop properties (); 1127 rxvt_fontprop properties ();
1053 1128
1054 bool load (const rxvt_fontprop &prop); 1129 bool load (const rxvt_fontprop &prop, bool force_prop);
1055 1130
1056 void draw (rxvt_drawable &d, int x, int y, 1131 void draw (rxvt_drawable &d, int x, int y,
1057 const text_t *text, int len, 1132 const text_t *text, int len,
1058 int fg, int bg); 1133 int fg, int bg);
1059 1134
1060 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1135 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1061 1136
1062protected: 1137protected:
1063 XftFont *f; 1138 XftFont *f;
1064}; 1139};
1065 1140
1066void 1141void
1067rxvt_font_xft::clear () 1142rxvt_font_xft::clear ()
1068{ 1143{
1069 if (f) 1144 if (f)
1070 { 1145 {
1071 XftFontClose (DISPLAY, f); 1146 XftFontClose (term->dpy, f);
1072 f = 0; 1147 f = 0;
1073 } 1148 }
1074} 1149}
1075 1150
1076rxvt_fontprop 1151rxvt_fontprop
… …
1092 1167
1093 return p; 1168 return p;
1094} 1169}
1095 1170
1096bool 1171bool
1097rxvt_font_xft::load (const rxvt_fontprop &prop) 1172rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1098{ 1173{
1099 Display *disp = DISPLAY; 1174 dTermDisplay;
1100 1175
1101 clear (); 1176 clear ();
1102 1177
1103 FcPattern *p = FcNameParse ((FcChar8 *) name); 1178 FcPattern *p = FcNameParse ((FcChar8 *) name);
1104 1179
… …
1111 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1186 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1112 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1187 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1113 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1188 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1114 1189
1115 if (prop.weight != rxvt_fontprop::unset 1190 if (prop.weight != rxvt_fontprop::unset
1116 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1191 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1117 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1192 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1118 1193
1119 if (prop.slant != rxvt_fontprop::unset 1194 if (prop.slant != rxvt_fontprop::unset
1120 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1195 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1121 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1196 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1122 1197
1123#if 0 // clipping unfortunately destroys our precious double-width-characters 1198#if 0 // clipping unfortunately destroys our precious double-width-characters
1124 // clip width, we can't do better, or can we? 1199 // clip width, we can't do better, or can we?
1125 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1200 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1126 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1201 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1127#endif 1202#endif
1128 1203
1129 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1204 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1130 FcPatternAddBool (p, FC_MINSPACE, 1); 1205 FcPatternAddBool (p, FC_MINSPACE, 1);
1131 1206
1132 // store generated name so iso14755 view gives better results 1207 // store generated name so iso14755 view gives better results
1133 set_name ((char *)FcNameUnparse (p)); 1208 set_name ((char *)FcNameUnparse (p));
1134 1209
1135 XftResult result; 1210 XftResult result;
1136 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1211 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1137 1212
1138 FcPatternDestroy (p); 1213 FcPatternDestroy (p);
1139 1214
1140 if (!match) 1215 if (!match)
1141 return false; 1216 return false;
… …
1164 1239
1165 XftUnlockFace (f); 1240 XftUnlockFace (f);
1166 1241
1167 int glheight = height; 1242 int glheight = height;
1168 1243
1169 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1244 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1170 { 1245 {
1171 FcChar16 ch = *t; 1246 FcChar16 ch = *t;
1172 1247
1173 if (cs != CS_UNICODE 1248 if (cs != CS_UNICODE
1174 && ch > 0x100 1249 && ch > 0x100
… …
1183 XGlyphInfo g; 1258 XGlyphInfo g;
1184 XftTextExtents16 (disp, f, &ch, 1, &g); 1259 XftTextExtents16 (disp, f, &ch, 1, &g);
1185 1260
1186 g.width -= g.x; 1261 g.width -= g.x;
1187 1262
1188 int wcw = wcwidth (ch); 1263 int wcw = WCWIDTH (ch);
1189 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1264 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1190 1265
1191 if (width < g.width ) width = g.width; 1266 if (width < g.width ) width = g.width;
1192 if (height < g.height ) height = g.height; 1267 if (height < g.height ) height = g.height;
1193 if (glheight < g.height - g.y) glheight = g.height - g.y; 1268 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1239 1314
1240 return success; 1315 return success;
1241} 1316}
1242 1317
1243bool 1318bool
1244rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1319rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1245{ 1320{
1246 careful = false; 1321 careful = false;
1247 1322
1248 if (!XftCharExists (DISPLAY, f, unicode)) 1323 if (!XftCharExists (term->dpy, f, unicode))
1249 return false; 1324 return false;
1250 1325
1251 if (!prop || prop->width == rxvt_fontprop::unset) 1326 if (!prop || prop->width == rxvt_fontprop::unset)
1252 return true; 1327 return true;
1253 1328
1254 // check character against base font bounding box 1329 // check character against base font bounding box
1255 FcChar32 ch = unicode; 1330 FcChar32 ch = unicode;
1256 XGlyphInfo g; 1331 XGlyphInfo g;
1257 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1332 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1258 1333
1259 int w = g.width - g.x; 1334 int w = g.width - g.x;
1260 int wcw = wcwidth (unicode); 1335 int wcw = max (WCWIDTH (unicode), 1);
1261 if (wcw > 0) w = (w + wcw - 1) / wcw;
1262 1336
1263 careful = w > prop->width; 1337 careful = g.x > 0 || w > prop->width * wcw;
1264 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1338
1339 if (careful && !OVERLAP_OK (w, wcw, prop))
1340 return false;
1341
1342 // this weeds out _totally_ broken fonts, or glyphs
1343 if (!OVERLAP_OK (g.xOff, wcw, prop))
1265 return false; 1344 return false;
1266 1345
1267 return true; 1346 return true;
1268} 1347}
1269 1348
1270void 1349void
1271rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1350rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1272 const text_t *text, int len, 1351 const text_t *text, int len,
1273 int fg, int bg) 1352 int fg, int bg)
1274{ 1353{
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; 1354 XGlyphInfo extents;
1280 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1355 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1281 FcChar32 *ep = enc; 1356 XftGlyphSpec *ep = enc;
1282 int ewidth = 0; 1357
1358 dTermDisplay;
1359 dTermGC;
1360
1361 int w = term->fwidth * len;
1362 int h = term->fheight;
1363
1364 bool buffered = bg >= Color_transparent
1365 && term->option (Opt_buffered);
1366
1367 // cut trailing spaces
1368 while (len && text [len - 1] == ' ')
1369 len--;
1370
1371 int x_ = buffered ? 0 : x;
1372 int y_ = buffered ? 0 : y;
1283 1373
1284 while (len) 1374 while (len)
1285 { 1375 {
1286 int cwidth = r->fwidth; 1376 int cwidth = term->fwidth;
1287 FcChar32 fc = *text++; len--; 1377 FcChar32 fc = *text++; len--;
1288 1378
1289 while (len && *text == NOCHAR) 1379 while (len && *text == NOCHAR)
1290 text++, len--, cwidth += r->fwidth; 1380 text++, len--, cwidth += term->fwidth;
1381
1382 if (fc != ' ') // skip spaces
1291 1383 {
1292 if (fc == ' ' && ep == enc) // skip leading spaces 1384 FT_UInt glyph = XftCharIndex (disp, f, fc);
1385 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1386
1387 ep->glyph = glyph;
1388 ep->x = x_ + (cwidth - extents.xOff >> 1);
1389 ep->y = y_ + ascent;
1390
1391 if (extents.xOff == 0)
1392 ep->x = x_ + cwidth;
1393
1394 ep++;
1395 }
1396
1293 x += cwidth; 1397 x_ += cwidth;
1294 else 1398 }
1295 {
1296 FT_UInt gl = XftCharIndex (d.display->display, f, fc);
1297 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1298 1399
1299 if (extents.xOff != cwidth) 1400 if (buffered)
1401 {
1402 if (ep != enc)
1403 {
1404 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1405
1406#ifdef HAVE_BG_PIXMAP
1407 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1408
1409 if (term->bgPixmap.pixmap
1410 && (bg == Color_transparent || bg == Color_bg
1411 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1300 { 1412 {
1301 if (ewidth) 1413 int src_x = x, src_y = y;
1414
1415 if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
1302 { 1416 {
1303 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1304 x, y + base, enc, ep - enc);
1305 x += ewidth; 1417 src_x += term->window_vt_x;
1306 1418 src_y += term->window_vt_y;
1307 ep = enc;
1308 ewidth = 0;
1309 } 1419 }
1310 1420
1311 if (extents.xOff > cwidth) 1421 if (term->bgPixmap.pmap_width >= src_x + w
1312 extents.xOff = cwidth; 1422 && term->bgPixmap.pmap_height >= src_y + h)
1423 {
1424 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1425 src_x, src_y, w, h, 0, 0);
1426 }
1427 else
1428 {
1429 XGCValues gcv;
1313 1430
1314 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1431 gcv.fill_style = FillTiled;
1315 x + (cwidth - extents.xOff >> 1), 1432 gcv.tile = term->bgPixmap.pixmap;
1433 gcv.ts_x_origin = -src_x;
1434 gcv.ts_y_origin = -src_y;
1435
1436 XChangeGC (disp, gc,
1437 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1316 y + base, &gl, 1); 1438 &gcv);
1317 x += cwidth; 1439
1440 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1441
1442 gcv.fill_style = FillSolid;
1443 XChangeGC (disp, gc, GCFillStyle, &gcv);
1444 }
1445
1446 if (dst)
1447 {
1448 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1449
1450 // dst can only be set when bg >= 0
1451 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1452 }
1318 } 1453 }
1319 else 1454 else
1320 { 1455#endif
1321 *ep++ = gl; 1456 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1322 ewidth += cwidth; 1457
1458 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1459 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1323 } 1460 }
1324 } 1461 else
1462 clear_rect (d, x, y, w, h, bg);
1463 }
1464 else
1325 } 1465 {
1326 1466 clear_rect (d, x, y, w, h, bg);
1327 if (ep != enc)
1328 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1467 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1329 x, y + base, enc, ep - enc); 1468 }
1330} 1469}
1470
1331#endif 1471#endif
1332 1472
1333///////////////////////////////////////////////////////////////////////////// 1473/////////////////////////////////////////////////////////////////////////////
1334 1474
1335rxvt_fontset::rxvt_fontset (rxvt_t r) 1475rxvt_fontset::rxvt_fontset (rxvt_term *term)
1336: fontdesc (0), r (r) 1476: fontdesc (0), term (term)
1337{ 1477{
1338 clear (); 1478 clear ();
1339} 1479}
1340 1480
1341rxvt_fontset::~rxvt_fontset () 1481rxvt_fontset::~rxvt_fontset ()
… …
1346void 1486void
1347rxvt_fontset::clear () 1487rxvt_fontset::clear ()
1348{ 1488{
1349 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1489 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1350 = rxvt_fontprop::unset; 1490 = rxvt_fontprop::unset;
1491 force_prop = false;
1351 1492
1352 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1493 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1353 FONT_UNREF (*i); 1494 (*i)->unref ();
1354 1495
1355 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1496 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1356 delete *p; 1497 delete *p;
1357 1498
1358 free (fontdesc); fontdesc = 0; 1499 free (fontdesc); fontdesc = 0;
… …
1360 fonts.clear (); 1501 fonts.clear ();
1361 1502
1362 fallback = fallback_fonts; 1503 fallback = fallback_fonts;
1363} 1504}
1364 1505
1506void
1507rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1508{
1509 font->set_term (term);
1510
1511 font->cs = cs;
1512 font->loaded = false;
1513}
1514
1365rxvt_font * 1515rxvt_font *
1366rxvt_fontset::new_font (const char *name, codeset cs) 1516rxvt_fontset::new_font (const char *name, codeset cs)
1367{ 1517{
1368 rxvt_font *f; 1518 rxvt_font *f;
1369 1519
1370 if (!name || !*name) 1520 if (!name || !*name)
1371 { 1521 {
1372 name = ""; 1522 name = "";
1373 f = new rxvt_font_default (this); 1523 f = new rxvt_font_default (this);
1374 } 1524 }
… …
1385 f = new rxvt_font_x11; 1535 f = new rxvt_font_x11;
1386 } 1536 }
1387 else 1537 else
1388 f = new rxvt_font_x11; 1538 f = new rxvt_font_x11;
1389 1539
1390 f->set_term (r);
1391 f->set_name (strdup (name)); 1540 f->set_name (strdup (name));
1392 1541 prepare_font (f, cs);
1393 f->cs = cs;
1394 f->loaded = false;
1395 1542
1396 return f; 1543 return f;
1397} 1544}
1398 1545
1399///////////////////////////////////////////////////////////////////////////// 1546/////////////////////////////////////////////////////////////////////////////
1547
1548void
1549rxvt_fontset::push_font (rxvt_font *font)
1550{
1551 // the fontCount index is reserved for the overflow font, it is only
1552 // necessary when we get fontCount or more fonts, as they cannot be
1553 // represented in the rendition.
1554 if (fonts.size () == fontCount)
1555 {
1556 rxvt_font *f = new rxvt_font_overflow (this);
1557
1558 prepare_font (f, CS_UNICODE);
1559 fonts.push_back (f);
1560 }
1561
1562 fonts.push_back (font);
1563}
1400 1564
1401void 1565void
1402rxvt_fontset::add_fonts (const char *desc) 1566rxvt_fontset::add_fonts (const char *desc)
1403{ 1567{
1404 if (desc) 1568 if (desc)
… …
1442 if (!end) 1606 if (!end)
1443 end = desc + strlen (desc); 1607 end = desc + strlen (desc);
1444 1608
1445 if (end - desc < 511) 1609 if (end - desc < 511)
1446 { 1610 {
1447 strncpy (buf, desc, end - desc); 1611 memcpy (buf, desc, end - desc);
1448 buf[end - desc] = 0; 1612 buf[end - desc] = 0;
1449 1613
1450 fonts.push_back (new_font (buf, cs)); 1614 push_font (new_font (buf, cs));
1451 } 1615 }
1452 else 1616 else
1453 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1617 rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1454 1618
1455 desc = end + 1; 1619 desc = end + 1;
… …
1467 if (fonts[i]->loaded) 1631 if (fonts[i]->loaded)
1468 return true; 1632 return true;
1469 1633
1470 fonts[i]->loaded = true; 1634 fonts[i]->loaded = true;
1471 1635
1472 if (!fonts[i]->load (prop)) 1636 if (!fonts[i]->load (prop, force_prop))
1473 { 1637 {
1474 fonts[i]->cs = CS_UNKNOWN; 1638 fonts[i]->cs = CS_UNKNOWN;
1475 return false; 1639 return false;
1476 } 1640 }
1477 1641
… …
1483{ 1647{
1484 clear (); 1648 clear ();
1485 1649
1486 fontdesc = strdup (desc); 1650 fontdesc = strdup (desc);
1487 1651
1488 fonts.push_back (new_font (0, CS_UNICODE)); 1652 push_font (new_font (0, CS_UNICODE));
1489 realize_font (0); 1653 realize_font (0);
1490 1654
1491 add_fonts (desc); 1655 add_fonts (desc);
1492 1656
1493 return true; 1657 return true;
… …
1502 1666
1503 return -1; 1667 return -1;
1504} 1668}
1505 1669
1506int 1670int
1507rxvt_fontset::find_font (unicode_t unicode) 1671rxvt_fontset::find_font_idx (unicode_t unicode)
1508{ 1672{
1509 if (unicode >= 1<<20) 1673 if (unicode >= 1<<20)
1510 return 0; 1674 return 0;
1511 1675
1512 unicode_t hi = unicode >> 8; 1676 unicode_t hi = unicode >> 8;
… …
1538 goto next_font; 1702 goto next_font;
1539 1703
1540 bool careful; 1704 bool careful;
1541 if (f->has_char (unicode, &prop, careful)) 1705 if (f->has_char (unicode, &prop, careful))
1542 { 1706 {
1543 if (careful) 1707 i = (i << 1) | careful;
1544 i |= 128;
1545 1708
1546 goto found; 1709 goto found;
1547 } 1710 }
1548 1711
1549 next_font: 1712 next_font:
1550 if (i == fonts.size () - 1) 1713 if (i == fonts.size () - 1)
1551 { 1714 {
1552 if (fallback->name) 1715 if (fallback->name)
1553 { 1716 {
1554 // search through the fallback list 1717 // search through the fallback list
1555 fonts.push_back (new_font (fallback->name, fallback->cs)); 1718 push_font (new_font (fallback->name, fallback->cs));
1556 fallback++; 1719 fallback++;
1557 } 1720 }
1558 else 1721 else
1559 { 1722 {
1560 // try to find a new font. 1723 // try to find a new font.
… …
1578 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1741 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1579 FcPatternAddBool (p, FC_MINSPACE, 1); 1742 FcPatternAddBool (p, FC_MINSPACE, 1);
1580 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1743 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1581 1744
1582 XftResult result; 1745 XftResult result;
1583 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1746 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1584 1747
1585 FcPatternDestroy (p); 1748 FcPatternDestroy (p);
1586 1749
1587 if (match) 1750 if (match)
1588 { 1751 {
… …
1591 FcPatternDestroy (match); 1754 FcPatternDestroy (match);
1592 1755
1593 if (find_font (font) < 0) 1756 if (find_font (font) < 0)
1594 { 1757 {
1595 char fontname[4096]; 1758 char fontname[4096];
1596 sprintf (fontname, "xft:%-.4090s", font); 1759 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1597 1760
1598 fonts.push_back (new_font (fontname, CS_UNICODE)); 1761 push_font (new_font (fontname, CS_UNICODE));
1599 } 1762 }
1600 1763
1601 free (font); 1764 free (font);
1602 } 1765 }
1603#endif 1766#endif
… …
1625 } 1788 }
1626 1789
1627 return i; 1790 return i;
1628} 1791}
1629 1792
1630
1631

Diff Legend

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