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.79 by root, Sun Jan 8 01:02:15 2006 UTC vs.
Revision 1.224 by root, Thu Jan 4 19:52:37 2024 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
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 3 of the License, or
10 * (at your option) any later version. 10 * (at your option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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 <stdlib.h>
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 137 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
131 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
132 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
133 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
134 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
135#if XFT 138#if XFT
136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:DejaVu Sans Mono:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
138 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
139 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 142 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
140 143
141 // FreeMono is usually uglier than x fonts, so try last only. 144 // FreeMono is usually uglier than x fonts, so try after the others
142 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 145 { CS_UNICODE, "xft:FreeMono:autohint=true" },
143#endif 146#endif
144 147
148 // generic font fallback, put this last, as many iso10646 fonts have extents
149 // specified for all glyphs in the range they cover, but most are simply empty
150 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
151 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
145 { CS_UNKNOWN, 0 } 152 { CS_UNKNOWN, 0 }
146}; 153};
147 154
148// these characters are used to guess the font height and width 155// these characters are used to guess the font height and width
149// pango uses a similar algorithm and doesn't trust the font either. 156// pango uses a similar algorithm and doesn't trust the font either.
150static uint16_t extent_test_chars[] = { 157static uint32_t extent_test_chars[] = {
151 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 158 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
152 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 159 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
153 0x304c, 0x672c, // が本 160 0x304c, 0x672c, // が本
161 0x1f600, // 😀
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_IMG
246 if (term->bg_img
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{
269 struct rxvt_fontset *fs; 270 struct rxvt_fontset *fs;
270 271
271 rxvt_font_default (rxvt_fontset *fs) 272 rxvt_font_default (rxvt_fontset *fs)
272 : rxvt_font () 273 : rxvt_font ()
273 { 274 {
… …
284 p.slant = rxvt_fontprop::roman; 285 p.slant = rxvt_fontprop::roman;
285 286
286 return p; 287 return p;
287 } 288 }
288 289
289 bool load (const rxvt_fontprop &prop) 290 bool load (const rxvt_fontprop &prop, bool force_prop)
290 { 291 {
291 width = 1; height = 1; 292 width = 1; height = 1;
292 ascent = 1; descent = 0; 293 ascent = 1; descent = 0;
293 294
294 set_name (strdup ("built-in support font")); 295 set_name (strdup ("built-in support font"));
295 296
296 return true; 297 return true;
297 } 298 }
298 299
299 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 300 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
300 { 301 {
301 careful = false; 302 careful = false;
302 303
303 if (unicode <= 0x001f) 304 if (unicode <= 0x001f)
304 return true; 305 return true;
… …
307 return false; 308 return false;
308 309
309 if (unicode <= 0x009f) 310 if (unicode <= 0x009f)
310 return true; 311 return true;
311 312
313#ifdef BUILTIN_GLYPHS
312 if (unicode >= 0x2500 && unicode <= 0x259f && 314 if (unicode >= 0x2500 && unicode <= 0x259f &&
313 !r->option (Opt_skipBuiltinGlyphs)) 315 !term->option (Opt_skipBuiltinGlyphs))
314 return true; 316 return true;
317#endif
315 318
316 if (IS_COMPOSE (unicode)) 319 // we do not check for IS_COMPOSE here, as this would
317 return true; 320 // rob other fonts from taking over.
318 321
319 switch (unicode) 322 switch (unicode)
320 { 323 {
321 case ZERO_WIDTH_CHAR: 324 case ZERO_WIDTH_CHAR:
322 case NOCHAR: 325 case NOCHAR:
… …
334void 337void
335rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 338rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
336 const text_t *text, int len, 339 const text_t *text, int len,
337 int fg, int bg) 340 int fg, int bg)
338{ 341{
339 Display *disp = d.display->display; 342 dTermDisplay;
343 dTermGC;
340 344
341 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 345 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
342 346
343 XSetForeground (disp, TGC, r->pix_colors[fg]); 347 XSetForeground (disp, gc, term->pix_colors[fg]);
344 348
345 while (len) 349 while (len)
346 { 350 {
351 const text_t *tp = text;
352 text_t t = *tp;
353
354 while (++text, --len && *text == NOCHAR)
355 ;
356
347#if ENABLE_COMBINING 357#if ENABLE_COMBINING
348 compose_char *cc; 358 compose_char *cc;
349#endif 359#endif
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
356 int width = text - tp; 360 int width = text - tp;
357 int fwidth = r->fwidth * width; 361 int fwidth = term->fwidth * width;
358 362
363#ifdef BUILTIN_GLYPHS
359 if (0x2500 <= t && t <= 0x259f) 364 if (0x2500 <= t && t <= 0x259f)
360 { 365 {
366# include "table/linedraw.h"
361 uint16_t offs = linedraw_offs[t - 0x2500]; 367 uint16_t offs = linedraw_offs[t - 0x2500];
362 uint32_t *a = linedraw_command + (offs >> 4); 368 uint32_t *a = linedraw_command + (offs >> 4);
363 uint32_t *b = a + (offs & 15); 369 uint32_t *b = a + (offs & 15);
364 370
365 int W = fwidth; 371 int W = fwidth;
366 int H = r->fheight; 372 int H = term->fheight;
367 373
368 int x_[16]; 374 int x_[16];
369 int y_[16]; 375 int y_[16];
370 376
371 for (int i = 0; i <= 8; i++) 377 for (int i = 0; i <= 8; i++)
… …
379 385
380 XGCValues gcv; 386 XGCValues gcv;
381 387
382 gcv.cap_style = CapButt; 388 gcv.cap_style = CapButt;
383 gcv.line_width = 0; 389 gcv.line_width = 0;
384 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 390 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
385 391
386 while (a < b) 392 while (a < b)
387 { 393 {
388 uint32_t command = *a++; 394 uint32_t command = *a++;
389 395
… …
396 int y2 = y_[(command >> 0) & 15]; 402 int y2 = y_[(command >> 0) & 15];
397 403
398 switch (op) 404 switch (op)
399 { 405 {
400 case 0: // line 406 case 0: // line
401 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 407 XDrawLine (disp, d, gc, x1, y1, x2, y2);
402 break; 408 break;
403 409
404 case 1: // rectangle, possibly stippled 410 case 1: // rectangle, possibly stippled
405 if (a) 411 if (a)
406 { 412 {
407 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 413 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
408 414
409 gcv.fill_style = FillStippled; 415 gcv.fill_style = FillStippled;
410 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 416 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
411 gcv.ts_x_origin = x; 417 gcv.ts_x_origin = x;
412 gcv.ts_y_origin = y; 418 gcv.ts_y_origin = y;
413 419
414 XChangeGC (disp, TGC, 420 XChangeGC (disp, gc,
415 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 421 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
416 &gcv); 422 &gcv);
417 } 423 }
418 424
419 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 425 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
420 426
421 if (a) 427 if (a)
422 { 428 {
423 XFreePixmap (disp, gcv.stipple); 429 XFreePixmap (disp, gcv.stipple);
424 gcv.stipple = 0; 430 gcv.stipple = 0;
425 gcv.fill_style = FillSolid; 431 gcv.fill_style = FillSolid;
426 XChangeGC (disp, TGC, GCFillStyle, &gcv); 432 XChangeGC (disp, gc, GCFillStyle, &gcv);
427 } 433 }
428 break; 434 break;
429 case 2: // arc 435 case 2: // arc
430 XDrawArc (disp, d, TGC, 436 XDrawArc (disp, d, gc,
431 x1 - W/2, y1 - H/2, W-1, H-1, 437 x1 - W/2, y1 - H/2, W-1, H-1,
432 (a - 1) * 90*64, (b - 1) * 90*64); 438 (a - 1) * 90*64, (b - 1) * 90*64);
433 break; 439 break;
434 } 440 }
435 } 441 }
436 } 442 }
443#else
444 if (0)
445 ;
446#endif
437#if ENABLE_COMBINING 447#if ENABLE_COMBINING
438 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 448 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
439 { 449 {
450 min_it (width, 2); // we only support wcwidth up to 2
440 text_t chrs[2]; 451 text_t chrs[2];
441 width = min (2, width);
442 chrs [1] = NOCHAR; 452 chrs [1] = NOCHAR;
443 453
444 *chrs = cc->c1; 454 *chrs = cc->c1;
445 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
446 f1->draw (d, x, y, chrs, width, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
447 457
448 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
449 { 459 {
450 bool careful; 460 bool careful;
451 461
452 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
453 *chrs = cc->c2; 463 *chrs = cc->c2;
454 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
455 ? f1 465 ? f1
456 : (*fs)[fs->find_font (cc->c2)]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
457 467
458 f2->draw (d, x, y, chrs, width, fg, -1); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
459 } 469 }
460 } 470 }
461#endif 471#endif
462 else 472 else
463 switch (t) 473 switch (t)
… …
465 case '\t': 475 case '\t':
466 case ZERO_WIDTH_CHAR: 476 case ZERO_WIDTH_CHAR:
467 case NOCHAR: 477 case NOCHAR:
468 break; 478 break;
469 479
480 /*
481 * If the base font does not support variation selectors, treat them as ZWC.
482 * a point could be made to do this for all wcwidth == 0 characters, but I
483 * decided against that until more data is available.
484 */
485 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
486 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
487 break;
488
470 default: 489 default:
471 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 490 XDrawRectangle (disp, d, gc, x + 2, y + 2,
472 fwidth - 4, r->fheight - 4); 491 fwidth - 4, term->fheight - 4);
473 } 492 }
474 493
475 x += fwidth; 494 x += fwidth;
476 } 495 }
477} 496}
478 497
498struct rxvt_font_overflow : rxvt_font
499{
500 struct rxvt_fontset *fs;
501
502 rxvt_font_overflow (rxvt_fontset *fs)
503 : rxvt_font ()
504 {
505 this->fs = fs;
506 }
507
508 rxvt_fontprop properties ()
509 {
510 rxvt_fontprop p;
511
512 p.width = p.height = 1;
513 p.ascent = rxvt_fontprop::unset;
514 p.weight = rxvt_fontprop::medium;
515 p.slant = rxvt_fontprop::roman;
516
517 return p;
518 }
519
520 bool load (const rxvt_fontprop &prop, bool force_prop)
521 {
522 width = 1; height = 1;
523 ascent = 1;
524 descent = (*fs)[2]->descent;
525
526 set_name (strdup ("built-in rendition overflow font"));
527
528 return true;
529 }
530
531 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
532 {
533 return false;
534 }
535
536 void draw (rxvt_drawable &d, int x, int y,
537 const text_t *text, int len,
538 int fg, int bg)
539 {
540 while (len)
541 {
542 int fid = fs->find_font_idx (*text);
543 int w = 1;
544 while (w < len && text[w] == NOCHAR)
545 w++;
546 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
547 text += w;
548 len -= w;
549 x += term->fwidth * w;
550 }
551 }
552};
553
479///////////////////////////////////////////////////////////////////////////// 554/////////////////////////////////////////////////////////////////////////////
480 555
481struct rxvt_font_x11 : rxvt_font { 556struct rxvt_font_x11 : rxvt_font
557{
482 rxvt_font_x11 () { f = 0; } 558 rxvt_font_x11 () { f = 0; }
483 559
484 void clear (); 560 void clear ();
485 561
486 rxvt_fontprop properties (); 562 rxvt_fontprop properties ();
487 563
488 bool load (const rxvt_fontprop &prop); 564 bool load (const rxvt_fontprop &prop, bool force_prop);
489 565
490 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 566 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
491 567
492 void draw (rxvt_drawable &d, int x, int y, 568 void draw (rxvt_drawable &d, int x, int y,
493 const text_t *text, int len, 569 const text_t *text, int len,
494 int fg, int bg); 570 int fg, int bg);
495 571
496 bool slow; // wether this is a proportional font or has other funny characteristics 572 bool slow; // whether this is a proportional font or has other funny characteristics
497 XFontStruct *f; 573 XFontStruct *f;
498 codeset cs;
499 bool enc2b, encm; 574 bool enc2b, encm;
500 575
501 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 576 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
502 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 577 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
503 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 578 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
504 bool set_properties (rxvt_fontprop &p, const char *name); 579 bool set_properties (rxvt_fontprop &p, const char *name);
505}; 580};
506 581
507char * 582char *
508rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 583rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
509{ 584{
510 unsigned long value; 585 unsigned long value;
511 586
512 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 587 if (XGetFontProperty (f, property, &value))
513 return XGetAtomName (DISPLAY, value); 588 return XGetAtomName (term->dpy, value);
514 else 589 else
515 return rxvt_strdup (repl); 590 return repl ? strdup (repl) : 0;
516} 591}
517 592
518rxvt_fontprop 593rxvt_fontprop
519rxvt_font_x11::properties () 594rxvt_font_x11::properties ()
520{ 595{
… …
524} 599}
525 600
526bool 601bool
527rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 602rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
528{ 603{
529 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 604 p.width = width != rxvt_fontprop::unset ? width
605 : avgwidth ? (avgwidth + 1) / 10
606 : (height + 1) / 2;
530 p.height = height; 607 p.height = height;
531 p.ascent = rxvt_fontprop::unset; 608 p.ascent = rxvt_fontprop::unset;
532 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 609 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
533 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 610 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
534 611
… …
539rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 616rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
540{ 617{
541 unsigned long height; 618 unsigned long height;
542 619
543#if 0 620#if 0
544 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 621 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
545 return false; 622 return false;
546#else 623#else
547 height = f->ascent + f->descent; 624 height = f->ascent + f->descent;
548#endif 625#endif
549 626
550 unsigned long avgwidth; 627 unsigned long avgwidth;
551 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 628 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
552 avgwidth = 0; 629 avgwidth = 0;
553 630
554 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 631 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
555 char *slant = get_property (f, "SLANT", "r"); 632 char *slant = get_property (f, term->xa [XA_SLANT], "r");
556 633
557 set_properties (p, height, weight, slant, avgwidth); 634 set_properties (p, height, weight, slant, avgwidth);
558 635
559 free (weight); 636 free (weight);
560 free (slant); 637 free (slant);
… …
565} 642}
566 643
567bool 644bool
568rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 645rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
569{ 646{
647 dTermDisplay;
570 int slashes = 0; 648 int slashes = 0;
571 const char *comp[13]; 649 const char *comp[13];
572 650
573 for (const char *c = name; *c; c++) 651 for (const char *c = name; *c; c++)
574 if (*c == '-') 652 if (*c == '-')
… …
582 if (slashes >= 13 660 if (slashes >= 13
583 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 661 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
584 && (*comp[11] >= '0' && *comp[11] <= '9')) 662 && (*comp[11] >= '0' && *comp[11] <= '9'))
585 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 663 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
586 664
587 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 665 XFontStruct *f = XLoadQueryFont (disp, name);
588 666
589 if (f) 667 if (f)
590 { 668 {
591 // the font should really exist now. if not, we have a problem 669 // the font should really exist now. if not, we have a problem
592 // (e.g. if the user did xset fp rehash just when we were searching fonts). 670 // (e.g. if the user did xset fp rehash just when we were searching fonts).
593 // in that case, just return garbage. 671 // in that case, just return garbage.
594 bool ret = set_properties (p, f); 672 bool ret = set_properties (p, f);
595 XFreeFont (DISPLAY, f); 673 XFreeFont (disp, f);
596 return ret; 674 return ret;
597 } 675 }
598 else 676 else
599 return false; 677 return false;
600} 678}
601 679
602// fix the size of scalable fonts 680// fix the size of scalable fonts
603static bool 681static bool
604replace_field (char *buf, const char *name, int index, const char old, const char *replace) 682replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
605{ 683{
606 int slashes = 0; 684 int slashes = 0;
607 const char *field, *end; 685 const char *field, *end;
608 686
609 for (const char *c = name; *c; c++) 687 for (const char *c = name; *c; c++)
… …
619 break; 697 break;
620 } 698 }
621 699
622 if (slashes >= 13 && (!old || *field == old)) 700 if (slashes >= 13 && (!old || *field == old))
623 { 701 {
624 // TODO: check for overflow in font-name 702 size_t len = field - name;
625 strncpy (buf, name, field - name); 703 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
626 buf += field - name; 704 memcpy (*ptr, name, len);
627 strcpy (buf, replace); 705 strcpy (*ptr + len, replace);
628 strcat (buf, end); 706 strcat (*ptr, end);
629 707
630 return true; 708 return true;
631 } 709 }
632 else 710 else
633 { 711 {
634 strcpy (buf, name); 712 *ptr = strdup (name);
635 713
636 return false; 714 return false;
637 } 715 }
638} 716}
639 717
640bool 718bool
641rxvt_font_x11::load (const rxvt_fontprop &prop) 719rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
642{ 720{
643 Display *disp = DISPLAY; 721 dTermDisplay;
644 722
645 clear (); 723 clear ();
646 724
647 char field_str[64]; // enough for 128 bits 725 char field_str[64]; // enough for 128 bits
648 726
649 // first morph the font if required 727 // first morph the font if required
650 if (prop.weight != rxvt_fontprop::unset 728 if (force_prop)
651 || prop.slant != rxvt_fontprop::unset)
652 { 729 {
653 char fname[1024]; 730 char *fname;
654 731
655 if (name[0] != '-') 732 if (name[0] != '-')
656 { 733 {
657 f = XLoadQueryFont (disp, name); 734 f = XLoadQueryFont (disp, name);
658 735
659 if (!f) 736 if (!f)
660 return false; 737 return false;
661 738
662 char *new_name = get_property (f, "FONT", name); 739 char *new_name = get_property (f, XA_FONT, 0);
663 740
664 if (new_name) 741 if (new_name)
665 set_name (new_name); 742 set_name (new_name);
666 else 743 else
667 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 744 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
668 745
669 XFreeFont (disp, f); 746 XFreeFont (disp, f);
670 f = 0; 747 f = 0;
671 } 748 }
672 749
673 if (prop.weight != rxvt_fontprop::unset) 750 if (prop.weight != rxvt_fontprop::unset)
674 { 751 {
675 replace_field (fname, name, 2, 0, 752 replace_field (&fname, name, 2, 0,
676 prop.weight < rxvt_fontprop::bold 753 prop.weight < rxvt_fontprop::bold
677 ? "medium" : "bold"); 754 ? "medium" : "bold");
678 set_name (strdup (fname)); 755 set_name (fname);
679 } 756 }
680 757
681 if (prop.slant != rxvt_fontprop::unset) 758 if (prop.slant != rxvt_fontprop::unset)
682 { 759 {
683 replace_field (fname, name, 3, 0, 760 replace_field (&fname, name, 3, 0,
684 prop.slant < rxvt_fontprop::italic 761 prop.slant < rxvt_fontprop::italic
685 ? "r" : "i"); // TODO: handle "o"blique, too 762 ? "r" : "i"); // TODO: handle "o"blique, too
686 set_name (strdup (fname)); 763 set_name (fname);
687 } 764 }
688 } 765 }
689 766
690 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 767 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
691 ? 0 : prop.height); 768 ? 0 : prop.height);
… …
716 font_weight *fonts = new font_weight[count]; 793 font_weight *fonts = new font_weight[count];
717 794
718 for (int i = 0; i < count; i++) 795 for (int i = 0; i < count; i++)
719 { 796 {
720 rxvt_fontprop p; 797 rxvt_fontprop p;
721 char fname[1024]; 798 char *fname;
722 799
723 int diff = 0; 800 int diff = 0;
724 801
725 if (replace_field (fname, list[i], 6, '0', field_str)) 802 if (replace_field (&fname, list[i], 6, '0', field_str))
726 diff += 10; // slightly penalize scalable fonts 803 diff += 10; // slightly penalize scalable fonts
804 else
805 {
806 free (fname);
727 else if (replace_field (fname, list[i], 11, '0', "0")) 807 if (replace_field (&fname, list[i], 11, '0', "0"))
728 diff += 300; // more heavily penalize what looks like scaled bitmap fotns 808 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
809 }
729 810
730 if (!set_properties (p, fname)) 811 if (!set_properties (p, fname)
812 // also weed out too large fonts
813 || (prop.height != rxvt_fontprop::unset
814 && p.height > prop.height))
815 {
816 free (fname);
731 continue; 817 continue;
732 818 }
733 if (prop.height != rxvt_fontprop::unset
734 && p.height > prop.height) // weed out too large fonts
735 continue;
736 819
737 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 820 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
738 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 821 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
739 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 822 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
740 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 823 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
741 824
742 fonts[i].name = strdup (fname); 825 fonts[i].name = fname;
743 fonts[i].diff = diff; 826 fonts[i].diff = diff;
744 } 827 }
745 828
746 XFreeFontNames (list); 829 XFreeFontNames (list);
747 830
748 // this loop only iterates when the guessed font-size is too small 831 // this loop only iterates when the guessed font-size is too small
749 for (;;) 832 for (;;)
750 { 833 {
751 font_weight *best = fonts + count - 1; 834 font_weight *best = fonts;
752 835
753 for (font_weight *w = best; w-- > fonts; ) 836 for (font_weight *w = fonts + 1; w < fonts + count; w++)
754 if (w->diff <= best->diff) 837 if (w->diff < best->diff)
755 best = w; 838 best = w;
756 839
757 if (!best->name 840 if (!best->name
758 || !(f = XLoadQueryFont (disp, best->name))) 841 || !(f = XLoadQueryFont (disp, best->name)))
759 break; 842 break;
… …
776 delete [] fonts; 859 delete [] fonts;
777 860
778 if (!f) 861 if (!f)
779 return false; 862 return false;
780 863
781 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 864 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
782 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 865 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
866
867 cs = CS_UNKNOWN;
783 868
784 if (registry && encoding) 869 if (registry && encoding)
785 { 870 {
786 char charset[64]; 871 char charset[64];
787 snprintf (charset, 64, "%s-%s", registry, encoding); 872 snprintf (charset, 64, "%s-%s", registry, encoding);
788 873
789 cs = codeset_from_name (charset); 874 cs = codeset_from_name (charset);
790 } 875
791 else 876 if (cs == CS_UNKNOWN)
877 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
792 { 878 }
879
880 free (registry);
881 free (encoding);
882
883 if (cs == CS_UNKNOWN)
884 {
793 const char *charset = get_property (f, "FONT", 0); 885 char *value = get_property (f, XA_FONT, 0);
886 const char *charset = value;
794 887
795 if (!charset) 888 if (!charset)
796 charset = name; 889 charset = name;
797 890
798 int count = 13; 891 int count = 13;
799 while (*charset) 892 while (*charset)
800 if (*charset++ == '-' && !--count) 893 if (*charset++ == '-' && !--count)
801 break; 894 break;
802 895
803 cs = codeset_from_name (charset); 896 cs = codeset_from_name (charset);
897 if (cs == CS_UNKNOWN)
898 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
899
900 free (value);
901 }
902
903 if (cs == CS_UNKNOWN)
804 } 904 {
805 905 clear ();
806 free (registry); 906 return false;
807 free (encoding); 907 }
808 908
809 if (cs == CS_UNICODE) 909 if (cs == CS_UNICODE)
810 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 910 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
811 911
812 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 912 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
813 enc2b = encm || f->max_char_or_byte2 > 255; 913 enc2b = encm || f->max_char_or_byte2 > 255;
814 914
815 slow = false; 915 slow = false;
816 916
817#if 1 // only used for slow detection, TODO optimize 917#if 1 // only used for slow detection, TODO optimize
818 if (f->min_bounds.width == f->max_bounds.width) 918 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
819 width = f->min_bounds.width;
820 else if (f->per_char == NULL)
821 width = f->max_bounds.width; 919 width = f->max_bounds.width;
822 else 920 else
823 { 921 {
824 slow = true; 922 slow = true;
825 923
826 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 924 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
827 925
828 if (encm) 926 if (encm)
829 N += (f->max_byte1 - f->min_byte1) 927 N += (f->max_byte1 - f->min_byte1)
830 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 928 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
831 929
832 while (N) 930 while (N)
833 { 931 {
834 if (f->per_char[N].width > width) 932 if (f->per_char[N].width > width)
835 width = f->per_char[N].width; 933 width = f->per_char[N].width;
836 934
… …
839 } 937 }
840#endif 938#endif
841 939
842 width = 1; 940 width = 1;
843 941
844 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 942 for (uint32_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
845 { 943 {
846 if (cs != CS_UNICODE
847 && *t > 0x100
848 && FROM_UNICODE (cs, *t) == NOCHAR) 944 if (FROM_UNICODE (cs, *t) == NOCHAR)
849 continue; 945 continue;
850 946
851 // ignore characters we wouldn't use anyways 947 // ignore characters we wouldn't use anyways
852 bool careful; 948 bool careful;
853 if (!has_char (*t, &prop, careful)) 949 if (!has_char (*t, &prop, careful))
854 continue; 950 continue;
855 951
856 XChar2b ch = { *t >> 8, *t }; 952 // the casts are needed in C++11 (see 8.5.1)
953 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
857 954
858 XCharStruct g; 955 XCharStruct g;
859 int dir_ret, asc_ret, des_ret; 956 int dir_ret, asc_ret, des_ret;
860 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 957 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
861 958
959 int wcw = WCWIDTH (*t);
862 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 960 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
863 961
864 if (width < g.width) width = g.width; 962 if (width < g.width) width = g.width;
865 }
866
867 if (cs == CS_UNKNOWN)
868 { 963 }
869 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
870 964
965#if 0 // do it per-character
966 if (prop && width > prop->width)
967 {
871 clear (); 968 clear ();
872 return false; 969 return false;
873 } 970 }
874
875#if 0 // do it per-character
876 if (prop && width > prop->width)
877 {
878 clear ();
879 return false;
880 }
881#endif 971#endif
882 972
883 return true; 973 return true;
884} 974}
885 975
886void 976void
887rxvt_font_x11::clear () 977rxvt_font_x11::clear ()
888{ 978{
889 if (f) 979 if (f)
890 { 980 {
891 XFreeFont (DISPLAY, f); 981 XFreeFont (term->dpy, f);
892 f = 0; 982 f = 0;
893 } 983 }
894} 984}
895 985
896bool 986bool
897rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 987rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
898{ 988{
989 careful = false;
990
899 uint32_t ch = FROM_UNICODE (cs, unicode); 991 uint32_t ch = FROM_UNICODE (cs, unicode);
900 992
901 if (ch == NOCHAR) 993 if (ch == NOCHAR)
902 return false; 994 return false;
903 995
904 /* check wether the character exists in _this_ font. horrible. */ 996 /* check whether the character exists in _this_ font. horrible. */
905 XCharStruct *xcs; 997 XCharStruct *xcs;
906 998
907 if (encm) 999 if (encm)
908 { 1000 {
909 unsigned char byte1 = ch >> 8; 1001 unsigned char byte1 = ch >> 8;
… …
939 return false; 1031 return false;
940 1032
941 if (!prop || prop->width == rxvt_fontprop::unset) 1033 if (!prop || prop->width == rxvt_fontprop::unset)
942 return true; 1034 return true;
943 1035
944 // check character against base font bounding box 1036 // check whether character overlaps previous/next character
945 int w = xcs->width; 1037 int w = xcs->rbearing - xcs->lbearing;
946 int wcw = wcwidth (unicode); 1038 int wcw = max (WCWIDTH (unicode), 1);
947 if (wcw > 0) w = (w + wcw - 1) / wcw;
948 1039
949 careful = w > prop->width; 1040 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
950 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1041
1042 if (careful && !OVERLAP_OK (w, wcw, prop))
951 return false; 1043 return false;
952 1044
953 return true; 1045 return true;
954} 1046}
955 1047
… …
961 // this looks like a mess /. 1053 // this looks like a mess /.
962 // and it is a mess /. 1054 // and it is a mess /.
963 // yet we are trying to be perfect /. 1055 // yet we are trying to be perfect /.
964 // but the result still isn't perfect /. 1056 // but the result still isn't perfect /.
965 1057
1058 dTermDisplay;
1059 dTermGC;
1060
966 bool slow = this->slow 1061 bool slow = this->slow
967 || width != r->fwidth 1062 || width != term->fwidth
968 || height != r->fheight; 1063 || height != term->fheight
1064 || ascent != f->ascent;
969 1065
970 int base = ascent; // sorry, incorrect: r->fbase; 1066 int base = ascent; // sorry, incorrect: term->fbase;
971 1067
972 XGCValues v; 1068 XGCValues v;
973 v.foreground = r->pix_colors[fg]; 1069 v.foreground = term->pix_colors[fg];
974 v.font = f->fid; 1070 v.font = f->fid;
975 1071
976 if (enc2b) 1072 if (enc2b)
977 { 1073 {
978 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 1074 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
979 1075
980 if (bg == Color_bg && !slow) 1076 if (bg == Color_bg && !slow)
981 { 1077 {
982 v.background = r->pix_colors[bg]; 1078 v.background = term->pix_colors[bg];
983 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1079 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
984 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 1080 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
985 } 1081 }
986 else 1082 else
987 { 1083 {
988 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1084 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
989 1085
990 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1086 XChangeGC (disp, gc, GCForeground | GCFont, &v);
991 1087
992 if (slow) 1088 if (slow)
993 { 1089 {
994 do 1090 do
995 { 1091 {
996 if (xc->byte1 || xc->byte2) 1092 if (xc->byte1 || xc->byte2)
997 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1093 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
998 1094
999 x += r->fwidth; 1095 x += term->fwidth;
1000 xc++; len--; 1096 xc++; len--;
1001 } 1097 }
1002 while (len); 1098 while (len);
1003 } 1099 }
1004 else 1100 else
1005 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1101 XDrawString16 (disp, d, gc, x, y + base, xc, len);
1006 } 1102 }
1007 } 1103 }
1008 else 1104 else
1009 { 1105 {
1010 const char *xc = enc_char (text, len, cs, slow); 1106 const char *xc = enc_char (text, len, cs, slow);
1011 1107
1012 if (bg == Color_bg && !slow) 1108 if (bg == Color_bg && !slow)
1013 { 1109 {
1014 v.background = r->pix_colors[bg]; 1110 v.background = term->pix_colors[bg];
1015 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1111 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1016 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1112 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1017 } 1113 }
1018 else 1114 else
1019 { 1115 {
1020 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1116 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1021 1117
1022 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1118 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1023 1119
1024 if (slow) 1120 if (slow)
1025 { 1121 {
1026 do 1122 do
1027 { 1123 {
1028 if (*xc) 1124 if (*xc)
1029 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1125 XDrawString (disp, d, gc, x, y + base, xc, 1);
1030 1126
1031 x += r->fwidth; 1127 x += term->fwidth;
1032 xc++; len--; 1128 xc++; len--;
1033 } 1129 }
1034 while (len); 1130 while (len);
1035 } 1131 }
1036 else 1132 else
1037 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1133 XDrawString (disp, d, gc, x, y + base, xc, len);
1038 } 1134 }
1039 } 1135 }
1040} 1136}
1041 1137
1042///////////////////////////////////////////////////////////////////////////// 1138/////////////////////////////////////////////////////////////////////////////
1043 1139
1044#if XFT 1140#if XFT
1045 1141
1046struct rxvt_font_xft : rxvt_font { 1142struct rxvt_font_xft : rxvt_font
1143{
1144#if XFT_CHAR_CACHE
1145 // we cache the qascii range xoffsets in the name of speed,
1146 // expecting terminals to deal mostly with these characters
1147 // we also assume the xoff always fits into uint8_t,
1148 // which is questionable, but let's see...
1149 // also, it is uncomfortably big, due to the uints.
1150 enum { char_cache_min = 0x20, char_cache_max = 0x7e };
1151 uint8_t xoff_cache [char_cache_max - char_cache_min + 1];
1152 FT_UInt glyph_cache [char_cache_max - char_cache_min + 1];
1153#endif
1154
1047 rxvt_font_xft () { f = 0; } 1155 rxvt_font_xft ()
1156 {
1157 f = 0;
1158 }
1048 1159
1049 void clear (); 1160 void clear ();
1050 1161
1051 rxvt_fontprop properties (); 1162 rxvt_fontprop properties ();
1052 1163
1053 bool load (const rxvt_fontprop &prop); 1164 bool load (const rxvt_fontprop &prop, bool force_prop);
1054 1165
1055 void draw (rxvt_drawable &d, int x, int y, 1166 void draw (rxvt_drawable &d, int x, int y,
1056 const text_t *text, int len, 1167 const text_t *text, int len,
1057 int fg, int bg); 1168 int fg, int bg);
1058 1169
1059 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1170 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1060 1171
1061protected: 1172protected:
1062 XftFont *f; 1173 XftFont *f;
1063}; 1174};
1064 1175
1065void 1176void
1066rxvt_font_xft::clear () 1177rxvt_font_xft::clear ()
1067{ 1178{
1068 if (f) 1179 if (f)
1069 { 1180 {
1070 XftFontClose (DISPLAY, f); 1181 XftFontClose (term->dpy, f);
1071 f = 0; 1182 f = 0;
1072 } 1183 }
1073} 1184}
1074 1185
1075rxvt_fontprop 1186rxvt_fontprop
… …
1091 1202
1092 return p; 1203 return p;
1093} 1204}
1094 1205
1095bool 1206bool
1096rxvt_font_xft::load (const rxvt_fontprop &prop) 1207rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1097{ 1208{
1098 Display *disp = DISPLAY; 1209 dTermDisplay;
1099 1210
1100 clear (); 1211 clear ();
1101 1212
1102 FcPattern *p = FcNameParse ((FcChar8 *) name); 1213 FcPattern *p = FcNameParse ((FcChar8 *) name);
1103 1214
… …
1110 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1221 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1111 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1222 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1112 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1223 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1113 1224
1114 if (prop.weight != rxvt_fontprop::unset 1225 if (prop.weight != rxvt_fontprop::unset
1115 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1226 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1116 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1227 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1117 1228
1118 if (prop.slant != rxvt_fontprop::unset 1229 if (prop.slant != rxvt_fontprop::unset
1119 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1230 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1120 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1231 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1121 1232
1122#if 0 // clipping unfortunately destroys our precious double-width-characters 1233#if 0 // clipping unfortunately destroys our precious double-width-characters
1123 // clip width, we can't do better, or can we? 1234 // clip width, we can't do better, or can we?
1124 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1235 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1125 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1236 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1126#endif 1237#endif
1127 1238
1128 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1239 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1129 FcPatternAddBool (p, FC_MINSPACE, 1); 1240 FcPatternAddBool (p, FC_MINSPACE, 1);
1130 1241
1131 // store generated name so iso14755 view gives better results 1242 // store generated name so iso14755 view gives better results
1132 set_name ((char *)FcNameUnparse (p)); 1243 set_name ((char *)FcNameUnparse (p));
1133 1244
1134 XftResult result; 1245 XftResult result;
1135 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1246 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1136 1247
1137 FcPatternDestroy (p); 1248 FcPatternDestroy (p);
1138 1249
1139 if (!match) 1250 if (!match)
1140 return false; 1251 return false;
… …
1142 int ftheight = 0; 1253 int ftheight = 0;
1143 bool success = true; 1254 bool success = true;
1144 1255
1145 for (;;) 1256 for (;;)
1146 { 1257 {
1258 p = FcPatternDuplicate (match);
1147 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1259 f = XftFontOpenPattern (disp, p);
1148 1260
1149 if (!f) 1261 if (!f)
1150 { 1262 {
1263 FcPatternDestroy (p);
1151 success = false; 1264 success = false;
1152 break; 1265 break;
1153 } 1266 }
1154 1267
1155 FT_Face face = XftLockFace (f); 1268 FT_Face face = XftLockFace (f);
1269
1270 // fuck me plenty: XftLockFace can actually return 0. try not to crash.
1271 // we also assume blindly that if the first lock succeeds, then subsequent
1272 // locks will also succeed.
1273 if (!face)
1274 {
1275 XftFontClose (disp, f);
1276 success = false;
1277 break;
1278 }
1156 1279
1157 ascent = (face->size->metrics.ascender + 63) >> 6; 1280 ascent = (face->size->metrics.ascender + 63) >> 6;
1158 descent = (-face->size->metrics.descender + 63) >> 6; 1281 descent = (-face->size->metrics.descender + 63) >> 6;
1159 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6); 1282 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
1160 width = 0; 1283 width = 0;
… …
1163 1286
1164 XftUnlockFace (f); 1287 XftUnlockFace (f);
1165 1288
1166 int glheight = height; 1289 int glheight = height;
1167 1290
1168 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1291 for (uint32_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1169 { 1292 {
1170 FcChar16 ch = *t; 1293 FcChar32 ch = *t;
1171 1294
1172 if (cs != CS_UNICODE 1295 if (cs != CS_UNICODE
1173 && ch > 0x100 1296 && ch > 0x100
1174 && FROM_UNICODE (cs, ch) == NOCHAR) 1297 && FROM_UNICODE (cs, ch) == NOCHAR)
1175 continue; 1298 continue;
… …
1178 bool careful; 1301 bool careful;
1179 if (!has_char (*t, &prop, careful)) 1302 if (!has_char (*t, &prop, careful))
1180 continue; 1303 continue;
1181 1304
1182 XGlyphInfo g; 1305 XGlyphInfo g;
1183 XftTextExtents16 (disp, f, &ch, 1, &g); 1306 XftTextExtents32 (disp, f, &ch, 1, &g);
1184 1307
1185 g.width -= g.x; 1308 g.width -= g.x;
1186 1309
1187 int wcw = wcwidth (ch); 1310 int wcw = WCWIDTH (ch);
1188 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1311 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1189 1312
1190 if (width < g.width ) width = g.width; 1313 if (width < g.width ) width = g.width;
1191 if (height < g.height ) height = g.height; 1314 if (height < g.height ) height = g.height;
1192 if (glheight < g.height - g.y) glheight = g.height - g.y; 1315 if (glheight < g.height - g.y) glheight = g.height - g.y;
1193 } 1316 }
1194 1317
1195 if (!width) 1318 if (!width)
1196 { 1319 {
1197 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1320 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1198 1321 width = f->max_advance_width;
1199 XftFontClose (disp, f);
1200 f = 0;
1201
1202 success = false;
1203 break; 1322 break;
1204 } 1323 }
1205 1324
1206 if (prop.height == rxvt_fontprop::unset 1325 if (prop.height == rxvt_fontprop::unset
1207 || (height <= prop.height && glheight <= prop.height) 1326 || (height <= prop.height && glheight <= prop.height)
… …
1234 clear (); 1353 clear ();
1235 success = false; 1354 success = false;
1236 } 1355 }
1237#endif 1356#endif
1238 1357
1358#if XFT_CHAR_CACHE
1359 // populate char cache
1360 for (FcChar16 ch = char_cache_min; ch <= char_cache_max; ++ch)
1361 {
1362 FT_UInt glyph = XftCharIndex (disp, f, ch);
1363 glyph_cache [ch - char_cache_min] = glyph;
1364
1365 XGlyphInfo g;
1366 XftGlyphExtents (disp, f, &glyph, 1, &g);
1367 xoff_cache [ch - char_cache_min] = g.xOff;
1368 }
1369#endif
1370
1239 return success; 1371 return success;
1240} 1372}
1241 1373
1242bool 1374bool
1243rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1375rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1244{ 1376{
1245 careful = false; 1377 careful = false;
1246 1378
1247 if (!XftCharExists (DISPLAY, f, unicode)) 1379 // handle non-bmp chars when text_t is 16 bit
1380#if ENABLE_COMBINING && !UNICODE_3
1381 if (ecb_expect_false (IS_COMPOSE (unicode)))
1382 if (compose_char *cc = rxvt_composite [unicode])
1383 if (cc->c2 == NOCHAR)
1384 unicode = cc->c1;
1385 else
1386 return false;
1387 else
1388 return false;
1389#endif
1390
1391 FcChar32 chr = unicode;
1392
1393 if (!XftCharExists (term->dpy, f, chr))
1248 return false; 1394 return false;
1249 1395
1250 if (!prop || prop->width == rxvt_fontprop::unset) 1396 if (!prop || prop->width == rxvt_fontprop::unset)
1251 return true; 1397 return true;
1252 1398
1253 // check character against base font bounding box 1399 int wcw = max (WCWIDTH (chr), 1);
1254 FcChar32 ch = unicode; 1400
1255 XGlyphInfo g; 1401 XGlyphInfo g;
1256 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1402 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1403
1404 int cwidth = prop->width * wcw;
1405
1406 // use same adjustments as in ->draw, see there
1407 g.x += g.xOff ? cwidth - g.xOff >> 1 : 0;
1408 g.x += g.xOff ? 0 : cwidth;
1257 1409
1258 int w = g.width - g.x; 1410 int w = g.width - g.x;
1259 int wcw = wcwidth (unicode);
1260 if (wcw > 0) w = (w + wcw - 1) / wcw;
1261 1411
1262 careful = w > prop->width; 1412 careful = g.x > 0 || w > cwidth;
1263 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1413
1414 if (careful && !OVERLAP_OK (w, wcw, prop))
1415 return false;
1416
1417 // this weeds out _totally_ broken fonts, or glyphs
1418 if (!OVERLAP_OK (g.xOff, wcw, prop))
1264 return false; 1419 return false;
1265 1420
1266 return true; 1421 return true;
1267} 1422}
1268 1423
1269void 1424void
1270rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1425rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1271 const text_t *text, int len, 1426 const text_t *text, int len,
1272 int fg, int bg) 1427 int fg, int bg)
1273{ 1428{
1274 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1429 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1430 XftGlyphSpec *ep = enc;
1275 1431
1276 int base = ascent; // should be fbase, but that is incorrect 1432 dTermDisplay;
1433 dTermGC;
1277 1434
1278 XGlyphInfo extents; 1435 int w = term->fwidth * len;
1279 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1436 int h = term->fheight;
1280 FcChar32 *ep = enc; 1437
1281 int ewidth = 0; 1438 bool buffered = bg >= Color_transparent
1439 && term->option (Opt_buffered);
1440
1441 // cut trailing spaces
1442 while (len && text [len - 1] == ' ')
1443 len--;
1444
1445 int x_ = buffered ? 0 : x;
1446 int y_ = buffered ? 0 : y;
1282 1447
1283 while (len) 1448 while (len)
1284 { 1449 {
1285 int cwidth = r->fwidth; 1450 int cwidth = term->fwidth;
1286 FcChar32 fc = *text++; len--; 1451 FcChar32 chr = *text++; len--;
1287 1452
1288 while (len && *text == NOCHAR) 1453 while (len && *text == NOCHAR)
1289 text++, len--, cwidth += r->fwidth; 1454 text++, len--, cwidth += term->fwidth;
1455
1456 if (chr != ' ') // skip spaces
1290 1457 {
1291 if (fc == ' ' && ep == enc) // skip leading spaces 1458 // handle non-bmp chars when text_t is 16 bit
1292 x += cwidth; 1459 #if ENABLE_COMBINING && !UNICODE_3
1293 else 1460 if (ecb_expect_false (IS_COMPOSE (chr)))
1294 { 1461 if (compose_char *cc = rxvt_composite [chr])
1295 FT_UInt gl = XftCharIndex (d.display->display, f, fc); 1462 if (cc->c2 == NOCHAR)
1296 XftGlyphExtents (d.display->display, f, &gl, 1, &extents); 1463 chr = cc->c1;
1464 #endif
1297 1465
1298 if (extents.xOff != cwidth) 1466 #if 0
1467 FT_UInt glyphs [decltype (exp)::max_size];
1468
1469 for (int i = 0; i < nchrs; ++i)
1470 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1471
1472 for (int i = 0; i < nchrs; ++i)
1299 { 1473 {
1300 if (ewidth) 1474 XGlyphInfo ep;
1301 { 1475 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1302 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1476 printf ("gs %4x g %4x + %3d,%3d o %3d,%3d wh %3d,%3d\n", chrs[i],glyphs[i],ep.x,ep.y,ep.xOff,ep.yOff,ep.width,ep.height);
1303 x, y + base, enc, ep - enc);
1304 x += ewidth;
1305
1306 ep = enc;
1307 ewidth = 0;
1308 } 1477 }
1478 #endif
1309 1479
1310 if (extents.xOff > cwidth) 1480 FT_UInt glyph;
1311 extents.xOff = cwidth; 1481 int xOff;
1312 1482
1313 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1483 #if XFT_CHAR_CACHE
1314 x + (cwidth - extents.xOff >> 1), 1484 if (ecb_expect_true (IN_RANGE_INC (chr, char_cache_min, char_cache_max)))
1315 y + base, &gl, 1); 1485 {
1316 x += cwidth; 1486 glyph = glyph_cache [chr - char_cache_min];
1487 xOff = xoff_cache [chr - char_cache_min];
1317 } 1488 }
1318 else 1489 else
1490 #endif
1319 { 1491 {
1320 *ep++ = gl; 1492 glyph = XftCharIndex (disp, f, chr);
1321 ewidth += cwidth; 1493 XGlyphInfo extents;
1494 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1495 xOff = extents.xOff;
1322 } 1496 }
1497
1498 ep->glyph = glyph;
1499 ep->x = x_;
1500 ep->y = y_ + ascent;
1501
1502 // the xft font cell might differ from the terminal font cell,
1503 // in which case we use the average between the two.
1504 ep->x += xOff ? cwidth - xOff >> 1 : 0;
1505
1506 // xft/freetype represent combining characters as characters with zero
1507 // width rendered over the previous character with some fonts, while
1508 // in other fonts, they are considered normal characters, while yet
1509 // in other fonts, they are shifted all over the place.
1510 // we handle the first two cases by keying off on xOff being 0
1511 // for zero-width chars. normally, we would add extents.xOff
1512 // of the base character here, but we don't have that, so we use cwidth.
1513 ep->x += xOff ? 0 : cwidth;
1514
1515 ++ep;
1323 } 1516 }
1517
1518 x_ += cwidth;
1519 }
1520
1521 if (buffered)
1324 } 1522 {
1325
1326 if (ep != enc) 1523 if (ep != enc)
1524 {
1525 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1526
1527#ifdef HAVE_IMG
1528 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1529
1530 if (term->bg_img
1531 && (bg == Color_transparent || bg == Color_bg
1532 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1533 {
1534 int src_x = x, src_y = y;
1535
1536 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1537 {
1538 src_x += term->window_vt_x;
1539 src_y += term->window_vt_y;
1540 }
1541
1542 if (term->bg_img->w >= src_x + w
1543 && term->bg_img->h >= src_y + h)
1544 {
1545 XCopyArea (disp, term->bg_img->pm, d2, gc,
1546 src_x, src_y, w, h, 0, 0);
1547 }
1548 else
1549 {
1550 XGCValues gcv;
1551
1552 gcv.fill_style = FillTiled;
1553 gcv.tile = term->bg_img->pm;
1554 gcv.ts_x_origin = -src_x;
1555 gcv.ts_y_origin = -src_y;
1556
1557 XChangeGC (disp, gc,
1558 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1559 &gcv);
1560
1561 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1562
1563 gcv.fill_style = FillSolid;
1564 XChangeGC (disp, gc, GCFillStyle, &gcv);
1565 }
1566
1567 if (dst)
1568 {
1569 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1570
1571 // dst can only be set when bg >= 0
1572 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1573 }
1574 }
1575 else
1576#endif
1577 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1578
1579 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1580 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1581 }
1582 else
1583 clear_rect (d, x, y, w, h, bg);
1584 }
1585 else
1586 {
1587 clear_rect (d, x, y, w, h, bg);
1327 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1588 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1328 x, y + base, enc, ep - enc); 1589 }
1329} 1590}
1591
1330#endif 1592#endif
1331 1593
1332///////////////////////////////////////////////////////////////////////////// 1594/////////////////////////////////////////////////////////////////////////////
1333 1595
1334rxvt_fontset::rxvt_fontset (rxvt_t r) 1596rxvt_fontset::rxvt_fontset (rxvt_term *term)
1335: fontdesc (0), r (r) 1597: fontdesc (0), term (term)
1336{ 1598{
1337 clear (); 1599 clear ();
1338} 1600}
1339 1601
1340rxvt_fontset::~rxvt_fontset () 1602rxvt_fontset::~rxvt_fontset ()
… …
1345void 1607void
1346rxvt_fontset::clear () 1608rxvt_fontset::clear ()
1347{ 1609{
1348 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1610 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1349 = rxvt_fontprop::unset; 1611 = rxvt_fontprop::unset;
1612 force_prop = false;
1350 1613
1351 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1614 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1352 FONT_UNREF (*i); 1615 (*i)->unref ();
1353 1616
1354 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1617 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1355 delete *p; 1618 delete *p;
1356 1619
1357 free (fontdesc); fontdesc = 0; 1620 free (fontdesc); fontdesc = 0;
… …
1359 fonts.clear (); 1622 fonts.clear ();
1360 1623
1361 fallback = fallback_fonts; 1624 fallback = fallback_fonts;
1362} 1625}
1363 1626
1627void
1628rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1629{
1630 font->set_term (term);
1631
1632 font->cs = cs;
1633 font->loaded = false;
1634}
1635
1364rxvt_font * 1636rxvt_font *
1365rxvt_fontset::new_font (const char *name, codeset cs) 1637rxvt_fontset::new_font (const char *name, codeset cs)
1366{ 1638{
1367 rxvt_font *f; 1639 rxvt_font *f;
1368 1640
1369 if (!name || !*name) 1641 if (!name || !*name)
1370 { 1642 {
1371 name = ""; 1643 name = "";
1372 f = new rxvt_font_default (this); 1644 f = new rxvt_font_default (this);
1373 } 1645 }
… …
1384 f = new rxvt_font_x11; 1656 f = new rxvt_font_x11;
1385 } 1657 }
1386 else 1658 else
1387 f = new rxvt_font_x11; 1659 f = new rxvt_font_x11;
1388 1660
1389 f->set_term (r);
1390 f->set_name (strdup (name)); 1661 f->set_name (strdup (name));
1391 1662 prepare_font (f, cs);
1392 f->cs = cs;
1393 f->loaded = false;
1394 1663
1395 return f; 1664 return f;
1396} 1665}
1397 1666
1398///////////////////////////////////////////////////////////////////////////// 1667/////////////////////////////////////////////////////////////////////////////
1668
1669void
1670rxvt_fontset::push_font (rxvt_font *font)
1671{
1672 // the fontCount index is reserved for the overflow font, it is only
1673 // necessary when we get fontCount or more fonts, as they cannot be
1674 // represented in the rendition.
1675 if (fonts.size () == fontCount)
1676 {
1677 rxvt_font *f = new rxvt_font_overflow (this);
1678
1679 prepare_font (f, CS_UNICODE);
1680 fonts.push_back (f);
1681 }
1682
1683 fonts.push_back (font);
1684}
1399 1685
1400void 1686void
1401rxvt_fontset::add_fonts (const char *desc) 1687rxvt_fontset::add_fonts (const char *desc)
1402{ 1688{
1403 if (desc) 1689 if (desc)
… …
1432 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1718 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1433 else 1719 else
1434 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1720 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1435 1721
1436 desc++; 1722 desc++;
1437 while (*desc <= ' ') desc++; 1723 while (*desc <= ' ' && *desc) desc++;
1438 } 1724 }
1439 1725
1440 end = strchr (desc, ','); 1726 end = strchr (desc, ',');
1441 if (!end) 1727 if (!end)
1442 end = desc + strlen (desc); 1728 end = desc + strlen (desc);
1443 1729
1444 if (end - desc < 511) 1730 if (end - desc < 511)
1445 { 1731 {
1446 strncpy (buf, desc, end - desc); 1732 memcpy (buf, desc, end - desc);
1447 buf[end - desc] = 0; 1733 buf[end - desc] = 0;
1448 1734
1449 fonts.push_back (new_font (buf, cs)); 1735 push_font (new_font (buf, cs));
1450 } 1736 }
1451 else 1737 else
1452 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1738 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1453 1739
1454 desc = end + 1; 1740 desc = end + 1;
1455 } 1741 }
1456 while (*end); 1742 while (*end);
1457 } 1743 }
… …
1466 if (fonts[i]->loaded) 1752 if (fonts[i]->loaded)
1467 return true; 1753 return true;
1468 1754
1469 fonts[i]->loaded = true; 1755 fonts[i]->loaded = true;
1470 1756
1471 if (!fonts[i]->load (prop)) 1757 if (!fonts[i]->load (prop, force_prop))
1472 { 1758 {
1473 fonts[i]->cs = CS_UNKNOWN; 1759 fonts[i]->cs = CS_UNKNOWN;
1474 return false; 1760 return false;
1475 } 1761 }
1476 1762
… …
1482{ 1768{
1483 clear (); 1769 clear ();
1484 1770
1485 fontdesc = strdup (desc); 1771 fontdesc = strdup (desc);
1486 1772
1487 fonts.push_back (new_font (0, CS_UNICODE)); 1773 push_font (new_font (0, CS_UNICODE));
1488 realize_font (0); 1774 realize_font (0);
1489 1775
1490 add_fonts (desc); 1776 add_fonts (desc);
1491 1777
1492 return true; 1778 return true;
… …
1501 1787
1502 return -1; 1788 return -1;
1503} 1789}
1504 1790
1505int 1791int
1506rxvt_fontset::find_font (unicode_t unicode) 1792rxvt_fontset::find_font_idx (unicode_t unicode)
1507{ 1793{
1508 if (unicode >= 1<<20) 1794 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1795 if (unicode > 0x1fffff)
1509 return 0; 1796 return 0;
1510 1797
1511 unicode_t hi = unicode >> 8; 1798 unicode_t hi = unicode >> 8;
1512 1799
1513 if (hi < fmap.size () 1800 if (hi < fmap.size ())
1514 && fmap[hi] 1801 if (pagemap *pm = fmap[hi])
1515 && (*fmap[hi])[unicode & 0xff] != 0xff) 1802 if ((*pm)[unicode & 0xff] != 0xff)
1516 return (*fmap[hi])[unicode & 0xff]; 1803 return (*pm)[unicode & 0xff];
1517 1804
1518 unsigned int i; 1805 unsigned int i;
1519 1806
1520 for (i = 0; i < fonts.size (); i++) 1807 for (i = 0; i < fonts.size (); i++)
1521 { 1808 {
… …
1537 goto next_font; 1824 goto next_font;
1538 1825
1539 bool careful; 1826 bool careful;
1540 if (f->has_char (unicode, &prop, careful)) 1827 if (f->has_char (unicode, &prop, careful))
1541 { 1828 {
1542 if (careful) 1829 i = (i << 1) | careful;
1543 i |= 128;
1544 1830
1545 goto found; 1831 goto found;
1546 } 1832 }
1547 1833
1548 next_font: 1834 next_font:
1549 if (i == fonts.size () - 1) 1835 if (i == fonts.size () - 1)
1550 { 1836 {
1837 // compose characters are handled by the default font, unless another font takes over
1838 // we do not go via the fallback list for speed reasons.
1839 if (IS_COMPOSE (unicode))
1840 return 0;
1841
1551 if (fallback->name) 1842 if (fallback->name)
1552 { 1843 {
1553 // search through the fallback list 1844 // search through the fallback list
1554 fonts.push_back (new_font (fallback->name, fallback->cs)); 1845 push_font (new_font (fallback->name, fallback->cs));
1555 fallback++; 1846 fallback++;
1556 } 1847 }
1557 else 1848 else
1558 { 1849 {
1559 // try to find a new font. 1850 // try to find a new font.
… …
1561 // way to configure this and xft is easier to hack in, 1852 // way to configure this and xft is easier to hack in,
1562 // while x11 has more framework in place already. 1853 // while x11 has more framework in place already.
1563 // TODO: this is a real resource hog, xft takes ages(?) 1854 // TODO: this is a real resource hog, xft takes ages(?)
1564#if XFT && USE_SLOW_LOOKUP 1855#if XFT && USE_SLOW_LOOKUP
1565 // grab the first xft font that seems suitable 1856 // grab the first xft font that seems suitable
1857 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1566 FcPattern *p = FcPatternCreate (); 1858 FcPattern *p = FcPatternCreate ();
1567 1859
1568 FcCharSet *s = FcCharSetCreate (); 1860 FcCharSet *s = FcCharSetCreate ();
1569 FcCharSetAddChar (s, unicode); 1861 FcCharSetAddChar (s, unicode);
1570 FcPatternAddCharSet (p, FC_CHARSET, s); 1862 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1577 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1869 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1578 FcPatternAddBool (p, FC_MINSPACE, 1); 1870 FcPatternAddBool (p, FC_MINSPACE, 1);
1579 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1871 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1580 1872
1581 XftResult result; 1873 XftResult result;
1582 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1874 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1583 1875
1584 FcPatternDestroy (p); 1876 FcPatternDestroy (p);
1585 1877
1586 if (match) 1878 if (match)
1587 { 1879 {
… …
1590 FcPatternDestroy (match); 1882 FcPatternDestroy (match);
1591 1883
1592 if (find_font (font) < 0) 1884 if (find_font (font) < 0)
1593 { 1885 {
1594 char fontname[4096]; 1886 char fontname[4096];
1595 sprintf (fontname, "xft:%-.4090s", font); 1887 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1596 1888
1597 fonts.push_back (new_font (fontname, CS_UNICODE)); 1889 push_font (new_font (fontname, CS_UNICODE));
1598 } 1890 }
1599 1891
1600 free (font); 1892 free (font);
1601 } 1893 }
1602#endif 1894#endif
… …
1614 while (hi >= fmap.size ()) 1906 while (hi >= fmap.size ())
1615 fmap.push_back (0); 1907 fmap.push_back (0);
1616 1908
1617 if (!fmap[hi]) 1909 if (!fmap[hi])
1618 { 1910 {
1619 fmap[hi] = (pagemap *)new pagemap; 1911 fmap[hi] = new pagemap;
1620 memset (fmap[hi], 0xff, sizeof (pagemap)); 1912 memset (fmap[hi], 0xff, sizeof (pagemap));
1621 } 1913 }
1622 1914
1623 (*fmap[hi])[unicode & 0xff] = i; 1915 (*fmap[hi])[unicode & 0xff] = i;
1624 } 1916 }
1625 1917
1626 return i; 1918 return i;
1627} 1919}
1628 1920
1629
1630

Diff Legend

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