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.41 by root, Wed Aug 25 02:33:09 2004 UTC vs.
Revision 1.215 by root, Sat Jun 19 10:01:16 2021 UTC

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

Diff Legend

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