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

Diff Legend

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