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.84 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.212 by root, Sat Jun 19 09:10:51 2021 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
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
34
32#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
33 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
34const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
35 codeset cs; 45 codeset cs;
36 const char *name; 46 const char *name;
37} fallback_fonts[] = { 47} fallback_fonts[] = {
38 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
39 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
40 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 50 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
41 51
42#if ENCODING_EU 52#if ENCODING_EU
43 // cyrillic 53 // cyrillic
44 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 54 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
45 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 55 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
46 56
47 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 57 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
48 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 58 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
49 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 59 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
50 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 60 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
51 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 61 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
57 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 67 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
58 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 68 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
59 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 69 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
60 70
61# if XFT 71# if XFT
62 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 72 { CS_KOI8_U, "xft::lang=ru" },
63 73
64 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 74 { CS_ISO8859_5, "xft::lang=ru" },
65 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 75 { CS_ISO8859_6, "xft::lang=ar" },
66 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 76 { CS_ISO8859_7, "xft::lang=el" },
67 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 77 { CS_ISO8859_8, "xft::lang=he" },
68 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 78 { CS_ISO8859_9, "xft::lang=tr" },
69 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 79 { CS_ISO8859_10, "xft::lang=se" },
70 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 80 { CS_ISO8859_11, "xft::lang=th" },
71# endif 81# endif
72#endif 82#endif
73 83
74 // japanese 84 // japanese
75#if ENCODING_JP || ENCODING_JP_EXT 85#if ENCODING_JP || ENCODING_JP_EXT
76# if XFT 86# if XFT
77 // prefer xft for complex scripts 87 // prefer xft for complex scripts
88 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
78 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 89 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
79 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
80 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 90 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
81 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 91 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
82# endif 92# endif
83 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
84 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
85 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 95 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
86 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 96 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
… …
90 100
91#if ENCODING_ZH || ENCODING_ZH_EXT 101#if ENCODING_ZH || ENCODING_ZH_EXT
92# if XFT 102# if XFT
93 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 103 { CS_GBK_0, "xft:AR PL KaitiM GB" },
94 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 104 { CS_GBK_0, "xft:AR PL SungtiL GB" },
95 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 105 { CS_GBK_0, "xft::lang=zh" },
96 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 106 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
97 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 107 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
98 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 108 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
99 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 109 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
100 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 110 { CS_GB2312_1980_0, "xft::lang=zh" },
101# endif 111# endif
102 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 112 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
103 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 113 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
104 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 114 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
105 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 115 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
118#if ENCODING_KR 128#if ENCODING_KR
119 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 129 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
120 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 130 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
121# if XFT 131# if XFT
122 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
123 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
124# endif 134# endif
125#endif 135#endif
126 136
127 // generic font fallback 137 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
128 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
129 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
130 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
131 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
132#if XFT 138#if XFT
133 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
134 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
135 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
136 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 142 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
137 143
138 // FreeMono is usually uglier than x fonts, so try last only. 144 // FreeMono is usually uglier than x fonts, so try after the others
139 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 145 { CS_UNICODE, "xft:FreeMono:autohint=true" },
140#endif 146#endif
141 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" },
142 { CS_UNKNOWN, 0 } 152 { CS_UNKNOWN, 0 }
143}; 153};
144 154
145// these characters are used to guess the font height and width 155// these characters are used to guess the font height and width
146// 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.
… …
148 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 158 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
149 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 159 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
150 0x304c, 0x672c, // が本 160 0x304c, 0x672c, // が本
151}; 161};
152 162
153#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
154
155#define dTermDisplay Display *disp = term->display->display 163#define dTermDisplay Display *disp = term->dpy
156#define dTermGC GC gc = term->gc 164#define dTermGC GC gc = term->gc
157 165
158///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
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 167
194static const char * 168static const char *
195enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 169enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
196{ 170{
197 uint8_t *buf = (uint8_t *)get_enc_buf (len); 171 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
172 uint8_t *res = buf;
198 173
199 while (len--) 174 while (len--)
200 { 175 {
201 uint32_t c = FROM_UNICODE (cs, *text++); 176 uint32_t c = FROM_UNICODE (cs, *text++);
202 177
… …
207 } 182 }
208 183
209 *buf++ = c; 184 *buf++ = c;
210 } 185 }
211 186
212 return (const char *)enc_buf; 187 return (const char *)res;
213} 188}
214 189
215static const XChar2b * 190static const XChar2b *
216enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 191enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
217{ 192{
218 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 193 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
194 XChar2b *res = buf;
219 195
220 while (len--) 196 while (len--)
221 { 197 {
222 uint32_t c = FROM_UNICODE (cs, *text++); 198 uint32_t c = FROM_UNICODE (cs, *text++);
223 199
… …
230 buf->byte1 = c >> 8; 206 buf->byte1 = c >> 8;
231 buf->byte2 = c; 207 buf->byte2 = c;
232 buf++; 208 buf++;
233 } 209 }
234 210
235 return (XChar2b *)enc_buf; 211 return res;
236} 212}
237 213
238///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
239 215
216rxvt_font::rxvt_font ()
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{
219}
220
240void 221void
241rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name_)
242{ 223{
243 if (this->name == name) 224 if (name == name_)
244 return; 225 return;
245 226
246 if (this->name) free (this->name); // let the compiler optimize 227 if (name) free (name); // let the compiler optimize
247 this->name = name; 228 name = name_;
248} 229}
249 230
250void 231void
251rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
252{ 233{
253 dTermDisplay; 234 dTermDisplay;
254 dTermGC; 235 dTermGC;
255 236
256 if (color == Color_bg) 237 if (color == Color_bg || color == Color_transparent)
257 XClearArea (disp, d, x, y, w, h, FALSE); 238 XClearArea (disp, d, x, y, w, h, false);
258 else if (color >= 0) 239 else if (color >= 0)
259 { 240 {
260#if XFT 241#if XFT
242 Picture dst;
243
244# ifdef HAVE_IMG
245 if (term->bg_img
246 && !term->pix_colors[color].is_opaque ()
247 && ((dst = XftDrawPicture (d))))
248 {
249 XClearArea (disp, d, x, y, w, h, false);
250
251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
252 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
253 }
254 else
255# endif
261 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
257
262#else 258#else
263 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
264 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
265#endif 261#endif
266 } 262 }
267} 263}
268 264
269#include "table/linedraw.h" 265/////////////////////////////////////////////////////////////////////////////
270 266
271struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
272 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
273 270
274 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
275 : rxvt_font () 272 : rxvt_font ()
276 { 273 {
… …
287 p.slant = rxvt_fontprop::roman; 284 p.slant = rxvt_fontprop::roman;
288 285
289 return p; 286 return p;
290 } 287 }
291 288
292 bool load (const rxvt_fontprop &prop) 289 bool load (const rxvt_fontprop &prop, bool force_prop)
293 { 290 {
294 width = 1; height = 1; 291 width = 1; height = 1;
295 ascent = 1; descent = 0; 292 ascent = 1; descent = 0;
296 293
297 set_name (strdup ("built-in support font")); 294 set_name (strdup ("built-in support font"));
… …
310 return false; 307 return false;
311 308
312 if (unicode <= 0x009f) 309 if (unicode <= 0x009f)
313 return true; 310 return true;
314 311
312#ifdef BUILTIN_GLYPHS
315 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
316 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
317 return true; 315 return true;
316#endif
318 317
319 if (IS_COMPOSE (unicode)) 318 // we do not check for IS_COMPOSE here, as this would
320 return true; 319 // rob other fonts from taking over.
321 320
322 switch (unicode) 321 switch (unicode)
323 { 322 {
324 case ZERO_WIDTH_CHAR: 323 case ZERO_WIDTH_CHAR:
325 case NOCHAR: 324 case NOCHAR:
… …
346 345
347 XSetForeground (disp, gc, term->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
348 347
349 while (len) 348 while (len)
350 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
351#if ENABLE_COMBINING 356#if ENABLE_COMBINING
352 compose_char *cc; 357 compose_char *cc;
353#endif 358#endif
354 const text_t *tp = text;
355 text_t t = *tp;
356
357 while (++text, --len && *text == NOCHAR)
358 ;
359
360 int width = text - tp; 359 int width = text - tp;
361 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
362 361
362#ifdef BUILTIN_GLYPHS
363 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
364 { 364 {
365# include "table/linedraw.h"
365 uint16_t offs = linedraw_offs[t - 0x2500]; 366 uint16_t offs = linedraw_offs[t - 0x2500];
366 uint32_t *a = linedraw_command + (offs >> 4); 367 uint32_t *a = linedraw_command + (offs >> 4);
367 uint32_t *b = a + (offs & 15); 368 uint32_t *b = a + (offs & 15);
368 369
369 int W = fwidth; 370 int W = fwidth;
… …
407 408
408 case 1: // rectangle, possibly stippled 409 case 1: // rectangle, possibly stippled
409 if (a) 410 if (a)
410 { 411 {
411 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
412 413
413 gcv.fill_style = FillStippled; 414 gcv.fill_style = FillStippled;
414 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
415 gcv.ts_x_origin = x; 416 gcv.ts_x_origin = x;
416 gcv.ts_y_origin = y; 417 gcv.ts_y_origin = y;
417 418
… …
436 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
437 break; 438 break;
438 } 439 }
439 } 440 }
440 } 441 }
442#else
443 if (0)
444 ;
445#endif
441#if ENABLE_COMBINING 446#if ENABLE_COMBINING
442 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
443 { 448 {
449 min_it (width, 2); // we only support wcwidth up to 2
444 text_t chrs[2]; 450 text_t chrs[2];
445 width = min (2, width);
446 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
447 452
448 *chrs = cc->c1; 453 *chrs = cc->c1;
449 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
450 f1->draw (d, x, y, chrs, width, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
451 456
452 if (cc->c2 != NOCHAR) 457 if (cc->c2 != NOCHAR)
453 { 458 {
454 bool careful; 459 bool careful;
455 460
456 // prefer font of first character, for no good reasons 461 // prefer font of first character, for no good reasons
457 *chrs = cc->c2; 462 *chrs = cc->c2;
458 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
459 ? f1 464 ? f1
460 : (*fs)[fs->find_font (cc->c2)]; 465 : (*fs)[fs->find_font_idx (cc->c2)];
461 466
462 f2->draw (d, x, y, chrs, width, fg, -1); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
463 } 468 }
464 } 469 }
465#endif 470#endif
466 else 471 else
467 switch (t) 472 switch (t)
… …
469 case '\t': 474 case '\t':
470 case ZERO_WIDTH_CHAR: 475 case ZERO_WIDTH_CHAR:
471 case NOCHAR: 476 case NOCHAR:
472 break; 477 break;
473 478
479 /*
480 * If the base font does not support variation selectors, treat them as ZWC.
481 * a point could be made to do this for all wcwidth == 0 characters, but I
482 * decided against that until more data is available.
483 */
484 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
485 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
486 break;
487
474 default: 488 default:
475 XDrawRectangle (disp, d, gc, x + 2, y + 2, 489 XDrawRectangle (disp, d, gc, x + 2, y + 2,
476 fwidth - 4, term->fheight - 4); 490 fwidth - 4, term->fheight - 4);
477 } 491 }
478 492
479 x += fwidth; 493 x += fwidth;
480 } 494 }
481} 495}
482 496
497struct rxvt_font_overflow : rxvt_font
498{
499 struct rxvt_fontset *fs;
500
501 rxvt_font_overflow (rxvt_fontset *fs)
502 : rxvt_font ()
503 {
504 this->fs = fs;
505 }
506
507 rxvt_fontprop properties ()
508 {
509 rxvt_fontprop p;
510
511 p.width = p.height = 1;
512 p.ascent = rxvt_fontprop::unset;
513 p.weight = rxvt_fontprop::medium;
514 p.slant = rxvt_fontprop::roman;
515
516 return p;
517 }
518
519 bool load (const rxvt_fontprop &prop, bool force_prop)
520 {
521 width = 1; height = 1;
522 ascent = 1; descent = 0;
523
524 set_name (strdup ("built-in rendition overflow font"));
525
526 return true;
527 }
528
529 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
530 {
531 return false;
532 }
533
534 void draw (rxvt_drawable &d, int x, int y,
535 const text_t *text, int len,
536 int fg, int bg)
537 {
538 while (len)
539 {
540 int fid = fs->find_font_idx (*text);
541 int w = 1;
542 while (w < len && text[w] == NOCHAR)
543 w++;
544 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
545 text += w;
546 len -= w;
547 x += term->fwidth * w;
548 }
549 }
550};
551
483///////////////////////////////////////////////////////////////////////////// 552/////////////////////////////////////////////////////////////////////////////
484 553
485struct rxvt_font_x11 : rxvt_font { 554struct rxvt_font_x11 : rxvt_font
555{
486 rxvt_font_x11 () { f = 0; } 556 rxvt_font_x11 () { f = 0; }
487 557
488 void clear (); 558 void clear ();
489 559
490 rxvt_fontprop properties (); 560 rxvt_fontprop properties ();
491 561
492 bool load (const rxvt_fontprop &prop); 562 bool load (const rxvt_fontprop &prop, bool force_prop);
493 563
494 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; 564 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
495 565
496 void draw (rxvt_drawable &d, int x, int y, 566 void draw (rxvt_drawable &d, int x, int y,
497 const text_t *text, int len, 567 const text_t *text, int len,
498 int fg, int bg); 568 int fg, int bg);
499 569
500 bool slow; // wether this is a proportional font or has other funny characteristics 570 bool slow; // whether this is a proportional font or has other funny characteristics
501 XFontStruct *f; 571 XFontStruct *f;
502 codeset cs;
503 bool enc2b, encm; 572 bool enc2b, encm;
504 573
505 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 574 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
506 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 575 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
507 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 576 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
508 bool set_properties (rxvt_fontprop &p, const char *name); 577 bool set_properties (rxvt_fontprop &p, const char *name);
509}; 578};
510 579
511char * 580char *
512rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 581rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
513{ 582{
514 unsigned long value; 583 unsigned long value;
515 584
516 if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value)) 585 if (XGetFontProperty (f, property, &value))
517 return XGetAtomName (term->display->display, value); 586 return XGetAtomName (term->dpy, value);
518 else 587 else
519 return rxvt_strdup (repl); 588 return repl ? strdup (repl) : 0;
520} 589}
521 590
522rxvt_fontprop 591rxvt_fontprop
523rxvt_font_x11::properties () 592rxvt_font_x11::properties ()
524{ 593{
… …
528} 597}
529 598
530bool 599bool
531rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 600rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
532{ 601{
533 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 602 p.width = width != rxvt_fontprop::unset ? width
603 : avgwidth ? (avgwidth + 1) / 10
604 : (height + 1) / 2;
534 p.height = height; 605 p.height = height;
535 p.ascent = rxvt_fontprop::unset; 606 p.ascent = rxvt_fontprop::unset;
536 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 607 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
537 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 608 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
538 609
… …
543rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 614rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
544{ 615{
545 unsigned long height; 616 unsigned long height;
546 617
547#if 0 618#if 0
548 if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height)) 619 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
549 return false; 620 return false;
550#else 621#else
551 height = f->ascent + f->descent; 622 height = f->ascent + f->descent;
552#endif 623#endif
553 624
554 unsigned long avgwidth; 625 unsigned long avgwidth;
555 if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth)) 626 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
556 avgwidth = 0; 627 avgwidth = 0;
557 628
558 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 629 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
559 char *slant = get_property (f, "SLANT", "r"); 630 char *slant = get_property (f, term->xa [XA_SLANT], "r");
560 631
561 set_properties (p, height, weight, slant, avgwidth); 632 set_properties (p, height, weight, slant, avgwidth);
562 633
563 free (weight); 634 free (weight);
564 free (slant); 635 free (slant);
… …
604 return false; 675 return false;
605} 676}
606 677
607// fix the size of scalable fonts 678// fix the size of scalable fonts
608static bool 679static bool
609replace_field (char *buf, const char *name, int index, const char old, const char *replace) 680replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
610{ 681{
611 int slashes = 0; 682 int slashes = 0;
612 const char *field, *end; 683 const char *field, *end;
613 684
614 for (const char *c = name; *c; c++) 685 for (const char *c = name; *c; c++)
… …
624 break; 695 break;
625 } 696 }
626 697
627 if (slashes >= 13 && (!old || *field == old)) 698 if (slashes >= 13 && (!old || *field == old))
628 { 699 {
629 // TODO: check for overflow in font-name 700 size_t len = field - name;
630 strncpy (buf, name, field - name); 701 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
631 buf += field - name; 702 memcpy (*ptr, name, len);
632 strcpy (buf, replace); 703 strcpy (*ptr + len, replace);
633 strcat (buf, end); 704 strcat (*ptr, end);
634 705
635 return true; 706 return true;
636 } 707 }
637 else 708 else
638 { 709 {
639 strcpy (buf, name); 710 *ptr = strdup (name);
640 711
641 return false; 712 return false;
642 } 713 }
643} 714}
644 715
645bool 716bool
646rxvt_font_x11::load (const rxvt_fontprop &prop) 717rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
647{ 718{
648 dTermDisplay; 719 dTermDisplay;
649 720
650 clear (); 721 clear ();
651 722
652 char field_str[64]; // enough for 128 bits 723 char field_str[64]; // enough for 128 bits
653 724
654 // first morph the font if required 725 // first morph the font if required
655 if (prop.weight != rxvt_fontprop::unset 726 if (force_prop)
656 || prop.slant != rxvt_fontprop::unset)
657 { 727 {
658 char fname[1024]; 728 char *fname;
659 729
660 if (name[0] != '-') 730 if (name[0] != '-')
661 { 731 {
662 f = XLoadQueryFont (disp, name); 732 f = XLoadQueryFont (disp, name);
663 733
664 if (!f) 734 if (!f)
665 return false; 735 return false;
666 736
667 char *new_name = get_property (f, "FONT", name); 737 char *new_name = get_property (f, XA_FONT, 0);
668 738
669 if (new_name) 739 if (new_name)
670 set_name (new_name); 740 set_name (new_name);
671 else 741 else
672 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 742 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
673 743
674 XFreeFont (disp, f); 744 XFreeFont (disp, f);
675 f = 0; 745 f = 0;
676 } 746 }
677 747
678 if (prop.weight != rxvt_fontprop::unset) 748 if (prop.weight != rxvt_fontprop::unset)
679 { 749 {
680 replace_field (fname, name, 2, 0, 750 replace_field (&fname, name, 2, 0,
681 prop.weight < rxvt_fontprop::bold 751 prop.weight < rxvt_fontprop::bold
682 ? "medium" : "bold"); 752 ? "medium" : "bold");
683 set_name (strdup (fname)); 753 set_name (fname);
684 } 754 }
685 755
686 if (prop.slant != rxvt_fontprop::unset) 756 if (prop.slant != rxvt_fontprop::unset)
687 { 757 {
688 replace_field (fname, name, 3, 0, 758 replace_field (&fname, name, 3, 0,
689 prop.slant < rxvt_fontprop::italic 759 prop.slant < rxvt_fontprop::italic
690 ? "r" : "i"); // TODO: handle "o"blique, too 760 ? "r" : "i"); // TODO: handle "o"blique, too
691 set_name (strdup (fname)); 761 set_name (fname);
692 } 762 }
693 } 763 }
694 764
695 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 765 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
696 ? 0 : prop.height); 766 ? 0 : prop.height);
… …
721 font_weight *fonts = new font_weight[count]; 791 font_weight *fonts = new font_weight[count];
722 792
723 for (int i = 0; i < count; i++) 793 for (int i = 0; i < count; i++)
724 { 794 {
725 rxvt_fontprop p; 795 rxvt_fontprop p;
726 char fname[1024]; 796 char *fname;
727 797
728 int diff = 0; 798 int diff = 0;
729 799
730 if (replace_field (fname, list[i], 6, '0', field_str)) 800 if (replace_field (&fname, list[i], 6, '0', field_str))
731 diff += 10; // slightly penalize scalable fonts 801 diff += 10; // slightly penalize scalable fonts
802 else
803 {
804 free (fname);
732 else if (replace_field (fname, list[i], 11, '0', "0")) 805 if (replace_field (&fname, list[i], 11, '0', "0"))
733 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 806 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
807 }
734 808
735 if (!set_properties (p, fname)) 809 if (!set_properties (p, fname)
810 // also weed out too large fonts
811 || (prop.height != rxvt_fontprop::unset
812 && p.height > prop.height))
813 {
814 free (fname);
736 continue; 815 continue;
737 816 }
738 if (prop.height != rxvt_fontprop::unset
739 && p.height > prop.height) // weed out too large fonts
740 continue;
741 817
742 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 818 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
743 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 819 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
744 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 820 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
745 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 821 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
746 822
747 fonts[i].name = strdup (fname); 823 fonts[i].name = fname;
748 fonts[i].diff = diff; 824 fonts[i].diff = diff;
749 } 825 }
750 826
751 XFreeFontNames (list); 827 XFreeFontNames (list);
752 828
753 // this loop only iterates when the guessed font-size is too small 829 // this loop only iterates when the guessed font-size is too small
754 for (;;) 830 for (;;)
755 { 831 {
756 font_weight *best = fonts + count - 1; 832 font_weight *best = fonts;
757 833
758 for (font_weight *w = best; w-- > fonts; ) 834 for (font_weight *w = fonts + 1; w < fonts + count; w++)
759 if (w->diff <= best->diff) 835 if (w->diff < best->diff)
760 best = w; 836 best = w;
761 837
762 if (!best->name 838 if (!best->name
763 || !(f = XLoadQueryFont (disp, best->name))) 839 || !(f = XLoadQueryFont (disp, best->name)))
764 break; 840 break;
… …
781 delete [] fonts; 857 delete [] fonts;
782 858
783 if (!f) 859 if (!f)
784 return false; 860 return false;
785 861
786 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 862 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
787 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 863 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
864
865 cs = CS_UNKNOWN;
788 866
789 if (registry && encoding) 867 if (registry && encoding)
790 { 868 {
791 char charset[64]; 869 char charset[64];
792 snprintf (charset, 64, "%s-%s", registry, encoding); 870 snprintf (charset, 64, "%s-%s", registry, encoding);
793 871
794 cs = codeset_from_name (charset); 872 cs = codeset_from_name (charset);
795 } 873
796 else 874 if (cs == CS_UNKNOWN)
875 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
797 { 876 }
877
878 free (registry);
879 free (encoding);
880
881 if (cs == CS_UNKNOWN)
882 {
798 const char *charset = get_property (f, "FONT", 0); 883 char *value = get_property (f, XA_FONT, 0);
884 const char *charset = value;
799 885
800 if (!charset) 886 if (!charset)
801 charset = name; 887 charset = name;
802 888
803 int count = 13; 889 int count = 13;
804 while (*charset) 890 while (*charset)
805 if (*charset++ == '-' && !--count) 891 if (*charset++ == '-' && !--count)
806 break; 892 break;
807 893
808 cs = codeset_from_name (charset); 894 cs = codeset_from_name (charset);
895 if (cs == CS_UNKNOWN)
896 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
897
898 free (value);
899 }
900
901 if (cs == CS_UNKNOWN)
809 } 902 {
810 903 clear ();
811 free (registry); 904 return false;
812 free (encoding); 905 }
813 906
814 if (cs == CS_UNICODE) 907 if (cs == CS_UNICODE)
815 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 908 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
816 909
817 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 910 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
818 enc2b = encm || f->max_char_or_byte2 > 255; 911 enc2b = encm || f->max_char_or_byte2 > 255;
819 912
820 slow = false; 913 slow = false;
821 914
822#if 1 // only used for slow detection, TODO optimize 915#if 1 // only used for slow detection, TODO optimize
823 if (f->min_bounds.width == f->max_bounds.width) 916 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
824 width = f->min_bounds.width;
825 else if (f->per_char == NULL)
826 width = f->max_bounds.width; 917 width = f->max_bounds.width;
827 else 918 else
828 { 919 {
829 slow = true; 920 slow = true;
830 921
831 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 922 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
832 923
833 if (encm) 924 if (encm)
834 N += (f->max_byte1 - f->min_byte1) 925 N += (f->max_byte1 - f->min_byte1)
835 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 926 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
836 927
837 while (N) 928 while (N)
838 { 929 {
839 if (f->per_char[N].width > width) 930 if (f->per_char[N].width > width)
840 width = f->per_char[N].width; 931 width = f->per_char[N].width;
841 932
… …
844 } 935 }
845#endif 936#endif
846 937
847 width = 1; 938 width = 1;
848 939
849 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 940 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
850 { 941 {
851 if (cs != CS_UNICODE
852 && *t > 0x100
853 && FROM_UNICODE (cs, *t) == NOCHAR) 942 if (FROM_UNICODE (cs, *t) == NOCHAR)
854 continue; 943 continue;
855 944
856 // ignore characters we wouldn't use anyways 945 // ignore characters we wouldn't use anyways
857 bool careful; 946 bool careful;
858 if (!has_char (*t, &prop, careful)) 947 if (!has_char (*t, &prop, careful))
859 continue; 948 continue;
860 949
861 XChar2b ch = { *t >> 8, *t }; 950 // the casts are needed in C++11 (see 8.5.1)
951 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
862 952
863 XCharStruct g; 953 XCharStruct g;
864 int dir_ret, asc_ret, des_ret; 954 int dir_ret, asc_ret, des_ret;
865 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 955 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
866 956
957 int wcw = WCWIDTH (*t);
867 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 958 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
868 959
869 if (width < g.width) width = g.width; 960 if (width < g.width) width = g.width;
870 }
871
872 if (cs == CS_UNKNOWN)
873 { 961 }
874 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
875 962
963#if 0 // do it per-character
964 if (prop && width > prop->width)
965 {
876 clear (); 966 clear ();
877 return false; 967 return false;
878 } 968 }
879
880#if 0 // do it per-character
881 if (prop && width > prop->width)
882 {
883 clear ();
884 return false;
885 }
886#endif 969#endif
887 970
888 return true; 971 return true;
889} 972}
890 973
891void 974void
892rxvt_font_x11::clear () 975rxvt_font_x11::clear ()
893{ 976{
894 if (f) 977 if (f)
895 { 978 {
896 XFreeFont (term->display->display, f); 979 XFreeFont (term->dpy, f);
897 f = 0; 980 f = 0;
898 } 981 }
899} 982}
900 983
901bool 984bool
902rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 985rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
903{ 986{
987 careful = false;
988
904 uint32_t ch = FROM_UNICODE (cs, unicode); 989 uint32_t ch = FROM_UNICODE (cs, unicode);
905 990
906 if (ch == NOCHAR) 991 if (ch == NOCHAR)
907 return false; 992 return false;
908 993
909 /* check wether the character exists in _this_ font. horrible. */ 994 /* check whether the character exists in _this_ font. horrible. */
910 XCharStruct *xcs; 995 XCharStruct *xcs;
911 996
912 if (encm) 997 if (encm)
913 { 998 {
914 unsigned char byte1 = ch >> 8; 999 unsigned char byte1 = ch >> 8;
… …
944 return false; 1029 return false;
945 1030
946 if (!prop || prop->width == rxvt_fontprop::unset) 1031 if (!prop || prop->width == rxvt_fontprop::unset)
947 return true; 1032 return true;
948 1033
949 // check character against base font bounding box 1034 // check whether character overlaps previous/next character
950 int w = xcs->width; 1035 int w = xcs->rbearing - xcs->lbearing;
951 int wcw = wcwidth (unicode); 1036 int wcw = max (WCWIDTH (unicode), 1);
952 if (wcw > 0) w = (w + wcw - 1) / wcw;
953 1037
954 careful = w > prop->width; 1038 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
955 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1039
1040 if (careful && !OVERLAP_OK (w, wcw, prop))
956 return false; 1041 return false;
957 1042
958 return true; 1043 return true;
959} 1044}
960 1045
… …
971 dTermDisplay; 1056 dTermDisplay;
972 dTermGC; 1057 dTermGC;
973 1058
974 bool slow = this->slow 1059 bool slow = this->slow
975 || width != term->fwidth 1060 || width != term->fwidth
976 || height != term->fheight; 1061 || height != term->fheight
1062 || ascent != f->ascent;
977 1063
978 int base = ascent; // sorry, incorrect: term->fbase; 1064 int base = ascent; // sorry, incorrect: term->fbase;
979 1065
980 XGCValues v; 1066 XGCValues v;
981 v.foreground = term->pix_colors[fg]; 1067 v.foreground = term->pix_colors[fg];
… …
994 else 1080 else
995 { 1081 {
996 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1082 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
997 1083
998 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1084 XChangeGC (disp, gc, GCForeground | GCFont, &v);
999 1085
1000 if (slow) 1086 if (slow)
1001 { 1087 {
1002 do 1088 do
1003 { 1089 {
1004 if (xc->byte1 || xc->byte2) 1090 if (xc->byte1 || xc->byte2)
… …
1026 else 1112 else
1027 { 1113 {
1028 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1114 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1029 1115
1030 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1116 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1031 1117
1032 if (slow) 1118 if (slow)
1033 { 1119 {
1034 do 1120 do
1035 { 1121 {
1036 if (*xc) 1122 if (*xc)
… …
1049 1135
1050///////////////////////////////////////////////////////////////////////////// 1136/////////////////////////////////////////////////////////////////////////////
1051 1137
1052#if XFT 1138#if XFT
1053 1139
1054struct rxvt_font_xft : rxvt_font { 1140struct rxvt_font_xft : rxvt_font
1141{
1055 rxvt_font_xft () { f = 0; } 1142 rxvt_font_xft ()
1143 {
1144 f = 0;
1145 }
1056 1146
1057 void clear (); 1147 void clear ();
1058 1148
1059 rxvt_fontprop properties (); 1149 rxvt_fontprop properties ();
1060 1150
1061 bool load (const rxvt_fontprop &prop); 1151 bool load (const rxvt_fontprop &prop, bool force_prop);
1062 1152
1063 void draw (rxvt_drawable &d, int x, int y, 1153 void draw (rxvt_drawable &d, int x, int y,
1064 const text_t *text, int len, 1154 const text_t *text, int len,
1065 int fg, int bg); 1155 int fg, int bg);
1066 1156
1067 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1157 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1068 1158
1069protected: 1159protected:
1070 XftFont *f; 1160 XftFont *f;
1071}; 1161};
1072 1162
1073void 1163void
1074rxvt_font_xft::clear () 1164rxvt_font_xft::clear ()
1075{ 1165{
1076 if (f) 1166 if (f)
1077 { 1167 {
1078 XftFontClose (term->display->display, f); 1168 XftFontClose (term->dpy, f);
1079 f = 0; 1169 f = 0;
1080 } 1170 }
1081} 1171}
1082 1172
1083rxvt_fontprop 1173rxvt_fontprop
… …
1099 1189
1100 return p; 1190 return p;
1101} 1191}
1102 1192
1103bool 1193bool
1104rxvt_font_xft::load (const rxvt_fontprop &prop) 1194rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1105{ 1195{
1106 dTermDisplay; 1196 dTermDisplay;
1107 1197
1108 clear (); 1198 clear ();
1109 1199
… …
1118 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1208 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1119 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1209 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1120 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1210 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1121 1211
1122 if (prop.weight != rxvt_fontprop::unset 1212 if (prop.weight != rxvt_fontprop::unset
1123 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1213 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1124 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1214 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1125 1215
1126 if (prop.slant != rxvt_fontprop::unset 1216 if (prop.slant != rxvt_fontprop::unset
1127 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1217 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1128 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1218 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1129 1219
1130#if 0 // clipping unfortunately destroys our precious double-width-characters 1220#if 0 // clipping unfortunately destroys our precious double-width-characters
1131 // clip width, we can't do better, or can we? 1221 // clip width, we can't do better, or can we?
1132 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1222 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1133 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1223 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1134#endif 1224#endif
1135 1225
1136 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1226 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1137 FcPatternAddBool (p, FC_MINSPACE, 1); 1227 FcPatternAddBool (p, FC_MINSPACE, 1);
1138 1228
… …
1150 int ftheight = 0; 1240 int ftheight = 0;
1151 bool success = true; 1241 bool success = true;
1152 1242
1153 for (;;) 1243 for (;;)
1154 { 1244 {
1245 p = FcPatternDuplicate (match);
1155 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1246 f = XftFontOpenPattern (disp, p);
1156 1247
1157 if (!f) 1248 if (!f)
1158 { 1249 {
1250 FcPatternDestroy (p);
1159 success = false; 1251 success = false;
1160 break; 1252 break;
1161 } 1253 }
1162 1254
1163 FT_Face face = XftLockFace (f); 1255 FT_Face face = XftLockFace (f);
… …
1171 1263
1172 XftUnlockFace (f); 1264 XftUnlockFace (f);
1173 1265
1174 int glheight = height; 1266 int glheight = height;
1175 1267
1176 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1268 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1177 { 1269 {
1178 FcChar16 ch = *t; 1270 FcChar16 ch = *t;
1179 1271
1180 if (cs != CS_UNICODE 1272 if (cs != CS_UNICODE
1181 && ch > 0x100 1273 && ch > 0x100
… …
1190 XGlyphInfo g; 1282 XGlyphInfo g;
1191 XftTextExtents16 (disp, f, &ch, 1, &g); 1283 XftTextExtents16 (disp, f, &ch, 1, &g);
1192 1284
1193 g.width -= g.x; 1285 g.width -= g.x;
1194 1286
1195 int wcw = wcwidth (ch); 1287 int wcw = WCWIDTH (ch);
1196 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1288 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1197 1289
1198 if (width < g.width ) width = g.width; 1290 if (width < g.width ) width = g.width;
1199 if (height < g.height ) height = g.height; 1291 if (height < g.height ) height = g.height;
1200 if (glheight < g.height - g.y) glheight = g.height - g.y; 1292 if (glheight < g.height - g.y) glheight = g.height - g.y;
1201 } 1293 }
1202 1294
1203 if (!width) 1295 if (!width)
1204 { 1296 {
1205 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1297 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1206 1298 width = f->max_advance_width;
1207 XftFontClose (disp, f);
1208 f = 0;
1209
1210 success = false;
1211 break; 1299 break;
1212 } 1300 }
1213 1301
1214 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1215 || (height <= prop.height && glheight <= prop.height) 1303 || (height <= prop.height && glheight <= prop.height)
… …
1250bool 1338bool
1251rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1339rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1252{ 1340{
1253 careful = false; 1341 careful = false;
1254 1342
1343 // handle non-bmp chars when text_t is 16 bit
1344#if ENABLE_COMBINING && !UNICODE_3
1345 if (ecb_expect_false (IS_COMPOSE (unicode)))
1346 if (compose_char *cc = rxvt_composite [unicode])
1347 if (cc->c2 == NOCHAR)
1348 unicode = cc->c1;
1349 else
1350 return false;
1351 else
1352 return false;
1353#endif
1354
1355 FcChar32 chr = unicode;
1356
1255 if (!XftCharExists (term->display->display, f, unicode)) 1357 if (!XftCharExists (term->dpy, f, chr))
1256 return false; 1358 return false;
1257 1359
1258 if (!prop || prop->width == rxvt_fontprop::unset) 1360 if (!prop || prop->width == rxvt_fontprop::unset)
1259 return true; 1361 return true;
1260 1362
1261 // check character against base font bounding box 1363 int wcw = max (WCWIDTH (chr), 1);
1262 FcChar32 ch = unicode; 1364
1263 XGlyphInfo g; 1365 XGlyphInfo g;
1264 XftTextExtents32 (term->display->display, f, &ch, 1, &g); 1366 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1265 1367
1266 int w = g.width - g.x; 1368 int w = g.width - g.x;
1267 int wcw = wcwidth (unicode);
1268 if (wcw > 0) w = (w + wcw - 1) / wcw;
1269 1369
1270 careful = w > prop->width; 1370 careful = g.x > 0 || w > prop->width * wcw;
1271 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1371
1372 if (careful && !OVERLAP_OK (w, wcw, prop))
1373 return false;
1374
1375 // this weeds out _totally_ broken fonts, or glyphs
1376 if (!OVERLAP_OK (g.xOff, wcw, prop))
1272 return false; 1377 return false;
1273 1378
1274 return true; 1379 return true;
1275} 1380}
1276 1381
1277void 1382void
1278rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1383rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1279 const text_t *text, int len, 1384 const text_t *text, int len,
1280 int fg, int bg) 1385 int fg, int bg)
1281{ 1386{
1282 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1387 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1283
1284 XGlyphInfo extents;
1285 XftGlyphSpec *enc = (XftGlyphSpec *)get_enc_buf (len * sizeof (XftGlyphSpec));
1286 XftGlyphSpec *ep = enc; 1388 XftGlyphSpec *ep = enc;
1287 1389
1288 dTermDisplay; 1390 dTermDisplay;
1289 dTermGC; 1391 dTermGC;
1392
1393 int w = term->fwidth * len;
1394 int h = term->fheight;
1395
1396 bool buffered = bg >= Color_transparent
1397 && term->option (Opt_buffered);
1290 1398
1291 // cut trailing spaces 1399 // cut trailing spaces
1292 while (len && text [len - 1] == ' ') 1400 while (len && text [len - 1] == ' ')
1293 len--; 1401 len--;
1294 1402
1403 int x_ = buffered ? 0 : x;
1404 int y_ = buffered ? 0 : y;
1405
1295 while (len) 1406 while (len)
1296 { 1407 {
1297 int cwidth = term->fwidth; 1408 int cwidth = term->fwidth;
1298 FcChar32 fc = *text++; len--; 1409 FcChar32 chr = *text++; len--;
1410
1411 // handle non-bmp chars when text_t is 16 bit
1412 #if ENABLE_COMBINING && !UNICODE_3
1413 if (ecb_expect_false (IS_COMPOSE (chr)))
1414 if (compose_char *cc = rxvt_composite [chr])
1415 if (cc->c2 == NOCHAR)
1416 chr = cc->c1;
1417 #endif
1299 1418
1300 while (len && *text == NOCHAR) 1419 while (len && *text == NOCHAR)
1301 text++, len--, cwidth += term->fwidth; 1420 text++, len--, cwidth += term->fwidth;
1302 1421
1303 if (fc != ' ') // skip spaces 1422 if (chr != ' ') // skip spaces
1423 {
1424 #if 0
1425 FT_UInt glyphs [decltype (exp)::max_size];
1426
1427 for (int i = 0; i < nchrs; ++i)
1428 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1429
1430 for (int i = 0; i < nchrs; ++i)
1304 { 1431 {
1432 XGlyphInfo ep;
1433 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1434 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);
1435 }
1436 #endif
1437
1305 FT_UInt glyph = XftCharIndex (disp, f, fc); 1438 FT_UInt glyph = XftCharIndex (disp, f, chr);
1439 XGlyphInfo extents;
1306 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1440 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1307 1441
1308 ep->glyph = glyph; 1442 ep->glyph = glyph;
1309 ep->x = x + (cwidth - extents.xOff >> 1); 1443 ep->x = x_;
1310 ep->y = y + ascent; 1444 ep->y = y_ + ascent;
1445
1446 // the xft font cell might differ from the terminal font cell,
1447 // in which case we use the average between the two.
1448 ep->x += cwidth - extents.xOff >> 1;
1449
1450 // xft/freetype represent combining characters as characters with zero
1451 // width rendered over the previous character with some fonts, while
1452 // in other fonts, they are considered normal characters, while yet
1453 // in other fonts, they are shifted all over the place.
1454 // we handle the first two cases by keying off on xOff being 0
1455 // for zero-width chars. normally, we would add extents.xOff
1456 // of the base character here, but we don't have that, so we use cwidth.
1457 ep->x += extents.xOff ? 0 : cwidth;
1458
1311 ep++; 1459 ++ep;
1312 } 1460 }
1313 1461
1314 x += cwidth; 1462 x_ += cwidth;
1463 }
1464
1465 if (buffered)
1315 } 1466 {
1316
1317 if (ep != enc) 1467 if (ep != enc)
1468 {
1469 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1470
1471#ifdef HAVE_IMG
1472 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1473
1474 if (term->bg_img
1475 && (bg == Color_transparent || bg == Color_bg
1476 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1477 {
1478 int src_x = x, src_y = y;
1479
1480 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1481 {
1482 src_x += term->window_vt_x;
1483 src_y += term->window_vt_y;
1484 }
1485
1486 if (term->bg_img->w >= src_x + w
1487 && term->bg_img->h >= src_y + h)
1488 {
1489 XCopyArea (disp, term->bg_img->pm, d2, gc,
1490 src_x, src_y, w, h, 0, 0);
1491 }
1492 else
1493 {
1494 XGCValues gcv;
1495
1496 gcv.fill_style = FillTiled;
1497 gcv.tile = term->bg_img->pm;
1498 gcv.ts_x_origin = -src_x;
1499 gcv.ts_y_origin = -src_y;
1500
1501 XChangeGC (disp, gc,
1502 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1503 &gcv);
1504
1505 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1506
1507 gcv.fill_style = FillSolid;
1508 XChangeGC (disp, gc, GCFillStyle, &gcv);
1509 }
1510
1511 if (dst)
1512 {
1513 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1514
1515 // dst can only be set when bg >= 0
1516 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1517 }
1518 }
1519 else
1520#endif
1521 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1522
1523 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1524 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1525 }
1526 else
1527 clear_rect (d, x, y, w, h, bg);
1528 }
1529 else
1530 {
1531 clear_rect (d, x, y, w, h, bg);
1318 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1532 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1533 }
1319} 1534}
1535
1320#endif 1536#endif
1321 1537
1322///////////////////////////////////////////////////////////////////////////// 1538/////////////////////////////////////////////////////////////////////////////
1323 1539
1324rxvt_fontset::rxvt_fontset (rxvt_term *term) 1540rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1335void 1551void
1336rxvt_fontset::clear () 1552rxvt_fontset::clear ()
1337{ 1553{
1338 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1554 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1339 = rxvt_fontprop::unset; 1555 = rxvt_fontprop::unset;
1556 force_prop = false;
1340 1557
1341 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1558 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1342 FONT_UNREF (*i); 1559 (*i)->unref ();
1343 1560
1344 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1561 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1345 delete *p; 1562 delete *p;
1346 1563
1347 free (fontdesc); fontdesc = 0; 1564 free (fontdesc); fontdesc = 0;
… …
1349 fonts.clear (); 1566 fonts.clear ();
1350 1567
1351 fallback = fallback_fonts; 1568 fallback = fallback_fonts;
1352} 1569}
1353 1570
1571void
1572rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1573{
1574 font->set_term (term);
1575
1576 font->cs = cs;
1577 font->loaded = false;
1578}
1579
1354rxvt_font * 1580rxvt_font *
1355rxvt_fontset::new_font (const char *name, codeset cs) 1581rxvt_fontset::new_font (const char *name, codeset cs)
1356{ 1582{
1357 rxvt_font *f; 1583 rxvt_font *f;
1358 1584
1359 if (!name || !*name) 1585 if (!name || !*name)
1360 { 1586 {
1361 name = ""; 1587 name = "";
1362 f = new rxvt_font_default (this); 1588 f = new rxvt_font_default (this);
1363 } 1589 }
… …
1374 f = new rxvt_font_x11; 1600 f = new rxvt_font_x11;
1375 } 1601 }
1376 else 1602 else
1377 f = new rxvt_font_x11; 1603 f = new rxvt_font_x11;
1378 1604
1379 f->set_term (term);
1380 f->set_name (strdup (name)); 1605 f->set_name (strdup (name));
1381 1606 prepare_font (f, cs);
1382 f->cs = cs;
1383 f->loaded = false;
1384 1607
1385 return f; 1608 return f;
1386} 1609}
1387 1610
1388///////////////////////////////////////////////////////////////////////////// 1611/////////////////////////////////////////////////////////////////////////////
1612
1613void
1614rxvt_fontset::push_font (rxvt_font *font)
1615{
1616 // the fontCount index is reserved for the overflow font, it is only
1617 // necessary when we get fontCount or more fonts, as they cannot be
1618 // represented in the rendition.
1619 if (fonts.size () == fontCount)
1620 {
1621 rxvt_font *f = new rxvt_font_overflow (this);
1622
1623 prepare_font (f, CS_UNICODE);
1624 fonts.push_back (f);
1625 }
1626
1627 fonts.push_back (font);
1628}
1389 1629
1390void 1630void
1391rxvt_fontset::add_fonts (const char *desc) 1631rxvt_fontset::add_fonts (const char *desc)
1392{ 1632{
1393 if (desc) 1633 if (desc)
… …
1422 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1662 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1423 else 1663 else
1424 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1664 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1425 1665
1426 desc++; 1666 desc++;
1427 while (*desc <= ' ') desc++; 1667 while (*desc <= ' ' && *desc) desc++;
1428 } 1668 }
1429 1669
1430 end = strchr (desc, ','); 1670 end = strchr (desc, ',');
1431 if (!end) 1671 if (!end)
1432 end = desc + strlen (desc); 1672 end = desc + strlen (desc);
1433 1673
1434 if (end - desc < 511) 1674 if (end - desc < 511)
1435 { 1675 {
1436 strncpy (buf, desc, end - desc); 1676 memcpy (buf, desc, end - desc);
1437 buf[end - desc] = 0; 1677 buf[end - desc] = 0;
1438 1678
1439 fonts.push_back (new_font (buf, cs)); 1679 push_font (new_font (buf, cs));
1440 } 1680 }
1441 else 1681 else
1442 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1682 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1443 1683
1444 desc = end + 1; 1684 desc = end + 1;
1445 } 1685 }
1446 while (*end); 1686 while (*end);
1447 } 1687 }
… …
1456 if (fonts[i]->loaded) 1696 if (fonts[i]->loaded)
1457 return true; 1697 return true;
1458 1698
1459 fonts[i]->loaded = true; 1699 fonts[i]->loaded = true;
1460 1700
1461 if (!fonts[i]->load (prop)) 1701 if (!fonts[i]->load (prop, force_prop))
1462 { 1702 {
1463 fonts[i]->cs = CS_UNKNOWN; 1703 fonts[i]->cs = CS_UNKNOWN;
1464 return false; 1704 return false;
1465 } 1705 }
1466 1706
… …
1472{ 1712{
1473 clear (); 1713 clear ();
1474 1714
1475 fontdesc = strdup (desc); 1715 fontdesc = strdup (desc);
1476 1716
1477 fonts.push_back (new_font (0, CS_UNICODE)); 1717 push_font (new_font (0, CS_UNICODE));
1478 realize_font (0); 1718 realize_font (0);
1479 1719
1480 add_fonts (desc); 1720 add_fonts (desc);
1481 1721
1482 return true; 1722 return true;
… …
1491 1731
1492 return -1; 1732 return -1;
1493} 1733}
1494 1734
1495int 1735int
1496rxvt_fontset::find_font (unicode_t unicode) 1736rxvt_fontset::find_font_idx (unicode_t unicode)
1497{ 1737{
1498 if (unicode >= 1<<20) 1738 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1739 if (unicode > 0x1fffff)
1499 return 0; 1740 return 0;
1500 1741
1501 unicode_t hi = unicode >> 8; 1742 unicode_t hi = unicode >> 8;
1502 1743
1503 if (hi < fmap.size () 1744 if (hi < fmap.size ())
1504 && fmap[hi] 1745 if (pagemap *pm = fmap[hi])
1505 && (*fmap[hi])[unicode & 0xff] != 0xff) 1746 if ((*pm)[unicode & 0xff] != 0xff)
1506 return (*fmap[hi])[unicode & 0xff]; 1747 return (*pm)[unicode & 0xff];
1507 1748
1508 unsigned int i; 1749 unsigned int i;
1509 1750
1510 for (i = 0; i < fonts.size (); i++) 1751 for (i = 0; i < fonts.size (); i++)
1511 { 1752 {
… …
1527 goto next_font; 1768 goto next_font;
1528 1769
1529 bool careful; 1770 bool careful;
1530 if (f->has_char (unicode, &prop, careful)) 1771 if (f->has_char (unicode, &prop, careful))
1531 { 1772 {
1532 if (careful) 1773 i = (i << 1) | careful;
1533 i |= 128;
1534 1774
1535 goto found; 1775 goto found;
1536 } 1776 }
1537 1777
1538 next_font: 1778 next_font:
1539 if (i == fonts.size () - 1) 1779 if (i == fonts.size () - 1)
1540 { 1780 {
1781 // compose characters are handled by the default font, unless another font takes over
1782 // we do not go via the fallback list for speed reasons.
1783 if (IS_COMPOSE (unicode))
1784 return 0;
1785
1541 if (fallback->name) 1786 if (fallback->name)
1542 { 1787 {
1543 // search through the fallback list 1788 // search through the fallback list
1544 fonts.push_back (new_font (fallback->name, fallback->cs)); 1789 push_font (new_font (fallback->name, fallback->cs));
1545 fallback++; 1790 fallback++;
1546 } 1791 }
1547 else 1792 else
1548 { 1793 {
1549 // try to find a new font. 1794 // try to find a new font.
… …
1551 // way to configure this and xft is easier to hack in, 1796 // way to configure this and xft is easier to hack in,
1552 // while x11 has more framework in place already. 1797 // while x11 has more framework in place already.
1553 // TODO: this is a real resource hog, xft takes ages(?) 1798 // TODO: this is a real resource hog, xft takes ages(?)
1554#if XFT && USE_SLOW_LOOKUP 1799#if XFT && USE_SLOW_LOOKUP
1555 // grab the first xft font that seems suitable 1800 // grab the first xft font that seems suitable
1801 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1556 FcPattern *p = FcPatternCreate (); 1802 FcPattern *p = FcPatternCreate ();
1557 1803
1558 FcCharSet *s = FcCharSetCreate (); 1804 FcCharSet *s = FcCharSetCreate ();
1559 FcCharSetAddChar (s, unicode); 1805 FcCharSetAddChar (s, unicode);
1560 FcPatternAddCharSet (p, FC_CHARSET, s); 1806 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1567 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1813 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1568 FcPatternAddBool (p, FC_MINSPACE, 1); 1814 FcPatternAddBool (p, FC_MINSPACE, 1);
1569 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1815 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1570 1816
1571 XftResult result; 1817 XftResult result;
1572 FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result); 1818 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1573 1819
1574 FcPatternDestroy (p); 1820 FcPatternDestroy (p);
1575 1821
1576 if (match) 1822 if (match)
1577 { 1823 {
… …
1580 FcPatternDestroy (match); 1826 FcPatternDestroy (match);
1581 1827
1582 if (find_font (font) < 0) 1828 if (find_font (font) < 0)
1583 { 1829 {
1584 char fontname[4096]; 1830 char fontname[4096];
1585 sprintf (fontname, "xft:%-.4090s", font); 1831 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1586 1832
1587 fonts.push_back (new_font (fontname, CS_UNICODE)); 1833 push_font (new_font (fontname, CS_UNICODE));
1588 } 1834 }
1589 1835
1590 free (font); 1836 free (font);
1591 } 1837 }
1592#endif 1838#endif
… …
1604 while (hi >= fmap.size ()) 1850 while (hi >= fmap.size ())
1605 fmap.push_back (0); 1851 fmap.push_back (0);
1606 1852
1607 if (!fmap[hi]) 1853 if (!fmap[hi])
1608 { 1854 {
1609 fmap[hi] = (pagemap *)new pagemap; 1855 fmap[hi] = new pagemap;
1610 memset (fmap[hi], 0xff, sizeof (pagemap)); 1856 memset (fmap[hi], 0xff, sizeof (pagemap));
1611 } 1857 }
1612 1858
1613 (*fmap[hi])[unicode & 0xff] = i; 1859 (*fmap[hi])[unicode & 0xff] = i;
1614 } 1860 }
1615 1861
1616 return i; 1862 return i;
1617} 1863}
1618 1864
1619
1620

Diff Legend

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