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.88 by root, Wed Jan 25 21:09:21 2006 UTC vs.
Revision 1.204 by root, Thu Jun 17 11:45:19 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->xdisp 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 (screen->xdisp, drawable, screen->visual, screen->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), can_compose(false)
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
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
437 text_t chrs[2]; 473 text_t chrs[2];
438 width = min (2, width);
439 chrs [1] = NOCHAR; 474 chrs [1] = NOCHAR;
440 475
441 *chrs = cc->c1; 476 *chrs = cc->c1;
442 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 477 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
443 f1->draw (d, x, y, chrs, width, fg, bg); 478 f1->draw (d, x, y, chrs, width, fg, bg);
444 479
445 if (cc->c2 != NOCHAR) 480 if (cc->c2 != NOCHAR)
446 { 481 {
447 bool careful; 482 bool careful;
448 483
449 // prefer font of first character, for no good reasons 484 // prefer font of first character, for no good reasons
450 *chrs = cc->c2; 485 *chrs = cc->c2;
451 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 486 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
452 ? f1 487 ? f1
453 : (*fs)[fs->find_font (cc->c2)]; 488 : (*fs)[fs->find_font_idx (cc->c2)];
454 489
455 f2->draw (d, x, y, chrs, width, fg, -1); 490 f2->draw (d, x, y, chrs, width, fg, Color_none);
456 } 491 }
492 #endif
457 } 493 }
458#endif 494#endif
459 else 495 else
460 switch (t) 496 switch (t)
461 { 497 {
462 case '\t': 498 case '\t':
463 case ZERO_WIDTH_CHAR: 499 case ZERO_WIDTH_CHAR:
464 case NOCHAR: 500 case NOCHAR:
465 break; 501 break;
466 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
467 default: 512 default:
468 XDrawRectangle (disp, d, gc, x + 2, y + 2, 513 XDrawRectangle (disp, d, gc, x + 2, y + 2,
469 fwidth - 4, term->fheight - 4); 514 fwidth - 4, term->fheight - 4);
470 } 515 }
471 516
472 x += fwidth; 517 x += fwidth;
473 } 518 }
474} 519}
475 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
476///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
477 577
478struct rxvt_font_x11 : rxvt_font { 578struct rxvt_font_x11 : rxvt_font
579{
479 rxvt_font_x11 () { f = 0; } 580 rxvt_font_x11 () { f = 0; }
480 581
481 void clear (); 582 void clear ();
482 583
483 rxvt_fontprop properties (); 584 rxvt_fontprop properties ();
484 585
485 bool load (const rxvt_fontprop &prop); 586 bool load (const rxvt_fontprop &prop, bool force_prop);
486 587
487 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;
488 589
489 void draw (rxvt_drawable &d, int x, int y, 590 void draw (rxvt_drawable &d, int x, int y,
490 const text_t *text, int len, 591 const text_t *text, int len,
491 int fg, int bg); 592 int fg, int bg);
492 593
493 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
494 XFontStruct *f; 595 XFontStruct *f;
495 codeset cs;
496 bool enc2b, encm; 596 bool enc2b, encm;
497 597
498 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 598 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); 599 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); 600 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
501 bool set_properties (rxvt_fontprop &p, const char *name); 601 bool set_properties (rxvt_fontprop &p, const char *name);
502}; 602};
503 603
504char * 604char *
505rxvt_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
506{ 606{
507 unsigned long value; 607 unsigned long value;
508 608
509 if (XGetFontProperty (f, XInternAtom (term->xdisp, property, 0), &value)) 609 if (XGetFontProperty (f, property, &value))
510 return XGetAtomName (term->xdisp, value); 610 return XGetAtomName (term->dpy, value);
511 else 611 else
512 return rxvt_strdup (repl); 612 return repl ? strdup (repl) : 0;
513} 613}
514 614
515rxvt_fontprop 615rxvt_fontprop
516rxvt_font_x11::properties () 616rxvt_font_x11::properties ()
517{ 617{
… …
521} 621}
522 622
523bool 623bool
524rxvt_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)
525{ 625{
526 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;
527 p.height = height; 629 p.height = height;
528 p.ascent = rxvt_fontprop::unset; 630 p.ascent = rxvt_fontprop::unset;
529 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;
530 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;
531 633
… …
536rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 638rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
537{ 639{
538 unsigned long height; 640 unsigned long height;
539 641
540#if 0 642#if 0
541 if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height)) 643 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
542 return false; 644 return false;
543#else 645#else
544 height = f->ascent + f->descent; 646 height = f->ascent + f->descent;
545#endif 647#endif
546 648
547 unsigned long avgwidth; 649 unsigned long avgwidth;
548 if (!XGetFontProperty (f, XInternAtom (term->xdisp, "AVERAGE_WIDTH", 0), &avgwidth)) 650 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
549 avgwidth = 0; 651 avgwidth = 0;
550 652
551 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 653 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
552 char *slant = get_property (f, "SLANT", "r"); 654 char *slant = get_property (f, term->xa [XA_SLANT], "r");
553 655
554 set_properties (p, height, weight, slant, avgwidth); 656 set_properties (p, height, weight, slant, avgwidth);
555 657
556 free (weight); 658 free (weight);
557 free (slant); 659 free (slant);
… …
597 return false; 699 return false;
598} 700}
599 701
600// fix the size of scalable fonts 702// fix the size of scalable fonts
601static bool 703static bool
602replace_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)
603{ 705{
604 int slashes = 0; 706 int slashes = 0;
605 const char *field, *end; 707 const char *field, *end;
606 708
607 for (const char *c = name; *c; c++) 709 for (const char *c = name; *c; c++)
… …
617 break; 719 break;
618 } 720 }
619 721
620 if (slashes >= 13 && (!old || *field == old)) 722 if (slashes >= 13 && (!old || *field == old))
621 { 723 {
622 // TODO: check for overflow in font-name 724 size_t len = field - name;
623 strncpy (buf, name, field - name); 725 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
624 buf += field - name; 726 memcpy (*ptr, name, len);
625 strcpy (buf, replace); 727 strcpy (*ptr + len, replace);
626 strcat (buf, end); 728 strcat (*ptr, end);
627 729
628 return true; 730 return true;
629 } 731 }
630 else 732 else
631 { 733 {
632 strcpy (buf, name); 734 *ptr = strdup (name);
633 735
634 return false; 736 return false;
635 } 737 }
636} 738}
637 739
638bool 740bool
639rxvt_font_x11::load (const rxvt_fontprop &prop) 741rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
640{ 742{
641 dTermDisplay; 743 dTermDisplay;
642 744
643 clear (); 745 clear ();
644 746
645 char field_str[64]; // enough for 128 bits 747 char field_str[64]; // enough for 128 bits
646 748
647 // first morph the font if required 749 // first morph the font if required
648 if (prop.weight != rxvt_fontprop::unset 750 if (force_prop)
649 || prop.slant != rxvt_fontprop::unset)
650 { 751 {
651 char fname[1024]; 752 char *fname;
652 753
653 if (name[0] != '-') 754 if (name[0] != '-')
654 { 755 {
655 f = XLoadQueryFont (disp, name); 756 f = XLoadQueryFont (disp, name);
656 757
657 if (!f) 758 if (!f)
658 return false; 759 return false;
659 760
660 char *new_name = get_property (f, "FONT", name); 761 char *new_name = get_property (f, XA_FONT, 0);
661 762
662 if (new_name) 763 if (new_name)
663 set_name (new_name); 764 set_name (new_name);
664 else 765 else
665 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 766 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
666 767
667 XFreeFont (disp, f); 768 XFreeFont (disp, f);
668 f = 0; 769 f = 0;
669 } 770 }
670 771
671 if (prop.weight != rxvt_fontprop::unset) 772 if (prop.weight != rxvt_fontprop::unset)
672 { 773 {
673 replace_field (fname, name, 2, 0, 774 replace_field (&fname, name, 2, 0,
674 prop.weight < rxvt_fontprop::bold 775 prop.weight < rxvt_fontprop::bold
675 ? "medium" : "bold"); 776 ? "medium" : "bold");
676 set_name (strdup (fname)); 777 set_name (fname);
677 } 778 }
678 779
679 if (prop.slant != rxvt_fontprop::unset) 780 if (prop.slant != rxvt_fontprop::unset)
680 { 781 {
681 replace_field (fname, name, 3, 0, 782 replace_field (&fname, name, 3, 0,
682 prop.slant < rxvt_fontprop::italic 783 prop.slant < rxvt_fontprop::italic
683 ? "r" : "i"); // TODO: handle "o"blique, too 784 ? "r" : "i"); // TODO: handle "o"blique, too
684 set_name (strdup (fname)); 785 set_name (fname);
685 } 786 }
686 } 787 }
687 788
688 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 789 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
689 ? 0 : prop.height); 790 ? 0 : prop.height);
… …
714 font_weight *fonts = new font_weight[count]; 815 font_weight *fonts = new font_weight[count];
715 816
716 for (int i = 0; i < count; i++) 817 for (int i = 0; i < count; i++)
717 { 818 {
718 rxvt_fontprop p; 819 rxvt_fontprop p;
719 char fname[1024]; 820 char *fname;
720 821
721 int diff = 0; 822 int diff = 0;
722 823
723 if (replace_field (fname, list[i], 6, '0', field_str)) 824 if (replace_field (&fname, list[i], 6, '0', field_str))
724 diff += 10; // slightly penalize scalable fonts 825 diff += 10; // slightly penalize scalable fonts
826 else
827 {
828 free (fname);
725 else if (replace_field (fname, list[i], 11, '0', "0")) 829 if (replace_field (&fname, list[i], 11, '0', "0"))
726 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 830 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
831 }
727 832
728 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);
729 continue; 839 continue;
730 840 }
731 if (prop.height != rxvt_fontprop::unset
732 && p.height > prop.height) // weed out too large fonts
733 continue;
734 841
735 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;
736 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);
737 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);
738 //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);
739 846
740 fonts[i].name = strdup (fname); 847 fonts[i].name = fname;
741 fonts[i].diff = diff; 848 fonts[i].diff = diff;
742 } 849 }
743 850
744 XFreeFontNames (list); 851 XFreeFontNames (list);
745 852
746 // 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
747 for (;;) 854 for (;;)
748 { 855 {
749 font_weight *best = fonts + count - 1; 856 font_weight *best = fonts;
750 857
751 for (font_weight *w = best; w-- > fonts; ) 858 for (font_weight *w = fonts + 1; w < fonts + count; w++)
752 if (w->diff <= best->diff) 859 if (w->diff < best->diff)
753 best = w; 860 best = w;
754 861
755 if (!best->name 862 if (!best->name
756 || !(f = XLoadQueryFont (disp, best->name))) 863 || !(f = XLoadQueryFont (disp, best->name)))
757 break; 864 break;
… …
774 delete [] fonts; 881 delete [] fonts;
775 882
776 if (!f) 883 if (!f)
777 return false; 884 return false;
778 885
779 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 886 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
780 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;
781 890
782 if (registry && encoding) 891 if (registry && encoding)
783 { 892 {
784 char charset[64]; 893 char charset[64];
785 snprintf (charset, 64, "%s-%s", registry, encoding); 894 snprintf (charset, 64, "%s-%s", registry, encoding);
786 895
787 cs = codeset_from_name (charset); 896 cs = codeset_from_name (charset);
788 } 897
789 else 898 if (cs == CS_UNKNOWN)
899 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
790 { 900 }
901
902 free (registry);
903 free (encoding);
904
905 if (cs == CS_UNKNOWN)
906 {
791 const char *charset = get_property (f, "FONT", 0); 907 char *value = get_property (f, XA_FONT, 0);
908 const char *charset = value;
792 909
793 if (!charset) 910 if (!charset)
794 charset = name; 911 charset = name;
795 912
796 int count = 13; 913 int count = 13;
797 while (*charset) 914 while (*charset)
798 if (*charset++ == '-' && !--count) 915 if (*charset++ == '-' && !--count)
799 break; 916 break;
800 917
801 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)
802 } 926 {
803 927 clear ();
804 free (registry); 928 return false;
805 free (encoding); 929 }
806 930
807 if (cs == CS_UNICODE) 931 if (cs == CS_UNICODE)
808 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
809 933
810 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 934 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
811 enc2b = encm || f->max_char_or_byte2 > 255; 935 enc2b = encm || f->max_char_or_byte2 > 255;
812 936
813 slow = false; 937 slow = false;
814 938
815#if 1 // only used for slow detection, TODO optimize 939#if 1 // only used for slow detection, TODO optimize
816 if (f->min_bounds.width == f->max_bounds.width) 940 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; 941 width = f->max_bounds.width;
820 else 942 else
821 { 943 {
822 slow = true; 944 slow = true;
823 945
824 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;
825 947
826 if (encm) 948 if (encm)
827 N += (f->max_byte1 - f->min_byte1) 949 N += (f->max_byte1 - f->min_byte1)
828 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 950 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
829 951
830 while (N) 952 while (N)
831 { 953 {
832 if (f->per_char[N].width > width) 954 if (f->per_char[N].width > width)
833 width = f->per_char[N].width; 955 width = f->per_char[N].width;
834 956
… …
837 } 959 }
838#endif 960#endif
839 961
840 width = 1; 962 width = 1;
841 963
842 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++)
843 { 965 {
844 if (cs != CS_UNICODE
845 && *t > 0x100
846 && FROM_UNICODE (cs, *t) == NOCHAR) 966 if (FROM_UNICODE (cs, *t) == NOCHAR)
847 continue; 967 continue;
848 968
849 // ignore characters we wouldn't use anyways 969 // ignore characters we wouldn't use anyways
850 bool careful; 970 bool careful;
851 if (!has_char (*t, &prop, careful)) 971 if (!has_char (*t, &prop, careful))
852 continue; 972 continue;
853 973
854 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 };
855 976
856 XCharStruct g; 977 XCharStruct g;
857 int dir_ret, asc_ret, des_ret; 978 int dir_ret, asc_ret, des_ret;
858 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 979 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
859 980
981 int wcw = WCWIDTH (*t);
860 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;
861 983
862 if (width < g.width) width = g.width; 984 if (width < g.width) width = g.width;
863 }
864
865 if (cs == CS_UNKNOWN)
866 { 985 }
867 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
868 986
987#if 0 // do it per-character
988 if (prop && width > prop->width)
989 {
869 clear (); 990 clear ();
870 return false; 991 return false;
871 } 992 }
872
873#if 0 // do it per-character
874 if (prop && width > prop->width)
875 {
876 clear ();
877 return false;
878 }
879#endif 993#endif
880 994
881 return true; 995 return true;
882} 996}
883 997
884void 998void
885rxvt_font_x11::clear () 999rxvt_font_x11::clear ()
886{ 1000{
887 if (f) 1001 if (f)
888 { 1002 {
889 XFreeFont (term->xdisp, f); 1003 XFreeFont (term->dpy, f);
890 f = 0; 1004 f = 0;
891 } 1005 }
892} 1006}
893 1007
894bool 1008bool
895rxvt_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
896{ 1010{
1011 careful = false;
1012
897 uint32_t ch = FROM_UNICODE (cs, unicode); 1013 uint32_t ch = FROM_UNICODE (cs, unicode);
898 1014
899 if (ch == NOCHAR) 1015 if (ch == NOCHAR)
900 return false; 1016 return false;
901 1017
902 /* check wether the character exists in _this_ font. horrible. */ 1018 /* check whether the character exists in _this_ font. horrible. */
903 XCharStruct *xcs; 1019 XCharStruct *xcs;
904 1020
905 if (encm) 1021 if (encm)
906 { 1022 {
907 unsigned char byte1 = ch >> 8; 1023 unsigned char byte1 = ch >> 8;
… …
937 return false; 1053 return false;
938 1054
939 if (!prop || prop->width == rxvt_fontprop::unset) 1055 if (!prop || prop->width == rxvt_fontprop::unset)
940 return true; 1056 return true;
941 1057
942 // check character against base font bounding box 1058 // check whether character overlaps previous/next character
943 int w = xcs->rbearing - xcs->lbearing; 1059 int w = xcs->rbearing - xcs->lbearing;
944 int wcw = WCWIDTH (unicode); 1060 int wcw = max (WCWIDTH (unicode), 1);
945 if (wcw > 0) w = (w + wcw - 1) / wcw;
946 1061
947 careful = w > prop->width; 1062 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
1063
948 if (careful && OVERLAP_OK (w, prop)) 1064 if (careful && !OVERLAP_OK (w, wcw, prop))
949 return false; 1065 return false;
950 1066
951 return true; 1067 return true;
952} 1068}
953 1069
… …
964 dTermDisplay; 1080 dTermDisplay;
965 dTermGC; 1081 dTermGC;
966 1082
967 bool slow = this->slow 1083 bool slow = this->slow
968 || width != term->fwidth 1084 || width != term->fwidth
969 || height != term->fheight; 1085 || height != term->fheight
1086 || ascent != f->ascent;
970 1087
971 int base = ascent; // sorry, incorrect: term->fbase; 1088 int base = ascent; // sorry, incorrect: term->fbase;
972 1089
973 XGCValues v; 1090 XGCValues v;
974 v.foreground = term->pix_colors[fg]; 1091 v.foreground = term->pix_colors[fg];
… …
987 else 1104 else
988 { 1105 {
989 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1106 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
990 1107
991 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1108 XChangeGC (disp, gc, GCForeground | GCFont, &v);
992 1109
993 if (slow) 1110 if (slow)
994 { 1111 {
995 do 1112 do
996 { 1113 {
997 if (xc->byte1 || xc->byte2) 1114 if (xc->byte1 || xc->byte2)
… …
1019 else 1136 else
1020 { 1137 {
1021 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1138 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1022 1139
1023 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1140 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1024 1141
1025 if (slow) 1142 if (slow)
1026 { 1143 {
1027 do 1144 do
1028 { 1145 {
1029 if (*xc) 1146 if (*xc)
… …
1042 1159
1043///////////////////////////////////////////////////////////////////////////// 1160/////////////////////////////////////////////////////////////////////////////
1044 1161
1045#if XFT 1162#if XFT
1046 1163
1047struct rxvt_font_xft : rxvt_font { 1164struct rxvt_font_xft : rxvt_font
1165{
1048 rxvt_font_xft () { f = 0; } 1166 rxvt_font_xft ()
1167 {
1168 can_compose = true;
1169 f = 0;
1170 }
1049 1171
1050 void clear (); 1172 void clear ();
1051 1173
1052 rxvt_fontprop properties (); 1174 rxvt_fontprop properties ();
1053 1175
1054 bool load (const rxvt_fontprop &prop); 1176 bool load (const rxvt_fontprop &prop, bool force_prop);
1055 1177
1056 void draw (rxvt_drawable &d, int x, int y, 1178 void draw (rxvt_drawable &d, int x, int y,
1057 const text_t *text, int len, 1179 const text_t *text, int len,
1058 int fg, int bg); 1180 int fg, int bg);
1059 1181
1060 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;
1061 1183
1062protected: 1184protected:
1063 XftFont *f; 1185 XftFont *f;
1064}; 1186};
1065 1187
1066void 1188void
1067rxvt_font_xft::clear () 1189rxvt_font_xft::clear ()
1068{ 1190{
1069 if (f) 1191 if (f)
1070 { 1192 {
1071 XftFontClose (term->xdisp, f); 1193 XftFontClose (term->dpy, f);
1072 f = 0; 1194 f = 0;
1073 } 1195 }
1074} 1196}
1075 1197
1076rxvt_fontprop 1198rxvt_fontprop
… …
1092 1214
1093 return p; 1215 return p;
1094} 1216}
1095 1217
1096bool 1218bool
1097rxvt_font_xft::load (const rxvt_fontprop &prop) 1219rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1098{ 1220{
1099 dTermDisplay; 1221 dTermDisplay;
1100 1222
1101 clear (); 1223 clear ();
1102 1224
… …
1111 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1233 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1112 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1234 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1113 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1235 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1114 1236
1115 if (prop.weight != rxvt_fontprop::unset 1237 if (prop.weight != rxvt_fontprop::unset
1116 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1238 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1117 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1239 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1118 1240
1119 if (prop.slant != rxvt_fontprop::unset 1241 if (prop.slant != rxvt_fontprop::unset
1120 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1242 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1121 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1243 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1122 1244
1123#if 0 // clipping unfortunately destroys our precious double-width-characters 1245#if 0 // clipping unfortunately destroys our precious double-width-characters
1124 // clip width, we can't do better, or can we? 1246 // clip width, we can't do better, or can we?
1125 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1247 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1126 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1248 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1127#endif 1249#endif
1128 1250
1129 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1251 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1130 FcPatternAddBool (p, FC_MINSPACE, 1); 1252 FcPatternAddBool (p, FC_MINSPACE, 1);
1131 1253
… …
1143 int ftheight = 0; 1265 int ftheight = 0;
1144 bool success = true; 1266 bool success = true;
1145 1267
1146 for (;;) 1268 for (;;)
1147 { 1269 {
1270 p = FcPatternDuplicate (match);
1148 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1271 f = XftFontOpenPattern (disp, p);
1149 1272
1150 if (!f) 1273 if (!f)
1151 { 1274 {
1275 FcPatternDestroy (p);
1152 success = false; 1276 success = false;
1153 break; 1277 break;
1154 } 1278 }
1155 1279
1156 FT_Face face = XftLockFace (f); 1280 FT_Face face = XftLockFace (f);
… …
1164 1288
1165 XftUnlockFace (f); 1289 XftUnlockFace (f);
1166 1290
1167 int glheight = height; 1291 int glheight = height;
1168 1292
1169 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++)
1170 { 1294 {
1171 FcChar16 ch = *t; 1295 FcChar16 ch = *t;
1172 1296
1173 if (cs != CS_UNICODE 1297 if (cs != CS_UNICODE
1174 && ch > 0x100 1298 && ch > 0x100
… …
1193 if (glheight < g.height - g.y) glheight = g.height - g.y; 1317 if (glheight < g.height - g.y) glheight = g.height - g.y;
1194 } 1318 }
1195 1319
1196 if (!width) 1320 if (!width)
1197 { 1321 {
1198 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);
1199 1323 width = f->max_advance_width;
1200 XftFontClose (disp, f);
1201 f = 0;
1202
1203 success = false;
1204 break; 1324 break;
1205 } 1325 }
1206 1326
1207 if (prop.height == rxvt_fontprop::unset 1327 if (prop.height == rxvt_fontprop::unset
1208 || (height <= prop.height && glheight <= prop.height) 1328 || (height <= prop.height && glheight <= prop.height)
… …
1243bool 1363bool
1244rxvt_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
1245{ 1365{
1246 careful = false; 1366 careful = false;
1247 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
1248 if (!XftCharExists (term->xdisp, f, unicode)) 1375 if (!XftCharExists (term->dpy, f, unicode))
1376 return false;
1377
1378 // some fonts claim they can render private use chars and then
1379 // render them as boxes.
1380 if (ecb_expect_false (IS_COMPOSE (unicode)))
1249 return false; 1381 return false;
1250 1382
1251 if (!prop || prop->width == rxvt_fontprop::unset) 1383 if (!prop || prop->width == rxvt_fontprop::unset)
1252 return true; 1384 return true;
1253 1385
1254 // check character against base font bounding box 1386 // check character against base font bounding box
1255 FcChar32 ch = unicode; 1387 FcChar32 ch = unicode;
1256 XGlyphInfo g; 1388 XGlyphInfo g;
1257 XftTextExtents32 (term->xdisp, f, &ch, 1, &g); 1389 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1258 1390
1259 int w = g.width - g.x; 1391 int w = g.width - g.x;
1260 int wcw = WCWIDTH (unicode); 1392 int wcw = max (WCWIDTH (unicode), 1);
1261 if (wcw > 0) w = (w + wcw - 1) / wcw;
1262 1393
1263 careful = w > prop->width; 1394 careful = g.x > 0 || w > prop->width * wcw;
1395
1264 if (careful && OVERLAP_OK (w, prop)) 1396 if (careful && !OVERLAP_OK (w, wcw, prop))
1397 return false;
1398
1399 // this weeds out _totally_ broken fonts, or glyphs
1400 if (!OVERLAP_OK (g.xOff, wcw, prop))
1265 return false; 1401 return false;
1266 1402
1267 return true; 1403 return true;
1268} 1404}
1269 1405
1270void 1406void
1271rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1407rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1272 const text_t *text, int len, 1408 const text_t *text, int len,
1273 int fg, int bg) 1409 int fg, int bg)
1274{ 1410{
1275 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1276
1277 XGlyphInfo extents; 1411 XGlyphInfo extents;
1278 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1412 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1279 XftGlyphSpec *ep = enc; 1413 XftGlyphSpec *ep = enc;
1280 1414
1281 dTermDisplay; 1415 dTermDisplay;
1282 dTermGC; 1416 dTermGC;
1417
1418 int w = term->fwidth * len;
1419 int h = term->fheight;
1420
1421 bool buffered = bg >= Color_transparent
1422 && term->option (Opt_buffered);
1283 1423
1284 // cut trailing spaces 1424 // cut trailing spaces
1285 while (len && text [len - 1] == ' ') 1425 while (len && text [len - 1] == ' ')
1286 len--; 1426 len--;
1287 1427
1428 int x_ = buffered ? 0 : x;
1429 int y_ = buffered ? 0 : y;
1430
1288 while (len) 1431 while (len)
1289 { 1432 {
1290 int cwidth = term->fwidth; 1433 int cwidth = term->fwidth;
1291 FcChar32 fc = *text++; len--; 1434 FcChar32 fc = *text++; len--;
1292 1435
1436#if ENABLE_COMBINING && !UNICODE_3
1437 if (ecb_expect_false (IS_COMPOSE (fc)))
1438 if (compose_char *cc = rxvt_composite[fc]) // should always be true, but better be safe than sorry
1439 fc = cc->c1; // c2 must be NOCHAR, as has_char handles it that way
1440#endif
1441
1293 while (len && *text == NOCHAR) 1442 while (len && *text == NOCHAR)
1294 text++, len--, cwidth += term->fwidth; 1443 text++, len--, cwidth += term->fwidth;
1295 1444
1296 if (fc != ' ') // skip spaces 1445 if (fc != ' ') // skip spaces
1297 { 1446 {
1298 FT_UInt glyph = XftCharIndex (disp, f, fc); 1447 FT_UInt glyph = XftCharIndex (disp, f, fc);
1299 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1448 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1300 1449
1301 ep->glyph = glyph; 1450 ep->glyph = glyph;
1302 ep->x = x + (cwidth - extents.xOff >> 1); 1451 ep->x = x_ + (cwidth - extents.xOff >> 1);
1303 ep->y = y + ascent; 1452 ep->y = y_ + ascent;
1453
1454 if (extents.xOff == 0)
1455 ep->x = x_ + cwidth;
1456
1304 ep++; 1457 ep++;
1305 } 1458 }
1306 1459
1307 x += cwidth; 1460 x_ += cwidth;
1461 }
1462
1463 if (buffered)
1308 } 1464 {
1309
1310 if (ep != enc) 1465 if (ep != enc)
1466 {
1467 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1468
1469#ifdef HAVE_IMG
1470 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1471
1472 if (term->bg_img
1473 && (bg == Color_transparent || bg == Color_bg
1474 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1475 {
1476 int src_x = x, src_y = y;
1477
1478 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1479 {
1480 src_x += term->window_vt_x;
1481 src_y += term->window_vt_y;
1482 }
1483
1484 if (term->bg_img->w >= src_x + w
1485 && term->bg_img->h >= src_y + h)
1486 {
1487 XCopyArea (disp, term->bg_img->pm, d2, gc,
1488 src_x, src_y, w, h, 0, 0);
1489 }
1490 else
1491 {
1492 XGCValues gcv;
1493
1494 gcv.fill_style = FillTiled;
1495 gcv.tile = term->bg_img->pm;
1496 gcv.ts_x_origin = -src_x;
1497 gcv.ts_y_origin = -src_y;
1498
1499 XChangeGC (disp, gc,
1500 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1501 &gcv);
1502
1503 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1504
1505 gcv.fill_style = FillSolid;
1506 XChangeGC (disp, gc, GCFillStyle, &gcv);
1507 }
1508
1509 if (dst)
1510 {
1511 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1512
1513 // dst can only be set when bg >= 0
1514 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1515 }
1516 }
1517 else
1518#endif
1519 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1520
1521 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1522 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1523 }
1524 else
1525 clear_rect (d, x, y, w, h, bg);
1526 }
1527 else
1528 {
1529 clear_rect (d, x, y, w, h, bg);
1311 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1530 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1531 }
1312} 1532}
1533
1313#endif 1534#endif
1314 1535
1315///////////////////////////////////////////////////////////////////////////// 1536/////////////////////////////////////////////////////////////////////////////
1316 1537
1317rxvt_fontset::rxvt_fontset (rxvt_term *term) 1538rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1328void 1549void
1329rxvt_fontset::clear () 1550rxvt_fontset::clear ()
1330{ 1551{
1331 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1552 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1332 = rxvt_fontprop::unset; 1553 = rxvt_fontprop::unset;
1554 force_prop = false;
1333 1555
1334 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1556 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1335 FONT_UNREF (*i); 1557 (*i)->unref ();
1336 1558
1337 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1559 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1338 delete *p; 1560 delete *p;
1339 1561
1340 free (fontdesc); fontdesc = 0; 1562 free (fontdesc); fontdesc = 0;
… …
1342 fonts.clear (); 1564 fonts.clear ();
1343 1565
1344 fallback = fallback_fonts; 1566 fallback = fallback_fonts;
1345} 1567}
1346 1568
1569void
1570rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1571{
1572 font->set_term (term);
1573
1574 font->cs = cs;
1575 font->loaded = false;
1576}
1577
1347rxvt_font * 1578rxvt_font *
1348rxvt_fontset::new_font (const char *name, codeset cs) 1579rxvt_fontset::new_font (const char *name, codeset cs)
1349{ 1580{
1350 rxvt_font *f; 1581 rxvt_font *f;
1351 1582
1352 if (!name || !*name) 1583 if (!name || !*name)
1353 { 1584 {
1354 name = ""; 1585 name = "";
1355 f = new rxvt_font_default (this); 1586 f = new rxvt_font_default (this);
1356 } 1587 }
… …
1367 f = new rxvt_font_x11; 1598 f = new rxvt_font_x11;
1368 } 1599 }
1369 else 1600 else
1370 f = new rxvt_font_x11; 1601 f = new rxvt_font_x11;
1371 1602
1372 f->set_term (term);
1373 f->set_name (strdup (name)); 1603 f->set_name (strdup (name));
1374 1604 prepare_font (f, cs);
1375 f->cs = cs;
1376 f->loaded = false;
1377 1605
1378 return f; 1606 return f;
1379} 1607}
1380 1608
1381///////////////////////////////////////////////////////////////////////////// 1609/////////////////////////////////////////////////////////////////////////////
1610
1611void
1612rxvt_fontset::push_font (rxvt_font *font)
1613{
1614 // the fontCount index is reserved for the overflow font, it is only
1615 // necessary when we get fontCount or more fonts, as they cannot be
1616 // represented in the rendition.
1617 if (fonts.size () == fontCount)
1618 {
1619 rxvt_font *f = new rxvt_font_overflow (this);
1620
1621 prepare_font (f, CS_UNICODE);
1622 fonts.push_back (f);
1623 }
1624
1625 fonts.push_back (font);
1626}
1382 1627
1383void 1628void
1384rxvt_fontset::add_fonts (const char *desc) 1629rxvt_fontset::add_fonts (const char *desc)
1385{ 1630{
1386 if (desc) 1631 if (desc)
… …
1415 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1660 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1416 else 1661 else
1417 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1662 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1418 1663
1419 desc++; 1664 desc++;
1420 while (*desc <= ' ') desc++; 1665 while (*desc <= ' ' && *desc) desc++;
1421 } 1666 }
1422 1667
1423 end = strchr (desc, ','); 1668 end = strchr (desc, ',');
1424 if (!end) 1669 if (!end)
1425 end = desc + strlen (desc); 1670 end = desc + strlen (desc);
1426 1671
1427 if (end - desc < 511) 1672 if (end - desc < 511)
1428 { 1673 {
1429 strncpy (buf, desc, end - desc); 1674 memcpy (buf, desc, end - desc);
1430 buf[end - desc] = 0; 1675 buf[end - desc] = 0;
1431 1676
1432 fonts.push_back (new_font (buf, cs)); 1677 push_font (new_font (buf, cs));
1433 } 1678 }
1434 else 1679 else
1435 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1680 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1436 1681
1437 desc = end + 1; 1682 desc = end + 1;
1438 } 1683 }
1439 while (*end); 1684 while (*end);
1440 } 1685 }
… …
1449 if (fonts[i]->loaded) 1694 if (fonts[i]->loaded)
1450 return true; 1695 return true;
1451 1696
1452 fonts[i]->loaded = true; 1697 fonts[i]->loaded = true;
1453 1698
1454 if (!fonts[i]->load (prop)) 1699 if (!fonts[i]->load (prop, force_prop))
1455 { 1700 {
1456 fonts[i]->cs = CS_UNKNOWN; 1701 fonts[i]->cs = CS_UNKNOWN;
1457 return false; 1702 return false;
1458 } 1703 }
1459 1704
… …
1465{ 1710{
1466 clear (); 1711 clear ();
1467 1712
1468 fontdesc = strdup (desc); 1713 fontdesc = strdup (desc);
1469 1714
1470 fonts.push_back (new_font (0, CS_UNICODE)); 1715 push_font (new_font (0, CS_UNICODE));
1471 realize_font (0); 1716 realize_font (0);
1472 1717
1473 add_fonts (desc); 1718 add_fonts (desc);
1474 1719
1475 return true; 1720 return true;
… …
1484 1729
1485 return -1; 1730 return -1;
1486} 1731}
1487 1732
1488int 1733int
1489rxvt_fontset::find_font (unicode_t unicode) 1734rxvt_fontset::find_font_idx (unicode_t unicode)
1490{ 1735{
1491 if (unicode >= 1<<20) 1736 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1737 if (unicode > 0x1fffff)
1492 return 0; 1738 return 0;
1493 1739
1494 unicode_t hi = unicode >> 8; 1740 unicode_t hi = unicode >> 8;
1495 1741
1496 if (hi < fmap.size () 1742 if (hi < fmap.size ())
1497 && fmap[hi] 1743 if (pagemap *pm = fmap[hi])
1498 && (*fmap[hi])[unicode & 0xff] != 0xff) 1744 if ((*pm)[unicode & 0xff] != 0xff)
1499 return (*fmap[hi])[unicode & 0xff]; 1745 return (*pm)[unicode & 0xff];
1500 1746
1501 unsigned int i; 1747 unsigned int i;
1502 1748
1503 for (i = 0; i < fonts.size (); i++) 1749 for (i = 0; i < fonts.size (); i++)
1504 { 1750 {
… …
1520 goto next_font; 1766 goto next_font;
1521 1767
1522 bool careful; 1768 bool careful;
1523 if (f->has_char (unicode, &prop, careful)) 1769 if (f->has_char (unicode, &prop, careful))
1524 { 1770 {
1525 if (careful) 1771 i = (i << 1) | careful;
1526 i |= 128;
1527 1772
1528 goto found; 1773 goto found;
1529 } 1774 }
1530 1775
1531 next_font: 1776 next_font:
1532 if (i == fonts.size () - 1) 1777 if (i == fonts.size () - 1)
1533 { 1778 {
1779 // compose characters are handled by the default font, unless another font takes over
1780 // we do not go via the fallback list for speed reasons.
1781 if (IS_COMPOSE (unicode))
1782 return 0;
1783
1534 if (fallback->name) 1784 if (fallback->name)
1535 { 1785 {
1536 // search through the fallback list 1786 // search through the fallback list
1537 fonts.push_back (new_font (fallback->name, fallback->cs)); 1787 push_font (new_font (fallback->name, fallback->cs));
1538 fallback++; 1788 fallback++;
1539 } 1789 }
1540 else 1790 else
1541 { 1791 {
1542 // try to find a new font. 1792 // try to find a new font.
… …
1544 // way to configure this and xft is easier to hack in, 1794 // way to configure this and xft is easier to hack in,
1545 // while x11 has more framework in place already. 1795 // while x11 has more framework in place already.
1546 // TODO: this is a real resource hog, xft takes ages(?) 1796 // TODO: this is a real resource hog, xft takes ages(?)
1547#if XFT && USE_SLOW_LOOKUP 1797#if XFT && USE_SLOW_LOOKUP
1548 // grab the first xft font that seems suitable 1798 // grab the first xft font that seems suitable
1799 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1549 FcPattern *p = FcPatternCreate (); 1800 FcPattern *p = FcPatternCreate ();
1550 1801
1551 FcCharSet *s = FcCharSetCreate (); 1802 FcCharSet *s = FcCharSetCreate ();
1552 FcCharSetAddChar (s, unicode); 1803 FcCharSetAddChar (s, unicode);
1553 FcPatternAddCharSet (p, FC_CHARSET, s); 1804 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1560 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1811 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1561 FcPatternAddBool (p, FC_MINSPACE, 1); 1812 FcPatternAddBool (p, FC_MINSPACE, 1);
1562 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1813 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1563 1814
1564 XftResult result; 1815 XftResult result;
1565 FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result); 1816 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1566 1817
1567 FcPatternDestroy (p); 1818 FcPatternDestroy (p);
1568 1819
1569 if (match) 1820 if (match)
1570 { 1821 {
… …
1573 FcPatternDestroy (match); 1824 FcPatternDestroy (match);
1574 1825
1575 if (find_font (font) < 0) 1826 if (find_font (font) < 0)
1576 { 1827 {
1577 char fontname[4096]; 1828 char fontname[4096];
1578 sprintf (fontname, "xft:%-.4090s", font); 1829 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1579 1830
1580 fonts.push_back (new_font (fontname, CS_UNICODE)); 1831 push_font (new_font (fontname, CS_UNICODE));
1581 } 1832 }
1582 1833
1583 free (font); 1834 free (font);
1584 } 1835 }
1585#endif 1836#endif
… …
1597 while (hi >= fmap.size ()) 1848 while (hi >= fmap.size ())
1598 fmap.push_back (0); 1849 fmap.push_back (0);
1599 1850
1600 if (!fmap[hi]) 1851 if (!fmap[hi])
1601 { 1852 {
1602 fmap[hi] = (pagemap *)new pagemap; 1853 fmap[hi] = new pagemap;
1603 memset (fmap[hi], 0xff, sizeof (pagemap)); 1854 memset (fmap[hi], 0xff, sizeof (pagemap));
1604 } 1855 }
1605 1856
1606 (*fmap[hi])[unicode & 0xff] = i; 1857 (*fmap[hi])[unicode & 0xff] = i;
1607 } 1858 }
1608 1859
1609 return i; 1860 return i;
1610} 1861}
1611 1862
1612
1613

Diff Legend

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