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.85 by root, Wed Jan 25 00:42:21 2006 UTC vs.
Revision 1.203 by root, Thu Jun 17 11:21:52 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
158/////////////////////////////////////////////////////////////////////////////
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 165
176///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
177 167
178static const char * 168static const char *
179enc_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)
… …
221 return res; 211 return res;
222} 212}
223 213
224///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
225 215
216rxvt_font::rxvt_font ()
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset), can_compose(false)
218{
219}
220
226void 221void
227rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name_)
228{ 223{
229 if (this->name == name) 224 if (name == name_)
230 return; 225 return;
231 226
232 if (this->name) free (this->name); // let the compiler optimize 227 if (name) free (name); // let the compiler optimize
233 this->name = name; 228 name = name_;
234} 229}
235 230
236void 231void
237rxvt_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
238{ 233{
239 dTermDisplay; 234 dTermDisplay;
240 dTermGC; 235 dTermGC;
241 236
242 if (color == Color_bg) 237 if (color == Color_bg || color == Color_transparent)
243 XClearArea (disp, d, x, y, w, h, FALSE); 238 XClearArea (disp, d, x, y, w, h, false);
244 else if (color >= 0) 239 else if (color >= 0)
245 { 240 {
246#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
247 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
257
248#else 258#else
249 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
250 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
251#endif 261#endif
252 } 262 }
253} 263}
254 264
255#include "table/linedraw.h" 265/////////////////////////////////////////////////////////////////////////////
256 266
257struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
258 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
259 270
260 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
261 : rxvt_font () 272 : rxvt_font ()
262 { 273 {
… …
273 p.slant = rxvt_fontprop::roman; 284 p.slant = rxvt_fontprop::roman;
274 285
275 return p; 286 return p;
276 } 287 }
277 288
278 bool load (const rxvt_fontprop &prop) 289 bool load (const rxvt_fontprop &prop, bool force_prop)
279 { 290 {
280 width = 1; height = 1; 291 width = 1; height = 1;
281 ascent = 1; descent = 0; 292 ascent = 1; descent = 0;
282 293
283 set_name (strdup ("built-in support font")); 294 set_name (strdup ("built-in support font"));
… …
296 return false; 307 return false;
297 308
298 if (unicode <= 0x009f) 309 if (unicode <= 0x009f)
299 return true; 310 return true;
300 311
312#ifdef BUILTIN_GLYPHS
301 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
302 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
303 return true; 315 return true;
316#endif
304 317
305 if (IS_COMPOSE (unicode)) 318 // we do not check for IS_COMPOSE here, as this would
306 return true; 319 // rob other fonts from taking over.
307 320
308 switch (unicode) 321 switch (unicode)
309 { 322 {
310 case ZERO_WIDTH_CHAR: 323 case ZERO_WIDTH_CHAR:
311 case NOCHAR: 324 case NOCHAR:
… …
332 345
333 XSetForeground (disp, gc, term->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
334 347
335 while (len) 348 while (len)
336 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
337#if ENABLE_COMBINING 356#if ENABLE_COMBINING
338 compose_char *cc; 357 compose_char *cc;
339#endif 358#endif
340 const text_t *tp = text;
341 text_t t = *tp;
342
343 while (++text, --len && *text == NOCHAR)
344 ;
345
346 int width = text - tp; 359 int width = text - tp;
347 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
348 361
362#ifdef BUILTIN_GLYPHS
349 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
350 { 364 {
365# include "table/linedraw.h"
351 uint16_t offs = linedraw_offs[t - 0x2500]; 366 uint16_t offs = linedraw_offs[t - 0x2500];
352 uint32_t *a = linedraw_command + (offs >> 4); 367 uint32_t *a = linedraw_command + (offs >> 4);
353 uint32_t *b = a + (offs & 15); 368 uint32_t *b = a + (offs & 15);
354 369
355 int W = fwidth; 370 int W = fwidth;
… …
393 408
394 case 1: // rectangle, possibly stippled 409 case 1: // rectangle, possibly stippled
395 if (a) 410 if (a)
396 { 411 {
397 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
398 413
399 gcv.fill_style = FillStippled; 414 gcv.fill_style = FillStippled;
400 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
401 gcv.ts_x_origin = x; 416 gcv.ts_x_origin = x;
402 gcv.ts_y_origin = y; 417 gcv.ts_y_origin = y;
403 418
… …
422 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
423 break; 438 break;
424 } 439 }
425 } 440 }
426 } 441 }
442#else
443 if (0)
444 ;
445#endif
427#if ENABLE_COMBINING 446#if ENABLE_COMBINING
428 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
429 { 448 {
449 min_it (width, 2); // we only support wcwidth up to 2
450
451 #if NOT_YET
452 vector<text_t> chrs;
453 chrs.reserve (rxvt_composite.expand (t));
454 rxvt_composite.expand (t, &chrs[0]);
455
456 while (!chrs.empty ())
457 {
458 rxvt_font *f1 = fs->find_font_idx (chrs[0])
459
460 int i = 0;
461 while (i < chrs.size () - 1
462 && f1->can_combine
463 && f1->has-char (chrs[i + 1], careful)
464 && !careful
465 ++i;
466
467 (*fs)[f1]->draw (d, x, y, &chrs[0], width, fg, bg);
468 chrs.erase (&chrs[0], &chrs[i]);
469 }
470 #endif
471
472 #if 1
430 text_t chrs[2]; 473 text_t chrs[2];
431 width = min (2, width);
432 chrs [1] = NOCHAR; 474 chrs [1] = NOCHAR;
433 475
434 *chrs = cc->c1; 476 *chrs = cc->c1;
435 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 477 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
436 f1->draw (d, x, y, chrs, width, fg, bg); 478 f1->draw (d, x, y, chrs, width, fg, bg);
437 479
438 if (cc->c2 != NOCHAR) 480 if (cc->c2 != NOCHAR)
439 { 481 {
440 bool careful; 482 bool careful;
441 483
442 // prefer font of first character, for no good reasons 484 // prefer font of first character, for no good reasons
443 *chrs = cc->c2; 485 *chrs = cc->c2;
444 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 486 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
445 ? f1 487 ? f1
446 : (*fs)[fs->find_font (cc->c2)]; 488 : (*fs)[fs->find_font_idx (cc->c2)];
447 489
448 f2->draw (d, x, y, chrs, width, fg, -1); 490 f2->draw (d, x, y, chrs, width, fg, Color_none);
449 } 491 }
492 #endif
450 } 493 }
451#endif 494#endif
452 else 495 else
453 switch (t) 496 switch (t)
454 { 497 {
455 case '\t': 498 case '\t':
456 case ZERO_WIDTH_CHAR: 499 case ZERO_WIDTH_CHAR:
457 case NOCHAR: 500 case NOCHAR:
458 break; 501 break;
459 502
503 /*
504 * If the base font does not support variation selectors, treat them as ZWC.
505 * a point could be made to do this for all wcwidth == 0 characters, but I
506 * decided against that until more data is available.
507 */
508 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
509 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
510 break;
511
460 default: 512 default:
461 XDrawRectangle (disp, d, gc, x + 2, y + 2, 513 XDrawRectangle (disp, d, gc, x + 2, y + 2,
462 fwidth - 4, term->fheight - 4); 514 fwidth - 4, term->fheight - 4);
463 } 515 }
464 516
465 x += fwidth; 517 x += fwidth;
466 } 518 }
467} 519}
468 520
521struct rxvt_font_overflow : rxvt_font
522{
523 struct rxvt_fontset *fs;
524
525 rxvt_font_overflow (rxvt_fontset *fs)
526 : rxvt_font ()
527 {
528 this->fs = fs;
529 }
530
531 rxvt_fontprop properties ()
532 {
533 rxvt_fontprop p;
534
535 p.width = p.height = 1;
536 p.ascent = rxvt_fontprop::unset;
537 p.weight = rxvt_fontprop::medium;
538 p.slant = rxvt_fontprop::roman;
539
540 return p;
541 }
542
543 bool load (const rxvt_fontprop &prop, bool force_prop)
544 {
545 width = 1; height = 1;
546 ascent = 1; descent = 0;
547
548 set_name (strdup ("built-in rendition overflow font"));
549
550 return true;
551 }
552
553 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
554 {
555 return false;
556 }
557
558 void draw (rxvt_drawable &d, int x, int y,
559 const text_t *text, int len,
560 int fg, int bg)
561 {
562 while (len)
563 {
564 int fid = fs->find_font_idx (*text);
565 int w = 1;
566 while (w < len && text[w] == NOCHAR)
567 w++;
568 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
569 text += w;
570 len -= w;
571 x += term->fwidth * w;
572 }
573 }
574};
575
469///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
470 577
471struct rxvt_font_x11 : rxvt_font { 578struct rxvt_font_x11 : rxvt_font
579{
472 rxvt_font_x11 () { f = 0; } 580 rxvt_font_x11 () { f = 0; }
473 581
474 void clear (); 582 void clear ();
475 583
476 rxvt_fontprop properties (); 584 rxvt_fontprop properties ();
477 585
478 bool load (const rxvt_fontprop &prop); 586 bool load (const rxvt_fontprop &prop, bool force_prop);
479 587
480 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; 588 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
481 589
482 void draw (rxvt_drawable &d, int x, int y, 590 void draw (rxvt_drawable &d, int x, int y,
483 const text_t *text, int len, 591 const text_t *text, int len,
484 int fg, int bg); 592 int fg, int bg);
485 593
486 bool slow; // wether this is a proportional font or has other funny characteristics 594 bool slow; // whether this is a proportional font or has other funny characteristics
487 XFontStruct *f; 595 XFontStruct *f;
488 codeset cs;
489 bool enc2b, encm; 596 bool enc2b, encm;
490 597
491 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 598 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
492 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 599 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
493 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 600 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
494 bool set_properties (rxvt_fontprop &p, const char *name); 601 bool set_properties (rxvt_fontprop &p, const char *name);
495}; 602};
496 603
497char * 604char *
498rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 605rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
499{ 606{
500 unsigned long value; 607 unsigned long value;
501 608
502 if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value)) 609 if (XGetFontProperty (f, property, &value))
503 return XGetAtomName (term->display->display, value); 610 return XGetAtomName (term->dpy, value);
504 else 611 else
505 return rxvt_strdup (repl); 612 return repl ? strdup (repl) : 0;
506} 613}
507 614
508rxvt_fontprop 615rxvt_fontprop
509rxvt_font_x11::properties () 616rxvt_font_x11::properties ()
510{ 617{
… …
514} 621}
515 622
516bool 623bool
517rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 624rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
518{ 625{
519 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 626 p.width = width != rxvt_fontprop::unset ? width
627 : avgwidth ? (avgwidth + 1) / 10
628 : (height + 1) / 2;
520 p.height = height; 629 p.height = height;
521 p.ascent = rxvt_fontprop::unset; 630 p.ascent = rxvt_fontprop::unset;
522 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 631 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
523 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 632 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
524 633
… …
529rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 638rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
530{ 639{
531 unsigned long height; 640 unsigned long height;
532 641
533#if 0 642#if 0
534 if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height)) 643 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
535 return false; 644 return false;
536#else 645#else
537 height = f->ascent + f->descent; 646 height = f->ascent + f->descent;
538#endif 647#endif
539 648
540 unsigned long avgwidth; 649 unsigned long avgwidth;
541 if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth)) 650 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
542 avgwidth = 0; 651 avgwidth = 0;
543 652
544 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 653 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
545 char *slant = get_property (f, "SLANT", "r"); 654 char *slant = get_property (f, term->xa [XA_SLANT], "r");
546 655
547 set_properties (p, height, weight, slant, avgwidth); 656 set_properties (p, height, weight, slant, avgwidth);
548 657
549 free (weight); 658 free (weight);
550 free (slant); 659 free (slant);
… …
590 return false; 699 return false;
591} 700}
592 701
593// fix the size of scalable fonts 702// fix the size of scalable fonts
594static bool 703static bool
595replace_field (char *buf, const char *name, int index, const char old, const char *replace) 704replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
596{ 705{
597 int slashes = 0; 706 int slashes = 0;
598 const char *field, *end; 707 const char *field, *end;
599 708
600 for (const char *c = name; *c; c++) 709 for (const char *c = name; *c; c++)
… …
610 break; 719 break;
611 } 720 }
612 721
613 if (slashes >= 13 && (!old || *field == old)) 722 if (slashes >= 13 && (!old || *field == old))
614 { 723 {
615 // TODO: check for overflow in font-name 724 size_t len = field - name;
616 strncpy (buf, name, field - name); 725 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
617 buf += field - name; 726 memcpy (*ptr, name, len);
618 strcpy (buf, replace); 727 strcpy (*ptr + len, replace);
619 strcat (buf, end); 728 strcat (*ptr, end);
620 729
621 return true; 730 return true;
622 } 731 }
623 else 732 else
624 { 733 {
625 strcpy (buf, name); 734 *ptr = strdup (name);
626 735
627 return false; 736 return false;
628 } 737 }
629} 738}
630 739
631bool 740bool
632rxvt_font_x11::load (const rxvt_fontprop &prop) 741rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
633{ 742{
634 dTermDisplay; 743 dTermDisplay;
635 744
636 clear (); 745 clear ();
637 746
638 char field_str[64]; // enough for 128 bits 747 char field_str[64]; // enough for 128 bits
639 748
640 // first morph the font if required 749 // first morph the font if required
641 if (prop.weight != rxvt_fontprop::unset 750 if (force_prop)
642 || prop.slant != rxvt_fontprop::unset)
643 { 751 {
644 char fname[1024]; 752 char *fname;
645 753
646 if (name[0] != '-') 754 if (name[0] != '-')
647 { 755 {
648 f = XLoadQueryFont (disp, name); 756 f = XLoadQueryFont (disp, name);
649 757
650 if (!f) 758 if (!f)
651 return false; 759 return false;
652 760
653 char *new_name = get_property (f, "FONT", name); 761 char *new_name = get_property (f, XA_FONT, 0);
654 762
655 if (new_name) 763 if (new_name)
656 set_name (new_name); 764 set_name (new_name);
657 else 765 else
658 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 766 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
659 767
660 XFreeFont (disp, f); 768 XFreeFont (disp, f);
661 f = 0; 769 f = 0;
662 } 770 }
663 771
664 if (prop.weight != rxvt_fontprop::unset) 772 if (prop.weight != rxvt_fontprop::unset)
665 { 773 {
666 replace_field (fname, name, 2, 0, 774 replace_field (&fname, name, 2, 0,
667 prop.weight < rxvt_fontprop::bold 775 prop.weight < rxvt_fontprop::bold
668 ? "medium" : "bold"); 776 ? "medium" : "bold");
669 set_name (strdup (fname)); 777 set_name (fname);
670 } 778 }
671 779
672 if (prop.slant != rxvt_fontprop::unset) 780 if (prop.slant != rxvt_fontprop::unset)
673 { 781 {
674 replace_field (fname, name, 3, 0, 782 replace_field (&fname, name, 3, 0,
675 prop.slant < rxvt_fontprop::italic 783 prop.slant < rxvt_fontprop::italic
676 ? "r" : "i"); // TODO: handle "o"blique, too 784 ? "r" : "i"); // TODO: handle "o"blique, too
677 set_name (strdup (fname)); 785 set_name (fname);
678 } 786 }
679 } 787 }
680 788
681 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 789 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
682 ? 0 : prop.height); 790 ? 0 : prop.height);
… …
707 font_weight *fonts = new font_weight[count]; 815 font_weight *fonts = new font_weight[count];
708 816
709 for (int i = 0; i < count; i++) 817 for (int i = 0; i < count; i++)
710 { 818 {
711 rxvt_fontprop p; 819 rxvt_fontprop p;
712 char fname[1024]; 820 char *fname;
713 821
714 int diff = 0; 822 int diff = 0;
715 823
716 if (replace_field (fname, list[i], 6, '0', field_str)) 824 if (replace_field (&fname, list[i], 6, '0', field_str))
717 diff += 10; // slightly penalize scalable fonts 825 diff += 10; // slightly penalize scalable fonts
826 else
827 {
828 free (fname);
718 else if (replace_field (fname, list[i], 11, '0', "0")) 829 if (replace_field (&fname, list[i], 11, '0', "0"))
719 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 830 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
831 }
720 832
721 if (!set_properties (p, fname)) 833 if (!set_properties (p, fname)
834 // also weed out too large fonts
835 || (prop.height != rxvt_fontprop::unset
836 && p.height > prop.height))
837 {
838 free (fname);
722 continue; 839 continue;
723 840 }
724 if (prop.height != rxvt_fontprop::unset
725 && p.height > prop.height) // weed out too large fonts
726 continue;
727 841
728 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 842 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
729 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 843 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
730 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 844 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
731 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 845 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
732 846
733 fonts[i].name = strdup (fname); 847 fonts[i].name = fname;
734 fonts[i].diff = diff; 848 fonts[i].diff = diff;
735 } 849 }
736 850
737 XFreeFontNames (list); 851 XFreeFontNames (list);
738 852
739 // this loop only iterates when the guessed font-size is too small 853 // this loop only iterates when the guessed font-size is too small
740 for (;;) 854 for (;;)
741 { 855 {
742 font_weight *best = fonts + count - 1; 856 font_weight *best = fonts;
743 857
744 for (font_weight *w = best; w-- > fonts; ) 858 for (font_weight *w = fonts + 1; w < fonts + count; w++)
745 if (w->diff <= best->diff) 859 if (w->diff < best->diff)
746 best = w; 860 best = w;
747 861
748 if (!best->name 862 if (!best->name
749 || !(f = XLoadQueryFont (disp, best->name))) 863 || !(f = XLoadQueryFont (disp, best->name)))
750 break; 864 break;
… …
767 delete [] fonts; 881 delete [] fonts;
768 882
769 if (!f) 883 if (!f)
770 return false; 884 return false;
771 885
772 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 886 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
773 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 887 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
888
889 cs = CS_UNKNOWN;
774 890
775 if (registry && encoding) 891 if (registry && encoding)
776 { 892 {
777 char charset[64]; 893 char charset[64];
778 snprintf (charset, 64, "%s-%s", registry, encoding); 894 snprintf (charset, 64, "%s-%s", registry, encoding);
779 895
780 cs = codeset_from_name (charset); 896 cs = codeset_from_name (charset);
781 } 897
782 else 898 if (cs == CS_UNKNOWN)
899 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
783 { 900 }
901
902 free (registry);
903 free (encoding);
904
905 if (cs == CS_UNKNOWN)
906 {
784 const char *charset = get_property (f, "FONT", 0); 907 char *value = get_property (f, XA_FONT, 0);
908 const char *charset = value;
785 909
786 if (!charset) 910 if (!charset)
787 charset = name; 911 charset = name;
788 912
789 int count = 13; 913 int count = 13;
790 while (*charset) 914 while (*charset)
791 if (*charset++ == '-' && !--count) 915 if (*charset++ == '-' && !--count)
792 break; 916 break;
793 917
794 cs = codeset_from_name (charset); 918 cs = codeset_from_name (charset);
919 if (cs == CS_UNKNOWN)
920 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
921
922 free (value);
923 }
924
925 if (cs == CS_UNKNOWN)
795 } 926 {
796 927 clear ();
797 free (registry); 928 return false;
798 free (encoding); 929 }
799 930
800 if (cs == CS_UNICODE) 931 if (cs == CS_UNICODE)
801 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 932 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
802 933
803 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 934 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
804 enc2b = encm || f->max_char_or_byte2 > 255; 935 enc2b = encm || f->max_char_or_byte2 > 255;
805 936
806 slow = false; 937 slow = false;
807 938
808#if 1 // only used for slow detection, TODO optimize 939#if 1 // only used for slow detection, TODO optimize
809 if (f->min_bounds.width == f->max_bounds.width) 940 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
810 width = f->min_bounds.width;
811 else if (f->per_char == NULL)
812 width = f->max_bounds.width; 941 width = f->max_bounds.width;
813 else 942 else
814 { 943 {
815 slow = true; 944 slow = true;
816 945
817 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 946 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
818 947
819 if (encm) 948 if (encm)
820 N += (f->max_byte1 - f->min_byte1) 949 N += (f->max_byte1 - f->min_byte1)
821 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 950 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
822 951
823 while (N) 952 while (N)
824 { 953 {
825 if (f->per_char[N].width > width) 954 if (f->per_char[N].width > width)
826 width = f->per_char[N].width; 955 width = f->per_char[N].width;
827 956
… …
830 } 959 }
831#endif 960#endif
832 961
833 width = 1; 962 width = 1;
834 963
835 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 964 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
836 { 965 {
837 if (cs != CS_UNICODE
838 && *t > 0x100
839 && FROM_UNICODE (cs, *t) == NOCHAR) 966 if (FROM_UNICODE (cs, *t) == NOCHAR)
840 continue; 967 continue;
841 968
842 // ignore characters we wouldn't use anyways 969 // ignore characters we wouldn't use anyways
843 bool careful; 970 bool careful;
844 if (!has_char (*t, &prop, careful)) 971 if (!has_char (*t, &prop, careful))
845 continue; 972 continue;
846 973
847 XChar2b ch = { *t >> 8, *t }; 974 // the casts are needed in C++11 (see 8.5.1)
975 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
848 976
849 XCharStruct g; 977 XCharStruct g;
850 int dir_ret, asc_ret, des_ret; 978 int dir_ret, asc_ret, des_ret;
851 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 979 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
852 980
981 int wcw = WCWIDTH (*t);
853 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 982 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
854 983
855 if (width < g.width) width = g.width; 984 if (width < g.width) width = g.width;
856 }
857
858 if (cs == CS_UNKNOWN)
859 { 985 }
860 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
861 986
987#if 0 // do it per-character
988 if (prop && width > prop->width)
989 {
862 clear (); 990 clear ();
863 return false; 991 return false;
864 } 992 }
865
866#if 0 // do it per-character
867 if (prop && width > prop->width)
868 {
869 clear ();
870 return false;
871 }
872#endif 993#endif
873 994
874 return true; 995 return true;
875} 996}
876 997
877void 998void
878rxvt_font_x11::clear () 999rxvt_font_x11::clear ()
879{ 1000{
880 if (f) 1001 if (f)
881 { 1002 {
882 XFreeFont (term->display->display, f); 1003 XFreeFont (term->dpy, f);
883 f = 0; 1004 f = 0;
884 } 1005 }
885} 1006}
886 1007
887bool 1008bool
888rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1009rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
889{ 1010{
1011 careful = false;
1012
890 uint32_t ch = FROM_UNICODE (cs, unicode); 1013 uint32_t ch = FROM_UNICODE (cs, unicode);
891 1014
892 if (ch == NOCHAR) 1015 if (ch == NOCHAR)
893 return false; 1016 return false;
894 1017
895 /* check wether the character exists in _this_ font. horrible. */ 1018 /* check whether the character exists in _this_ font. horrible. */
896 XCharStruct *xcs; 1019 XCharStruct *xcs;
897 1020
898 if (encm) 1021 if (encm)
899 { 1022 {
900 unsigned char byte1 = ch >> 8; 1023 unsigned char byte1 = ch >> 8;
… …
930 return false; 1053 return false;
931 1054
932 if (!prop || prop->width == rxvt_fontprop::unset) 1055 if (!prop || prop->width == rxvt_fontprop::unset)
933 return true; 1056 return true;
934 1057
935 // check character against base font bounding box 1058 // check whether character overlaps previous/next character
936 int w = xcs->width; 1059 int w = xcs->rbearing - xcs->lbearing;
937 int wcw = wcwidth (unicode); 1060 int wcw = max (WCWIDTH (unicode), 1);
938 if (wcw > 0) w = (w + wcw - 1) / wcw;
939 1061
940 careful = w > prop->width; 1062 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
941 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1063
1064 if (careful && !OVERLAP_OK (w, wcw, prop))
942 return false; 1065 return false;
943 1066
944 return true; 1067 return true;
945} 1068}
946 1069
… …
957 dTermDisplay; 1080 dTermDisplay;
958 dTermGC; 1081 dTermGC;
959 1082
960 bool slow = this->slow 1083 bool slow = this->slow
961 || width != term->fwidth 1084 || width != term->fwidth
962 || height != term->fheight; 1085 || height != term->fheight
1086 || ascent != f->ascent;
963 1087
964 int base = ascent; // sorry, incorrect: term->fbase; 1088 int base = ascent; // sorry, incorrect: term->fbase;
965 1089
966 XGCValues v; 1090 XGCValues v;
967 v.foreground = term->pix_colors[fg]; 1091 v.foreground = term->pix_colors[fg];
… …
980 else 1104 else
981 { 1105 {
982 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1106 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
983 1107
984 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1108 XChangeGC (disp, gc, GCForeground | GCFont, &v);
985 1109
986 if (slow) 1110 if (slow)
987 { 1111 {
988 do 1112 do
989 { 1113 {
990 if (xc->byte1 || xc->byte2) 1114 if (xc->byte1 || xc->byte2)
… …
1012 else 1136 else
1013 { 1137 {
1014 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1138 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1015 1139
1016 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1140 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1017 1141
1018 if (slow) 1142 if (slow)
1019 { 1143 {
1020 do 1144 do
1021 { 1145 {
1022 if (*xc) 1146 if (*xc)
… …
1035 1159
1036///////////////////////////////////////////////////////////////////////////// 1160/////////////////////////////////////////////////////////////////////////////
1037 1161
1038#if XFT 1162#if XFT
1039 1163
1040struct rxvt_font_xft : rxvt_font { 1164struct rxvt_font_xft : rxvt_font
1165{
1041 rxvt_font_xft () { f = 0; } 1166 rxvt_font_xft ()
1167 {
1168 can_compose = true;
1169 f = 0;
1170 }
1042 1171
1043 void clear (); 1172 void clear ();
1044 1173
1045 rxvt_fontprop properties (); 1174 rxvt_fontprop properties ();
1046 1175
1047 bool load (const rxvt_fontprop &prop); 1176 bool load (const rxvt_fontprop &prop, bool force_prop);
1048 1177
1049 void draw (rxvt_drawable &d, int x, int y, 1178 void draw (rxvt_drawable &d, int x, int y,
1050 const text_t *text, int len, 1179 const text_t *text, int len,
1051 int fg, int bg); 1180 int fg, int bg);
1052 1181
1053 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1182 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1054 1183
1055protected: 1184protected:
1056 XftFont *f; 1185 XftFont *f;
1057}; 1186};
1058 1187
1059void 1188void
1060rxvt_font_xft::clear () 1189rxvt_font_xft::clear ()
1061{ 1190{
1062 if (f) 1191 if (f)
1063 { 1192 {
1064 XftFontClose (term->display->display, f); 1193 XftFontClose (term->dpy, f);
1065 f = 0; 1194 f = 0;
1066 } 1195 }
1067} 1196}
1068 1197
1069rxvt_fontprop 1198rxvt_fontprop
… …
1085 1214
1086 return p; 1215 return p;
1087} 1216}
1088 1217
1089bool 1218bool
1090rxvt_font_xft::load (const rxvt_fontprop &prop) 1219rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1091{ 1220{
1092 dTermDisplay; 1221 dTermDisplay;
1093 1222
1094 clear (); 1223 clear ();
1095 1224
… …
1104 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1233 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1105 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1234 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1106 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1235 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1107 1236
1108 if (prop.weight != rxvt_fontprop::unset 1237 if (prop.weight != rxvt_fontprop::unset
1109 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1238 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1110 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1239 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1111 1240
1112 if (prop.slant != rxvt_fontprop::unset 1241 if (prop.slant != rxvt_fontprop::unset
1113 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1242 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1114 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1243 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1115 1244
1116#if 0 // clipping unfortunately destroys our precious double-width-characters 1245#if 0 // clipping unfortunately destroys our precious double-width-characters
1117 // clip width, we can't do better, or can we? 1246 // clip width, we can't do better, or can we?
1118 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1247 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1119 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1248 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1120#endif 1249#endif
1121 1250
1122 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1251 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1123 FcPatternAddBool (p, FC_MINSPACE, 1); 1252 FcPatternAddBool (p, FC_MINSPACE, 1);
1124 1253
… …
1136 int ftheight = 0; 1265 int ftheight = 0;
1137 bool success = true; 1266 bool success = true;
1138 1267
1139 for (;;) 1268 for (;;)
1140 { 1269 {
1270 p = FcPatternDuplicate (match);
1141 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1271 f = XftFontOpenPattern (disp, p);
1142 1272
1143 if (!f) 1273 if (!f)
1144 { 1274 {
1275 FcPatternDestroy (p);
1145 success = false; 1276 success = false;
1146 break; 1277 break;
1147 } 1278 }
1148 1279
1149 FT_Face face = XftLockFace (f); 1280 FT_Face face = XftLockFace (f);
… …
1157 1288
1158 XftUnlockFace (f); 1289 XftUnlockFace (f);
1159 1290
1160 int glheight = height; 1291 int glheight = height;
1161 1292
1162 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1293 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1163 { 1294 {
1164 FcChar16 ch = *t; 1295 FcChar16 ch = *t;
1165 1296
1166 if (cs != CS_UNICODE 1297 if (cs != CS_UNICODE
1167 && ch > 0x100 1298 && ch > 0x100
… …
1176 XGlyphInfo g; 1307 XGlyphInfo g;
1177 XftTextExtents16 (disp, f, &ch, 1, &g); 1308 XftTextExtents16 (disp, f, &ch, 1, &g);
1178 1309
1179 g.width -= g.x; 1310 g.width -= g.x;
1180 1311
1181 int wcw = wcwidth (ch); 1312 int wcw = WCWIDTH (ch);
1182 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1313 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1183 1314
1184 if (width < g.width ) width = g.width; 1315 if (width < g.width ) width = g.width;
1185 if (height < g.height ) height = g.height; 1316 if (height < g.height ) height = g.height;
1186 if (glheight < g.height - g.y) glheight = g.height - g.y; 1317 if (glheight < g.height - g.y) glheight = g.height - g.y;
1187 } 1318 }
1188 1319
1189 if (!width) 1320 if (!width)
1190 { 1321 {
1191 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1322 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1192 1323 width = f->max_advance_width;
1193 XftFontClose (disp, f);
1194 f = 0;
1195
1196 success = false;
1197 break; 1324 break;
1198 } 1325 }
1199 1326
1200 if (prop.height == rxvt_fontprop::unset 1327 if (prop.height == rxvt_fontprop::unset
1201 || (height <= prop.height && glheight <= prop.height) 1328 || (height <= prop.height && glheight <= prop.height)
… …
1236bool 1363bool
1237rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1364rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1238{ 1365{
1239 careful = false; 1366 careful = false;
1240 1367
1368#if ENABLE_COMBINING && !UNICODE_3
1369 if (ecb_expect_false (IS_COMPOSE (unicode)))
1370 if (compose_char *cc = rxvt_composite[unicode])
1371 if (cc->c2 == NOCHAR)
1372 unicode = cc->c1;
1373#endif
1374
1241 if (!XftCharExists (term->display->display, f, unicode)) 1375 if (!XftCharExists (term->dpy, f, unicode))
1242 return false; 1376 return false;
1243 1377
1244 if (!prop || prop->width == rxvt_fontprop::unset) 1378 if (!prop || prop->width == rxvt_fontprop::unset)
1245 return true; 1379 return true;
1246 1380
1247 // check character against base font bounding box 1381 // check character against base font bounding box
1248 FcChar32 ch = unicode; 1382 FcChar32 ch = unicode;
1249 XGlyphInfo g; 1383 XGlyphInfo g;
1250 XftTextExtents32 (term->display->display, f, &ch, 1, &g); 1384 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1251 1385
1252 int w = g.width - g.x; 1386 int w = g.width - g.x;
1253 int wcw = wcwidth (unicode); 1387 int wcw = max (WCWIDTH (unicode), 1);
1254 if (wcw > 0) w = (w + wcw - 1) / wcw;
1255 1388
1256 careful = w > prop->width; 1389 careful = g.x > 0 || w > prop->width * wcw;
1257 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1390
1391 if (careful && !OVERLAP_OK (w, wcw, prop))
1392 return false;
1393
1394 // this weeds out _totally_ broken fonts, or glyphs
1395 if (!OVERLAP_OK (g.xOff, wcw, prop))
1258 return false; 1396 return false;
1259 1397
1260 return true; 1398 return true;
1261} 1399}
1262 1400
1263void 1401void
1264rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1402rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1265 const text_t *text, int len, 1403 const text_t *text, int len,
1266 int fg, int bg) 1404 int fg, int bg)
1267{ 1405{
1268 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1269
1270 XGlyphInfo extents; 1406 XGlyphInfo extents;
1271 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1407 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1272 XftGlyphSpec *ep = enc; 1408 XftGlyphSpec *ep = enc;
1273 1409
1274 dTermDisplay; 1410 dTermDisplay;
1275 dTermGC; 1411 dTermGC;
1412
1413 int w = term->fwidth * len;
1414 int h = term->fheight;
1415
1416 bool buffered = bg >= Color_transparent
1417 && term->option (Opt_buffered);
1276 1418
1277 // cut trailing spaces 1419 // cut trailing spaces
1278 while (len && text [len - 1] == ' ') 1420 while (len && text [len - 1] == ' ')
1279 len--; 1421 len--;
1280 1422
1423 int x_ = buffered ? 0 : x;
1424 int y_ = buffered ? 0 : y;
1425
1281 while (len) 1426 while (len)
1282 { 1427 {
1283 int cwidth = term->fwidth; 1428 int cwidth = term->fwidth;
1284 FcChar32 fc = *text++; len--; 1429 FcChar32 fc = *text++; len--;
1285 1430
1431#if ENABLE_COMBINING && !UNICODE_3
1432 if (ecb_expect_false (IS_COMPOSE (fc)))
1433 if (compose_char *cc = rxvt_composite[fc]) // should always be true, but better be safe than sorry
1434 fc = cc->c1; // c2 must be NOCHAR, as has_char handles it that way
1435#endif
1436
1286 while (len && *text == NOCHAR) 1437 while (len && *text == NOCHAR)
1287 text++, len--, cwidth += term->fwidth; 1438 text++, len--, cwidth += term->fwidth;
1288 1439
1289 if (fc != ' ') // skip spaces 1440 if (fc != ' ') // skip spaces
1290 { 1441 {
1291 FT_UInt glyph = XftCharIndex (disp, f, fc); 1442 FT_UInt glyph = XftCharIndex (disp, f, fc);
1292 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1443 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1293 1444
1294 ep->glyph = glyph; 1445 ep->glyph = glyph;
1295 ep->x = x + (cwidth - extents.xOff >> 1); 1446 ep->x = x_ + (cwidth - extents.xOff >> 1);
1296 ep->y = y + ascent; 1447 ep->y = y_ + ascent;
1448
1449 if (extents.xOff == 0)
1450 ep->x = x_ + cwidth;
1451
1297 ep++; 1452 ep++;
1298 } 1453 }
1299 1454
1300 x += cwidth; 1455 x_ += cwidth;
1456 }
1457
1458 if (buffered)
1301 } 1459 {
1302
1303 if (ep != enc) 1460 if (ep != enc)
1461 {
1462 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1463
1464#ifdef HAVE_IMG
1465 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1466
1467 if (term->bg_img
1468 && (bg == Color_transparent || bg == Color_bg
1469 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1470 {
1471 int src_x = x, src_y = y;
1472
1473 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1474 {
1475 src_x += term->window_vt_x;
1476 src_y += term->window_vt_y;
1477 }
1478
1479 if (term->bg_img->w >= src_x + w
1480 && term->bg_img->h >= src_y + h)
1481 {
1482 XCopyArea (disp, term->bg_img->pm, d2, gc,
1483 src_x, src_y, w, h, 0, 0);
1484 }
1485 else
1486 {
1487 XGCValues gcv;
1488
1489 gcv.fill_style = FillTiled;
1490 gcv.tile = term->bg_img->pm;
1491 gcv.ts_x_origin = -src_x;
1492 gcv.ts_y_origin = -src_y;
1493
1494 XChangeGC (disp, gc,
1495 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1496 &gcv);
1497
1498 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1499
1500 gcv.fill_style = FillSolid;
1501 XChangeGC (disp, gc, GCFillStyle, &gcv);
1502 }
1503
1504 if (dst)
1505 {
1506 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1507
1508 // dst can only be set when bg >= 0
1509 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1510 }
1511 }
1512 else
1513#endif
1514 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1515
1516 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1517 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1518 }
1519 else
1520 clear_rect (d, x, y, w, h, bg);
1521 }
1522 else
1523 {
1524 clear_rect (d, x, y, w, h, bg);
1304 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1525 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1526 }
1305} 1527}
1528
1306#endif 1529#endif
1307 1530
1308///////////////////////////////////////////////////////////////////////////// 1531/////////////////////////////////////////////////////////////////////////////
1309 1532
1310rxvt_fontset::rxvt_fontset (rxvt_term *term) 1533rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1321void 1544void
1322rxvt_fontset::clear () 1545rxvt_fontset::clear ()
1323{ 1546{
1324 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1547 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1325 = rxvt_fontprop::unset; 1548 = rxvt_fontprop::unset;
1549 force_prop = false;
1326 1550
1327 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1551 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1328 FONT_UNREF (*i); 1552 (*i)->unref ();
1329 1553
1330 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1554 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1331 delete *p; 1555 delete *p;
1332 1556
1333 free (fontdesc); fontdesc = 0; 1557 free (fontdesc); fontdesc = 0;
… …
1335 fonts.clear (); 1559 fonts.clear ();
1336 1560
1337 fallback = fallback_fonts; 1561 fallback = fallback_fonts;
1338} 1562}
1339 1563
1564void
1565rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1566{
1567 font->set_term (term);
1568
1569 font->cs = cs;
1570 font->loaded = false;
1571}
1572
1340rxvt_font * 1573rxvt_font *
1341rxvt_fontset::new_font (const char *name, codeset cs) 1574rxvt_fontset::new_font (const char *name, codeset cs)
1342{ 1575{
1343 rxvt_font *f; 1576 rxvt_font *f;
1344 1577
1345 if (!name || !*name) 1578 if (!name || !*name)
1346 { 1579 {
1347 name = ""; 1580 name = "";
1348 f = new rxvt_font_default (this); 1581 f = new rxvt_font_default (this);
1349 } 1582 }
… …
1360 f = new rxvt_font_x11; 1593 f = new rxvt_font_x11;
1361 } 1594 }
1362 else 1595 else
1363 f = new rxvt_font_x11; 1596 f = new rxvt_font_x11;
1364 1597
1365 f->set_term (term);
1366 f->set_name (strdup (name)); 1598 f->set_name (strdup (name));
1367 1599 prepare_font (f, cs);
1368 f->cs = cs;
1369 f->loaded = false;
1370 1600
1371 return f; 1601 return f;
1372} 1602}
1373 1603
1374///////////////////////////////////////////////////////////////////////////// 1604/////////////////////////////////////////////////////////////////////////////
1605
1606void
1607rxvt_fontset::push_font (rxvt_font *font)
1608{
1609 // the fontCount index is reserved for the overflow font, it is only
1610 // necessary when we get fontCount or more fonts, as they cannot be
1611 // represented in the rendition.
1612 if (fonts.size () == fontCount)
1613 {
1614 rxvt_font *f = new rxvt_font_overflow (this);
1615
1616 prepare_font (f, CS_UNICODE);
1617 fonts.push_back (f);
1618 }
1619
1620 fonts.push_back (font);
1621}
1375 1622
1376void 1623void
1377rxvt_fontset::add_fonts (const char *desc) 1624rxvt_fontset::add_fonts (const char *desc)
1378{ 1625{
1379 if (desc) 1626 if (desc)
… …
1408 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1655 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1409 else 1656 else
1410 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1657 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1411 1658
1412 desc++; 1659 desc++;
1413 while (*desc <= ' ') desc++; 1660 while (*desc <= ' ' && *desc) desc++;
1414 } 1661 }
1415 1662
1416 end = strchr (desc, ','); 1663 end = strchr (desc, ',');
1417 if (!end) 1664 if (!end)
1418 end = desc + strlen (desc); 1665 end = desc + strlen (desc);
1419 1666
1420 if (end - desc < 511) 1667 if (end - desc < 511)
1421 { 1668 {
1422 strncpy (buf, desc, end - desc); 1669 memcpy (buf, desc, end - desc);
1423 buf[end - desc] = 0; 1670 buf[end - desc] = 0;
1424 1671
1425 fonts.push_back (new_font (buf, cs)); 1672 push_font (new_font (buf, cs));
1426 } 1673 }
1427 else 1674 else
1428 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1675 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1429 1676
1430 desc = end + 1; 1677 desc = end + 1;
1431 } 1678 }
1432 while (*end); 1679 while (*end);
1433 } 1680 }
… …
1442 if (fonts[i]->loaded) 1689 if (fonts[i]->loaded)
1443 return true; 1690 return true;
1444 1691
1445 fonts[i]->loaded = true; 1692 fonts[i]->loaded = true;
1446 1693
1447 if (!fonts[i]->load (prop)) 1694 if (!fonts[i]->load (prop, force_prop))
1448 { 1695 {
1449 fonts[i]->cs = CS_UNKNOWN; 1696 fonts[i]->cs = CS_UNKNOWN;
1450 return false; 1697 return false;
1451 } 1698 }
1452 1699
… …
1458{ 1705{
1459 clear (); 1706 clear ();
1460 1707
1461 fontdesc = strdup (desc); 1708 fontdesc = strdup (desc);
1462 1709
1463 fonts.push_back (new_font (0, CS_UNICODE)); 1710 push_font (new_font (0, CS_UNICODE));
1464 realize_font (0); 1711 realize_font (0);
1465 1712
1466 add_fonts (desc); 1713 add_fonts (desc);
1467 1714
1468 return true; 1715 return true;
… …
1477 1724
1478 return -1; 1725 return -1;
1479} 1726}
1480 1727
1481int 1728int
1482rxvt_fontset::find_font (unicode_t unicode) 1729rxvt_fontset::find_font_idx (unicode_t unicode)
1483{ 1730{
1484 if (unicode >= 1<<20) 1731 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1732 if (unicode > 0x1fffff)
1485 return 0; 1733 return 0;
1486 1734
1487 unicode_t hi = unicode >> 8; 1735 unicode_t hi = unicode >> 8;
1488 1736
1489 if (hi < fmap.size () 1737 if (hi < fmap.size ())
1490 && fmap[hi] 1738 if (pagemap *pm = fmap[hi])
1491 && (*fmap[hi])[unicode & 0xff] != 0xff) 1739 if ((*pm)[unicode & 0xff] != 0xff)
1492 return (*fmap[hi])[unicode & 0xff]; 1740 return (*pm)[unicode & 0xff];
1493 1741
1494 unsigned int i; 1742 unsigned int i;
1495 1743
1496 for (i = 0; i < fonts.size (); i++) 1744 for (i = 0; i < fonts.size (); i++)
1497 { 1745 {
… …
1513 goto next_font; 1761 goto next_font;
1514 1762
1515 bool careful; 1763 bool careful;
1516 if (f->has_char (unicode, &prop, careful)) 1764 if (f->has_char (unicode, &prop, careful))
1517 { 1765 {
1518 if (careful) 1766 i = (i << 1) | careful;
1519 i |= 128;
1520 1767
1521 goto found; 1768 goto found;
1522 } 1769 }
1523 1770
1524 next_font: 1771 next_font:
1525 if (i == fonts.size () - 1) 1772 if (i == fonts.size () - 1)
1526 { 1773 {
1774 // compose characters are handled by the default font, unless another font takes over
1775 // we do not go via the fallback list for speed reasons.
1776 if (IS_COMPOSE (unicode))
1777 return 0;
1778
1527 if (fallback->name) 1779 if (fallback->name)
1528 { 1780 {
1529 // search through the fallback list 1781 // search through the fallback list
1530 fonts.push_back (new_font (fallback->name, fallback->cs)); 1782 push_font (new_font (fallback->name, fallback->cs));
1531 fallback++; 1783 fallback++;
1532 } 1784 }
1533 else 1785 else
1534 { 1786 {
1535 // try to find a new font. 1787 // try to find a new font.
… …
1537 // way to configure this and xft is easier to hack in, 1789 // way to configure this and xft is easier to hack in,
1538 // while x11 has more framework in place already. 1790 // while x11 has more framework in place already.
1539 // TODO: this is a real resource hog, xft takes ages(?) 1791 // TODO: this is a real resource hog, xft takes ages(?)
1540#if XFT && USE_SLOW_LOOKUP 1792#if XFT && USE_SLOW_LOOKUP
1541 // grab the first xft font that seems suitable 1793 // grab the first xft font that seems suitable
1794 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1542 FcPattern *p = FcPatternCreate (); 1795 FcPattern *p = FcPatternCreate ();
1543 1796
1544 FcCharSet *s = FcCharSetCreate (); 1797 FcCharSet *s = FcCharSetCreate ();
1545 FcCharSetAddChar (s, unicode); 1798 FcCharSetAddChar (s, unicode);
1546 FcPatternAddCharSet (p, FC_CHARSET, s); 1799 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1553 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1806 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1554 FcPatternAddBool (p, FC_MINSPACE, 1); 1807 FcPatternAddBool (p, FC_MINSPACE, 1);
1555 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1808 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1556 1809
1557 XftResult result; 1810 XftResult result;
1558 FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result); 1811 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1559 1812
1560 FcPatternDestroy (p); 1813 FcPatternDestroy (p);
1561 1814
1562 if (match) 1815 if (match)
1563 { 1816 {
… …
1566 FcPatternDestroy (match); 1819 FcPatternDestroy (match);
1567 1820
1568 if (find_font (font) < 0) 1821 if (find_font (font) < 0)
1569 { 1822 {
1570 char fontname[4096]; 1823 char fontname[4096];
1571 sprintf (fontname, "xft:%-.4090s", font); 1824 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1572 1825
1573 fonts.push_back (new_font (fontname, CS_UNICODE)); 1826 push_font (new_font (fontname, CS_UNICODE));
1574 } 1827 }
1575 1828
1576 free (font); 1829 free (font);
1577 } 1830 }
1578#endif 1831#endif
… …
1590 while (hi >= fmap.size ()) 1843 while (hi >= fmap.size ())
1591 fmap.push_back (0); 1844 fmap.push_back (0);
1592 1845
1593 if (!fmap[hi]) 1846 if (!fmap[hi])
1594 { 1847 {
1595 fmap[hi] = (pagemap *)new pagemap; 1848 fmap[hi] = new pagemap;
1596 memset (fmap[hi], 0xff, sizeof (pagemap)); 1849 memset (fmap[hi], 0xff, sizeof (pagemap));
1597 } 1850 }
1598 1851
1599 (*fmap[hi])[unicode & 0xff] = i; 1852 (*fmap[hi])[unicode & 0xff] = i;
1600 } 1853 }
1601 1854
1602 return i; 1855 return i;
1603} 1856}
1604 1857
1605
1606

Diff Legend

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