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.52 by root, Sat Dec 4 02:56:06 2004 UTC vs.
Revision 1.211 by root, Fri Jun 18 22:12:30 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" },
… …
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_ZH || ENCODING_ZH_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:autohint=true"}, 139 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
131 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
132 { CS_UNICODE, "xft:Andale Mono:antialias=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
133 { CS_UNICODE, "xft:Arial Unicode MS:antialias=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:autohint=true" }, 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
351 // support double-width (but not more) graphics chars
352 // TODO: do this outside the if/elsif.. statement for all cases
353 if (len && *text == NOCHAR)
354 W += r->TermWin.fwidth;
355 372
356 int x_[16]; 373 int x_[16];
357 int y_[16]; 374 int y_[16];
358 375
359 for (int i = 0; i <= 8; i++) 376 for (int i = 0; i <= 8; i++)
… …
367 384
368 XGCValues gcv; 385 XGCValues gcv;
369 386
370 gcv.cap_style = CapButt; 387 gcv.cap_style = CapButt;
371 gcv.line_width = 0; 388 gcv.line_width = 0;
372 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 389 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
373 390
374 while (a < b) 391 while (a < b)
375 { 392 {
376 uint32_t command = *a++; 393 uint32_t command = *a++;
377 394
… …
384 int y2 = y_[(command >> 0) & 15]; 401 int y2 = y_[(command >> 0) & 15];
385 402
386 switch (op) 403 switch (op)
387 { 404 {
388 case 0: // line 405 case 0: // line
389 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 406 XDrawLine (disp, d, gc, x1, y1, x2, y2);
390 break; 407 break;
391 408
392 case 1: // rectangle, possibly stippled 409 case 1: // rectangle, possibly stippled
393 if (a) 410 if (a)
394 { 411 {
395 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
396 413
397 gcv.fill_style = FillStippled; 414 gcv.fill_style = FillStippled;
398 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
399 gcv.ts_x_origin = x; 416 gcv.ts_x_origin = x;
400 gcv.ts_y_origin = y; 417 gcv.ts_y_origin = y;
401 418
402 XChangeGC (d.display->display, TGC, 419 XChangeGC (disp, gc,
403 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 420 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
404 &gcv); 421 &gcv);
405 } 422 }
406 423
407 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);
408 425
409 if (a) 426 if (a)
410 { 427 {
411 XFreePixmap (d.display->display, gcv.stipple); 428 XFreePixmap (disp, gcv.stipple);
412 gcv.stipple = 0; 429 gcv.stipple = 0;
413 gcv.fill_style = FillSolid; 430 gcv.fill_style = FillSolid;
414 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 431 XChangeGC (disp, gc, GCFillStyle, &gcv);
415 } 432 }
416 break; 433 break;
417 case 2: // arc 434 case 2: // arc
418 XDrawArc (d.display->display, d, TGC, 435 XDrawArc (disp, d, gc,
419 x1 - W/2, y1 - H/2, W-1, H-1, 436 x1 - W/2, y1 - H/2, W-1, H-1,
420 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
421 break; 438 break;
422 } 439 }
423 } 440 }
424 } 441 }
442#else
443 if (0)
444 ;
445#endif
425#if ENABLE_COMBINING 446#if ENABLE_COMBINING
426 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
427 { 448 {
449 min_it (width, 2); // we only support wcwidth up to 2
428 text_t c2[2]; 450 text_t chrs[2];
429 int len2 = 1; 451 chrs [1] = NOCHAR;
430
431 // support double-width (but not more) combining characters
432 if (len && *text == NOCHAR)
433 {
434 c2[1] = *text; // not text++ to get correct x-width
435 len2++;
436 }
437 452
438 c2[0] = cc->c1; 453 *chrs = cc->c1;
439 rxvt_font *f1 = (*fs)[fs->find_font (c2[0])]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
440 f1->draw (d, x, y, c2, len2, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
441 456
442 if (cc->c2 != NOCHAR) 457 if (cc->c2 != NOCHAR)
443 { 458 {
444 bool careful; 459 bool careful;
445 460
446 // prefer font of first character, for no good reasons 461 // prefer font of first character, for no good reasons
447 c2[0] = cc->c2; 462 *chrs = cc->c2;
448 rxvt_font *f2 = (f1->has_char (c2[0], 0, careful) && !careful) 463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
449 ? f1 464 ? f1
450 : (*fs)[fs->find_font (c2[0])]; 465 : (*fs)[fs->find_font_idx (cc->c2)];
451 466
452 f2->draw (d, x, y, c2, len2, fg, -1); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
453 } 468 }
454 } 469 }
455#endif 470#endif
456 else 471 else
457 switch (t) 472 switch (t)
… …
459 case '\t': 474 case '\t':
460 case ZERO_WIDTH_CHAR: 475 case ZERO_WIDTH_CHAR:
461 case NOCHAR: 476 case NOCHAR:
462 break; 477 break;
463 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
464 default: 488 default:
465 int w = 0;
466 while (len > 0 && *text == NOCHAR)
467 {
468 ++text;
469 --len;
470 w += r->TermWin.fwidth;
471 }
472
473 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, 489 XDrawRectangle (disp, d, gc, x + 2, y + 2,
474 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); 490 fwidth - 4, term->fheight - 4);
475 x += w;
476 } 491 }
477 492
478 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;
479 } 548 }
480} 549 }
550};
481 551
482///////////////////////////////////////////////////////////////////////////// 552/////////////////////////////////////////////////////////////////////////////
483 553
484struct rxvt_font_x11 : rxvt_font { 554struct rxvt_font_x11 : rxvt_font
555{
485 rxvt_font_x11 () { f = 0; } 556 rxvt_font_x11 () { f = 0; }
486 557
487 void clear (); 558 void clear ();
488 559
489 rxvt_fontprop properties (); 560 rxvt_fontprop properties ();
490 561
491 bool load (const rxvt_fontprop &prop); 562 bool load (const rxvt_fontprop &prop, bool force_prop);
492 563
493 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;
494 565
495 void draw (rxvt_drawable &d, int x, int y, 566 void draw (rxvt_drawable &d, int x, int y,
496 const text_t *text, int len, 567 const text_t *text, int len,
497 int fg, int bg); 568 int fg, int bg);
498 569
499 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
500 XFontStruct *f; 571 XFontStruct *f;
501 codeset cs;
502 bool enc2b, encm; 572 bool enc2b, encm;
503 573
504 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 574 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
505 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);
506 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 576 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
507 bool set_properties (rxvt_fontprop &p, const char *name); 577 bool set_properties (rxvt_fontprop &p, const char *name);
508}; 578};
509 579
510char * 580char *
511rxvt_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
512{ 582{
513 unsigned long value; 583 unsigned long value;
514 584
515 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 585 if (XGetFontProperty (f, property, &value))
516 return XGetAtomName (DISPLAY, value); 586 return XGetAtomName (term->dpy, value);
517 else 587 else
518 return rxvt_strdup (repl); 588 return repl ? strdup (repl) : 0;
519} 589}
520 590
521rxvt_fontprop 591rxvt_fontprop
522rxvt_font_x11::properties () 592rxvt_font_x11::properties ()
523{ 593{
… …
527} 597}
528 598
529bool 599bool
530rxvt_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)
531{ 601{
532 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;
533 p.height = height; 605 p.height = height;
606 p.ascent = rxvt_fontprop::unset;
534 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;
535 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;
536 609
537 return true; 610 return true;
538} 611}
539 612
540bool 613bool
541rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 614rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
542{ 615{
543 unsigned long height; 616 unsigned long height;
617
618#if 0
544 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 619 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
545 return false; 620 return false;
621#else
622 height = f->ascent + f->descent;
623#endif
546 624
547 unsigned long avgwidth; 625 unsigned long avgwidth;
548 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 626 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
549 avgwidth = 0; 627 avgwidth = 0;
550 628
551 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 629 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
552 char *slant = get_property (f, "SLANT", "r"); 630 char *slant = get_property (f, term->xa [XA_SLANT], "r");
553 631
554 set_properties (p, height, weight, slant, avgwidth); 632 set_properties (p, height, weight, slant, avgwidth);
555 633
556 free (weight); 634 free (weight);
557 free (slant); 635 free (slant);
558 636
637 p.ascent = f->ascent;
638
559 return true; 639 return true;
560} 640}
561 641
562bool 642bool
563rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 643rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
564{ 644{
645 dTermDisplay;
565 int slashes = 0; 646 int slashes = 0;
566 const char *comp[13]; 647 const char *comp[13];
567 648
568 for (const char *c = name; *c; c++) 649 for (const char *c = name; *c; c++)
569 if (*c == '-') 650 if (*c == '-')
… …
577 if (slashes >= 13 658 if (slashes >= 13
578 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 659 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
579 && (*comp[11] >= '0' && *comp[11] <= '9')) 660 && (*comp[11] >= '0' && *comp[11] <= '9'))
580 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]));
581 662
582 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 663 XFontStruct *f = XLoadQueryFont (disp, name);
583 664
584 if (f) 665 if (f)
585 { 666 {
586 // 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
587 // (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).
588 // in that case, just return garbage. 669 // in that case, just return garbage.
589 bool ret = set_properties (p, f); 670 bool ret = set_properties (p, f);
590 XFreeFont (DISPLAY, f); 671 XFreeFont (disp, f);
591 return ret; 672 return ret;
592 } 673 }
593 else 674 else
594 return false; 675 return false;
595} 676}
596 677
597// fix the size of scalable fonts 678// fix the size of scalable fonts
598static bool 679static bool
599replace_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)
600{ 681{
601 int slashes = 0; 682 int slashes = 0;
602 const char *field, *end; 683 const char *field, *end;
603 684
604 for (const char *c = name; *c; c++) 685 for (const char *c = name; *c; c++)
… …
614 break; 695 break;
615 } 696 }
616 697
617 if (slashes >= 13 && (!old || *field == old)) 698 if (slashes >= 13 && (!old || *field == old))
618 { 699 {
619 // TODO: check for overflow in font-name 700 size_t len = field - name;
620 strncpy (buf, name, field - name); 701 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
621 buf += field - name; 702 memcpy (*ptr, name, len);
622 strcpy (buf, replace); 703 strcpy (*ptr + len, replace);
623 strcat (buf, end); 704 strcat (*ptr, end);
624 705
625 return true; 706 return true;
626 } 707 }
627 else 708 else
628 { 709 {
629 strcpy (buf, name); 710 *ptr = strdup (name);
630 711
631 return false; 712 return false;
632 } 713 }
633} 714}
634 715
635bool 716bool
636rxvt_font_x11::load (const rxvt_fontprop &prop) 717rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
637{ 718{
719 dTermDisplay;
720
638 clear (); 721 clear ();
639 722
640 char field_str[64]; // enough for 128 bits 723 char field_str[64]; // enough for 128 bits
641 724
642 // first morph the font if required 725 // first morph the font if required
643 if (prop.weight != rxvt_fontprop::unset 726 if (force_prop)
644 || prop.slant != rxvt_fontprop::unset)
645 { 727 {
646 char fname[1024]; 728 char *fname;
647 729
648 if (name[0] != '-') 730 if (name[0] != '-')
649 { 731 {
650 f = XLoadQueryFont (DISPLAY, name); 732 f = XLoadQueryFont (disp, name);
651 733
652 if (!f) 734 if (!f)
653 return false; 735 return false;
654 736
655 char *new_name = get_property (f, "FONT", name); 737 char *new_name = get_property (f, XA_FONT, 0);
656 738
657 if (new_name) 739 if (new_name)
658 set_name (new_name); 740 set_name (new_name);
659 else 741 else
660 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 742 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
661 743
662 XFreeFont (DISPLAY, f); 744 XFreeFont (disp, f);
663 f = 0; 745 f = 0;
664 } 746 }
665 747
666 if (prop.weight != rxvt_fontprop::unset) 748 if (prop.weight != rxvt_fontprop::unset)
667 { 749 {
668 replace_field (fname, name, 2, 0, 750 replace_field (&fname, name, 2, 0,
669 prop.weight < rxvt_fontprop::bold 751 prop.weight < rxvt_fontprop::bold
670 ? "medium" : "bold"); 752 ? "medium" : "bold");
671 set_name (strdup (fname)); 753 set_name (fname);
672 } 754 }
673 755
674 if (prop.slant != rxvt_fontprop::unset) 756 if (prop.slant != rxvt_fontprop::unset)
675 { 757 {
676 replace_field (fname, name, 3, 0, 758 replace_field (&fname, name, 3, 0,
677 prop.slant < rxvt_fontprop::italic 759 prop.slant < rxvt_fontprop::italic
678 ? "r" : "i"); // TODO: handle "o"blique, too 760 ? "r" : "i"); // TODO: handle "o"blique, too
679 set_name (strdup (fname)); 761 set_name (fname);
680 } 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 ()
681 } 773 {
774 name = 0;
775 diff = 0x7fffffff;
776 }
777
778 font_weight () { clear (); }
779 ~font_weight () { free (name); }
780 };
682 781
683 char **list; 782 char **list;
684 int count; 783 int count;
685 list = XListFonts (DISPLAY, name, 1024, &count); 784 list = XListFonts (disp, name, 4000, &count);
686 785
687 set_name (0); 786 set_name (0);
688 787
689 if (!list) 788 if (!list)
690 return false; 789 return false;
691 790
692 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 791 font_weight *fonts = new font_weight[count];
693 ? 0 : prop.height);
694 792
695 int bestdiff = 0x7fffffff;
696 for (int i = 0; i < count; i++) 793 for (int i = 0; i < count; i++)
697 { 794 {
698 rxvt_fontprop p; 795 rxvt_fontprop p;
699 char fname[1024]; 796 char *fname;
700 797
701 int diff = 0; 798 int diff = 0;
702 799
703 if (replace_field (fname, list[i], 6, '0', field_str)) 800 if (replace_field (&fname, list[i], 6, '0', field_str))
704 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 }
705 808
706 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);
707 continue; 815 continue;
708 816 }
709 if (prop.height != rxvt_fontprop::unset
710 && p.height > prop.height) // weed out too large fonts
711 continue;
712 817
713 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;
714 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);
715 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);
716 //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);
717 822
718 if (!name // compare against best found so far 823 fonts[i].name = fname;
719 || diff < bestdiff) 824 fonts[i].diff = diff;
720 {
721 set_name (strdup (fname));
722 bestdiff = diff;
723 }
724 } 825 }
725 826
726 XFreeFontNames (list); 827 XFreeFontNames (list);
727 828
728 if (!name) 829 // this loop only iterates when the guessed font-size is too small
729 return false; 830 for (;;)
831 {
832 font_weight *best = fonts;
730 833
731 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;
732 858
733 if (!f) 859 if (!f)
734 return false; 860 return false;
735 861
736 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 862 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
737 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;
738 866
739 if (registry && encoding) 867 if (registry && encoding)
740 { 868 {
741 char charset[64]; 869 char charset[64];
742 snprintf (charset, 64, "%s-%s", registry, encoding); 870 snprintf (charset, 64, "%s-%s", registry, encoding);
743 871
744 cs = codeset_from_name (charset); 872 cs = codeset_from_name (charset);
745 } 873
746 else 874 if (cs == CS_UNKNOWN)
875 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
747 { 876 }
877
878 free (registry);
879 free (encoding);
880
881 if (cs == CS_UNKNOWN)
882 {
748 const char *charset = get_property (f, "FONT", 0); 883 char *value = get_property (f, XA_FONT, 0);
884 const char *charset = value;
749 885
750 if (!charset) 886 if (!charset)
751 charset = name; 887 charset = name;
752 888
753 int count = 13; 889 int count = 13;
754 while (*charset) 890 while (*charset)
755 if (*charset++ == '-' && !--count) 891 if (*charset++ == '-' && !--count)
756 break; 892 break;
757 893
758 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)
759 } 902 {
760 903 clear ();
761 free (registry); 904 return false;
762 free (encoding); 905 }
763 906
764 if (cs == CS_UNICODE) 907 if (cs == CS_UNICODE)
765 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
766 909
767 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 910 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
768 enc2b = encm || f->max_char_or_byte2 > 255; 911 enc2b = encm || f->max_char_or_byte2 > 255;
769 912
770 ascent = f->ascent;
771 descent = f->descent;
772 height = ascent + descent;
773
774 slow = false; 913 slow = false;
775 914
776#if 1 // only used for slow detection, TODO optimize 915#if 1 // only used for slow detection, TODO optimize
777 if (f->min_bounds.width == f->max_bounds.width) 916 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
778 width = f->min_bounds.width;
779 else if (f->per_char == NULL)
780 width = f->max_bounds.width; 917 width = f->max_bounds.width;
781 else 918 else
782 { 919 {
783 slow = true; 920 slow = true;
784 921
785 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;
786 923
787 if (encm) 924 if (encm)
788 N += (f->max_byte1 - f->min_byte1) 925 N += (f->max_byte1 - f->min_byte1)
789 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 926 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
790 927
791 while (N) 928 while (N)
792 { 929 {
793 if (f->per_char[N].width > width) 930 if (f->per_char[N].width > width)
794 width = f->per_char[N].width; 931 width = f->per_char[N].width;
795 932
… …
798 } 935 }
799#endif 936#endif
800 937
801 width = 1; 938 width = 1;
802 939
803 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++)
804 { 941 {
805 if (cs != CS_UNICODE
806 && *t > 0x100
807 && FROM_UNICODE (cs, *t) == NOCHAR) 942 if (FROM_UNICODE (cs, *t) == NOCHAR)
808 continue; 943 continue;
809 944
810 // ignore characters we wouldn't use anyways 945 // ignore characters we wouldn't use anyways
811 bool careful; 946 bool careful;
812 if (!has_char (*t, &prop, careful)) 947 if (!has_char (*t, &prop, careful))
813 continue; 948 continue;
814 949
815 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 };
816 952
817 XCharStruct g; 953 XCharStruct g;
818 int dir_ret, asc_ret, des_ret; 954 int dir_ret, asc_ret, des_ret;
819 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 955 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
820 956
821 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;
822 959
823 if (width < g.width) width = g.width; 960 if (width < g.width) width = g.width;
824 }
825
826 if (cs == CS_UNKNOWN)
827 { 961 }
828 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
829 962
963#if 0 // do it per-character
964 if (prop && width > prop->width)
965 {
830 clear (); 966 clear ();
831 return false; 967 return false;
832 } 968 }
833
834#if 0 // do it per-character
835 if (prop && width > prop->width)
836 {
837 clear ();
838 return false;
839 }
840#endif 969#endif
841 970
842 return true; 971 return true;
843} 972}
844 973
845void 974void
846rxvt_font_x11::clear () 975rxvt_font_x11::clear ()
847{ 976{
848 if (f) 977 if (f)
849 { 978 {
850 XFreeFont (DISPLAY, f); 979 XFreeFont (term->dpy, f);
851 f = 0; 980 f = 0;
852 } 981 }
853} 982}
854 983
855bool 984bool
856rxvt_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
857{ 986{
987 careful = false;
988
858 uint32_t ch = FROM_UNICODE (cs, unicode); 989 uint32_t ch = FROM_UNICODE (cs, unicode);
859 990
860 if (ch == NOCHAR) 991 if (ch == NOCHAR)
861 return false; 992 return false;
862 993
863 /* check wether the character exists in _this_ font. horrible. */ 994 /* check whether the character exists in _this_ font. horrible. */
864 XCharStruct *xcs; 995 XCharStruct *xcs;
865 996
866 if (encm) 997 if (encm)
867 { 998 {
868 unsigned char byte1 = ch >> 8; 999 unsigned char byte1 = ch >> 8;
… …
898 return false; 1029 return false;
899 1030
900 if (!prop || prop->width == rxvt_fontprop::unset) 1031 if (!prop || prop->width == rxvt_fontprop::unset)
901 return true; 1032 return true;
902 1033
903 // check character against base font bounding box 1034 // check whether character overlaps previous/next character
904 int w = xcs->width; 1035 int w = xcs->rbearing - xcs->lbearing;
905 int wcw = wcwidth (unicode); 1036 int wcw = max (WCWIDTH (unicode), 1);
906 if (wcw > 0) w /= wcw;
907 1037
908 careful = w > prop->width; 1038 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
909 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1039
1040 if (careful && !OVERLAP_OK (w, wcw, prop))
910 return false; 1041 return false;
911 1042
912 return true; 1043 return true;
913} 1044}
914 1045
… …
920 // this looks like a mess /. 1051 // this looks like a mess /.
921 // and it is a mess /. 1052 // and it is a mess /.
922 // yet we are trying to be perfect /. 1053 // yet we are trying to be perfect /.
923 // but the result still isn't perfect /. 1054 // but the result still isn't perfect /.
924 1055
1056 dTermDisplay;
1057 dTermGC;
1058
925 bool slow = this->slow 1059 bool slow = this->slow
926 || width != r->TermWin.fwidth 1060 || width != term->fwidth
927 || height != r->TermWin.fheight; 1061 || height != term->fheight
1062 || ascent != f->ascent;
928 1063
929 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 1064 int base = ascent; // sorry, incorrect: term->fbase;
930 1065
931 XGCValues v; 1066 XGCValues v;
932 v.foreground = r->pix_colors[fg]; 1067 v.foreground = term->pix_colors[fg];
933 v.font = f->fid; 1068 v.font = f->fid;
934 1069
935 if (enc2b) 1070 if (enc2b)
936 { 1071 {
937 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 1072 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
938 1073
939 if (bg == Color_bg && !slow) 1074 if (bg == Color_bg && !slow)
940 { 1075 {
941 v.background = r->pix_colors[bg]; 1076 v.background = term->pix_colors[bg];
942 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1077 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
943 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 1078 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
944 } 1079 }
945 else 1080 else
946 { 1081 {
947 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);
948 1083
949 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1084 XChangeGC (disp, gc, GCForeground | GCFont, &v);
950 1085
951 if (slow) 1086 if (slow)
952 { 1087 {
953 do 1088 do
954 { 1089 {
955 if (xc->byte1 || xc->byte2) 1090 if (xc->byte1 || xc->byte2)
956 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1091 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
957 1092
958 x += r->TermWin.fwidth; 1093 x += term->fwidth;
959 xc++; len--; 1094 xc++; len--;
960 } 1095 }
961 while (len); 1096 while (len);
962 } 1097 }
963 else 1098 else
964 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1099 XDrawString16 (disp, d, gc, x, y + base, xc, len);
965 } 1100 }
966 } 1101 }
967 else 1102 else
968 { 1103 {
969 const char *xc = enc_char (text, len, cs, slow); 1104 const char *xc = enc_char (text, len, cs, slow);
970 1105
971 if (bg == Color_bg && !slow) 1106 if (bg == Color_bg && !slow)
972 { 1107 {
973 v.background = r->pix_colors[bg]; 1108 v.background = term->pix_colors[bg];
974 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1109 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
975 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1110 XDrawImageString (disp, d, gc, x, y + base, xc, len);
976 } 1111 }
977 else 1112 else
978 { 1113 {
979 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);
980 1115
981 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1116 XChangeGC (disp, gc, GCForeground | GCFont, &v);
982 1117
983 if (slow) 1118 if (slow)
984 { 1119 {
985 do 1120 do
986 { 1121 {
987 if (*xc) 1122 if (*xc)
988 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1123 XDrawString (disp, d, gc, x, y + base, xc, 1);
989 1124
990 x += r->TermWin.fwidth; 1125 x += term->fwidth;
991 xc++; len--; 1126 xc++; len--;
992 } 1127 }
993 while (len); 1128 while (len);
994 } 1129 }
995 else 1130 else
996 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1131 XDrawString (disp, d, gc, x, y + base, xc, len);
997 } 1132 }
998 } 1133 }
999} 1134}
1000 1135
1001///////////////////////////////////////////////////////////////////////////// 1136/////////////////////////////////////////////////////////////////////////////
1002 1137
1003#if XFT 1138#if XFT
1004 1139
1005struct rxvt_font_xft : rxvt_font { 1140struct rxvt_font_xft : rxvt_font
1141{
1006 rxvt_font_xft () { f = 0; } 1142 rxvt_font_xft ()
1143 {
1144 f = 0;
1145 }
1007 1146
1008 void clear (); 1147 void clear ();
1009 1148
1010 rxvt_fontprop properties (); 1149 rxvt_fontprop properties ();
1011 1150
1012 bool load (const rxvt_fontprop &prop); 1151 bool load (const rxvt_fontprop &prop, bool force_prop);
1013 1152
1014 void draw (rxvt_drawable &d, int x, int y, 1153 void draw (rxvt_drawable &d, int x, int y,
1015 const text_t *text, int len, 1154 const text_t *text, int len,
1016 int fg, int bg); 1155 int fg, int bg);
1017 1156
1018 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;
1019 1158
1020protected: 1159protected:
1021 XftFont *f; 1160 XftFont *f;
1022}; 1161};
1023 1162
1024void 1163void
1025rxvt_font_xft::clear () 1164rxvt_font_xft::clear ()
1026{ 1165{
1027 if (f) 1166 if (f)
1028 { 1167 {
1029 XftFontClose (DISPLAY, f); 1168 XftFontClose (term->dpy, f);
1030 f = 0; 1169 f = 0;
1031 } 1170 }
1032} 1171}
1033 1172
1034rxvt_fontprop 1173rxvt_fontprop
… …
1038 1177
1039 FT_Face face = XftLockFace (f); 1178 FT_Face face = XftLockFace (f);
1040 1179
1041 p.width = width; 1180 p.width = width;
1042 p.height = height; 1181 p.height = height;
1182 p.ascent = ascent;
1043 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1183 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1044 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1184 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1045 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1185 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1046 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1186 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1047 1187
… …
1049 1189
1050 return p; 1190 return p;
1051} 1191}
1052 1192
1053bool 1193bool
1054rxvt_font_xft::load (const rxvt_fontprop &prop) 1194rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1055{ 1195{
1196 dTermDisplay;
1197
1056 clear (); 1198 clear ();
1057 1199
1058 FcPattern *p = FcNameParse ((FcChar8 *) name); 1200 FcPattern *p = FcNameParse ((FcChar8 *) name);
1059 1201
1060 if (!p) 1202 if (!p)
1061 return false; 1203 return false;
1062 1204
1063 FcValue v; 1205 FcValue v;
1064 1206
1065 if (prop.height != rxvt_fontprop::unset 1207 if (prop.height != rxvt_fontprop::unset
1066 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1208 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1067 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1209 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1068 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1210 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1069 1211
1070 if (prop.weight != rxvt_fontprop::unset 1212 if (prop.weight != rxvt_fontprop::unset
1071 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1213 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1072 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1214 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1073 1215
1074 if (prop.slant != rxvt_fontprop::unset 1216 if (prop.slant != rxvt_fontprop::unset
1075 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1217 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1076 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1218 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1077 1219
1078#if 0 // clipping unfortunately destroys our precious double-width-characters 1220#if 0 // clipping unfortunately destroys our precious double-width-characters
1079 // clip width, we can't do better, or can we? 1221 // clip width, we can't do better, or can we?
1080 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1222 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1081 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1223 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1082#endif 1224#endif
1083 1225
1084 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1226 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1085 FcPatternAddBool (p, FC_MINSPACE, 1); 1227 FcPatternAddBool (p, FC_MINSPACE, 1);
1086 1228
1087 // store generated name so iso14755 view gives better results 1229 // store generated name so iso14755 view gives better results
1088 set_name ((char *)FcNameUnparse (p)); 1230 set_name ((char *)FcNameUnparse (p));
1089 1231
1090 XftResult result; 1232 XftResult result;
1091 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1233 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1092 1234
1093 FcPatternDestroy (p); 1235 FcPatternDestroy (p);
1094 1236
1095 if (!match) 1237 if (!match)
1096 return false; 1238 return false;
… …
1098 int ftheight = 0; 1240 int ftheight = 0;
1099 bool success = true; 1241 bool success = true;
1100 1242
1101 for (;;) 1243 for (;;)
1102 { 1244 {
1103 f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); 1245 p = FcPatternDuplicate (match);
1246 f = XftFontOpenPattern (disp, p);
1104 1247
1105 if (!f) 1248 if (!f)
1106 { 1249 {
1250 FcPatternDestroy (p);
1107 success = false; 1251 success = false;
1108 break; 1252 break;
1109 } 1253 }
1110 1254
1111 FT_Face face = XftLockFace (f); 1255 FT_Face face = XftLockFace (f);
… …
1117 1261
1118 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1262 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1119 1263
1120 XftUnlockFace (f); 1264 XftUnlockFace (f);
1121 1265
1122 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++)
1123 { 1269 {
1124 FcChar16 ch = *t; 1270 FcChar16 ch = *t;
1125 1271
1126 if (cs != CS_UNICODE 1272 if (cs != CS_UNICODE
1127 && ch > 0x100 1273 && ch > 0x100
… …
1132 bool careful; 1278 bool careful;
1133 if (!has_char (*t, &prop, careful)) 1279 if (!has_char (*t, &prop, careful))
1134 continue; 1280 continue;
1135 1281
1136 XGlyphInfo g; 1282 XGlyphInfo g;
1137 XftTextExtents16 (DISPLAY, f, &ch, 1, &g); 1283 XftTextExtents16 (disp, f, &ch, 1, &g);
1138 1284
1285 g.width -= g.x;
1286
1139 int wcw = wcwidth (ch); 1287 int wcw = WCWIDTH (ch);
1140 if (wcw > 0) g.width = g.width / wcw; 1288 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1141 1289
1142 if (width < g.width) width = g.width; 1290 if (width < g.width ) width = g.width;
1143 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;
1144 } 1300 }
1145 1301
1146 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1147 || height <= prop.height 1303 || (height <= prop.height && glheight <= prop.height)
1148 || height <= 2 1304 || height <= 2
1149 || !scalable) 1305 || !scalable)
1150 break; 1306 break;
1151 1307
1152 if (ftheight) 1308 if (ftheight)
… …
1159 ftheight -= height - prop.height; 1315 ftheight -= height - prop.height;
1160 } 1316 }
1161 else 1317 else
1162 ftheight = prop.height - 1; 1318 ftheight = prop.height - 1;
1163 1319
1164 XftFontClose (DISPLAY, f); 1320 XftFontClose (disp, f);
1165 FcPatternDel (match, FC_PIXEL_SIZE); 1321 FcPatternDel (match, FC_PIXEL_SIZE);
1166 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1322 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1167 } 1323 }
1168 1324
1169 FcPatternDestroy (match); 1325 FcPatternDestroy (match);
1170 1326
1171#if 0 // do it per-character 1327#if 0 // do it per-character
… …
1178 1334
1179 return success; 1335 return success;
1180} 1336}
1181 1337
1182bool 1338bool
1183rxvt_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
1184{ 1340{
1185 careful = false; 1341 careful = false;
1186 1342
1187 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))
1188 return false; 1358 return false;
1189 1359
1190 if (!prop || prop->width == rxvt_fontprop::unset) 1360 if (!prop || prop->width == rxvt_fontprop::unset)
1191 return true; 1361 return true;
1192 1362
1193 // check character against base font bounding box 1363 int wcw = max (WCWIDTH (chr), 1);
1194 FcChar32 ch = unicode; 1364
1195 XGlyphInfo g; 1365 XGlyphInfo g;
1196 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1366 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1197 1367
1198 int w = g.width; 1368 int w = g.width - g.x;
1199 int wcw = wcwidth (unicode);
1200 if (wcw > 0) w /= wcw;
1201 1369
1202 careful = w > prop->width; 1370 careful = g.x > 0 || w > prop->width * wcw;
1203 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))
1204 return false; 1377 return false;
1205 1378
1206 return true; 1379 return true;
1207} 1380}
1208 1381
1209void 1382void
1210rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1383rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1211 const text_t *text, int len, 1384 const text_t *text, int len,
1212 int fg, int bg) 1385 int fg, int bg)
1213{ 1386{
1214 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;
1215 1389
1216 int base = ascent; // should be fbase, but that is incorrect 1390 dTermDisplay;
1391 dTermGC;
1217 1392
1218 XGlyphInfo extents; 1393 int w = term->fwidth * len;
1219 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1394 int h = term->fheight;
1220 FcChar32 *ep = enc; 1395
1221 int ewidth = 0; 1396 bool buffered = bg >= Color_transparent
1222 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;
1223 1405
1224 while (len) 1406 while (len)
1225 { 1407 {
1226 int cwidth = r->TermWin.fwidth; 1408 int cwidth = term->fwidth;
1227 FcChar32 fc = *text++; len--; 1409 FcChar32 chr = *text++; len--;
1228 FT_UInt gl; 1410
1411 // handle non-bmp chars when text_t is 16 bit
1412 #if ENABLE_COMBINING && !UNICODE_3
1413 if (ecb_expect_false (IS_COMPOSE (chr)))
1414 if (compose_char *cc = rxvt_composite [chr])
1415 if (cc->c2 == NOCHAR)
1416 chr = cc->c1;
1417 #endif
1229 1418
1230 while (len && *text == NOCHAR) 1419 while (len && *text == NOCHAR)
1231 text++, len--, cwidth += r->TermWin.fwidth; 1420 text++, len--, cwidth += term->fwidth;
1232
1233 gl = XftCharIndex (d.display->display, f, fc);
1234 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1235 1421
1236 if (extents.xOff != cwidth && ep != enc) 1422 if (chr != ' ') // skip spaces
1237 {
1238 if (xoff > ewidth) xoff = ewidth;
1239 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1240 x + (ewidth - xoff >> 1),
1241 y + base, enc, ep - enc);
1242 x += ewidth;
1243
1244 ep = enc;
1245 ewidth = 0;
1246 xoff = 0;
1247 } 1423 {
1424 #if 0
1425 FT_UInt glyphs [decltype (exp)::max_size];
1248 1426
1249 if (fc == ' ' && ep == enc) // skip leading spaces 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 ep->glyph = glyph;
1443 ep->x = x_;
1444 ep->y = y_ + ascent;
1445
1446 // the xft font cell might differ from the terminal font cell,
1447 // in which we use the average between the two
1448 ep->x += cwidth - extents.xOff >> 1;
1449
1450 // xft/freetype represent combining characters as characters with zero
1451 // width rendered over the previous character with some fonts, while
1452 // in other fonts, they are considered normal characters, while yet
1453 // in other fonts, they are shifted all over the place.
1454 // we handle the first two cases by keying off on xOff being 0
1455 // for zero-width chars. normally, we would add extents.xOff
1456 // of the base chaarcter here, but we don't have that, so we use cwidth.
1457 ep->x += extents.xOff ? 0 : cwidth;
1458
1459 ++ep;
1250 { 1460 }
1461
1251 x += cwidth; 1462 x_ += cwidth;
1252 continue; 1463 }
1464
1465 if (buffered)
1466 {
1467 if (ep != enc)
1253 } 1468 {
1469 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1254 1470
1471#ifdef HAVE_IMG
1472 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1473
1474 if (term->bg_img
1475 && (bg == Color_transparent || bg == Color_bg
1476 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1477 {
1478 int src_x = x, src_y = y;
1479
1480 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1481 {
1482 src_x += term->window_vt_x;
1483 src_y += term->window_vt_y;
1484 }
1485
1486 if (term->bg_img->w >= src_x + w
1487 && term->bg_img->h >= src_y + h)
1488 {
1489 XCopyArea (disp, term->bg_img->pm, d2, gc,
1490 src_x, src_y, w, h, 0, 0);
1491 }
1492 else
1493 {
1494 XGCValues gcv;
1495
1496 gcv.fill_style = FillTiled;
1497 gcv.tile = term->bg_img->pm;
1498 gcv.ts_x_origin = -src_x;
1499 gcv.ts_y_origin = -src_y;
1500
1501 XChangeGC (disp, gc,
1502 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1503 &gcv);
1504
1505 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1506
1507 gcv.fill_style = FillSolid;
1508 XChangeGC (disp, gc, GCFillStyle, &gcv);
1509 }
1510
1511 if (dst)
1512 {
1513 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1514
1515 // dst can only be set when bg >= 0
1516 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1517 }
1518 }
1519 else
1520#endif
1521 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1522
1523 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1524 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1525 }
1255 else 1526 else
1256 { 1527 clear_rect (d, x, y, w, h, bg);
1257 *ep++ = gl;
1258 ewidth += cwidth;
1259 xoff += extents.xOff;
1260 }
1261 }
1262
1263 if (ep != enc)
1264 { 1528 }
1265 if (xoff > ewidth) xoff = ewidth; 1529 else
1266 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1267 x + (ewidth - xoff >> 1),
1268 y + base, enc, ep - enc);
1269 } 1530 {
1531 clear_rect (d, x, y, w, h, bg);
1532 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1533 }
1270} 1534}
1535
1271#endif 1536#endif
1272 1537
1273///////////////////////////////////////////////////////////////////////////// 1538/////////////////////////////////////////////////////////////////////////////
1274 1539
1275rxvt_fontset::rxvt_fontset (rxvt_t r) 1540rxvt_fontset::rxvt_fontset (rxvt_term *term)
1276: r (r), fontdesc (0) 1541: fontdesc (0), term (term)
1277{ 1542{
1278 clear (); 1543 clear ();
1279} 1544}
1280 1545
1281rxvt_fontset::~rxvt_fontset () 1546rxvt_fontset::~rxvt_fontset ()
… …
1284} 1549}
1285 1550
1286void 1551void
1287rxvt_fontset::clear () 1552rxvt_fontset::clear ()
1288{ 1553{
1289 prop.width = prop.height = prop.weight = prop.slant 1554 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1290 = rxvt_fontprop::unset; 1555 = rxvt_fontprop::unset;
1556 force_prop = false;
1291 1557
1292 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1558 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1293 FONT_UNREF (*i); 1559 (*i)->unref ();
1294 1560
1295 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1561 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1296 delete *p; 1562 delete *p;
1297 1563
1298 free (fontdesc); fontdesc = 0; 1564 free (fontdesc); fontdesc = 0;
… …
1300 fonts.clear (); 1566 fonts.clear ();
1301 1567
1302 fallback = fallback_fonts; 1568 fallback = fallback_fonts;
1303} 1569}
1304 1570
1571void
1572rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1573{
1574 font->set_term (term);
1575
1576 font->cs = cs;
1577 font->loaded = false;
1578}
1579
1305rxvt_font * 1580rxvt_font *
1306rxvt_fontset::new_font (const char *name, codeset cs) 1581rxvt_fontset::new_font (const char *name, codeset cs)
1307{ 1582{
1308 rxvt_font *f; 1583 rxvt_font *f;
1309 1584
1310 if (!name || !*name) 1585 if (!name || !*name)
1311 { 1586 {
1312 name = ""; 1587 name = "";
1313 f = new rxvt_font_default (this); 1588 f = new rxvt_font_default (this);
1314 } 1589 }
… …
1325 f = new rxvt_font_x11; 1600 f = new rxvt_font_x11;
1326 } 1601 }
1327 else 1602 else
1328 f = new rxvt_font_x11; 1603 f = new rxvt_font_x11;
1329 1604
1330 f->set_term (r);
1331 f->set_name (strdup (name)); 1605 f->set_name (strdup (name));
1332 1606 prepare_font (f, cs);
1333 f->cs = cs;
1334 f->loaded = false;
1335 1607
1336 return f; 1608 return f;
1337} 1609}
1338 1610
1339///////////////////////////////////////////////////////////////////////////// 1611/////////////////////////////////////////////////////////////////////////////
1612
1613void
1614rxvt_fontset::push_font (rxvt_font *font)
1615{
1616 // the fontCount index is reserved for the overflow font, it is only
1617 // necessary when we get fontCount or more fonts, as they cannot be
1618 // represented in the rendition.
1619 if (fonts.size () == fontCount)
1620 {
1621 rxvt_font *f = new rxvt_font_overflow (this);
1622
1623 prepare_font (f, CS_UNICODE);
1624 fonts.push_back (f);
1625 }
1626
1627 fonts.push_back (font);
1628}
1340 1629
1341void 1630void
1342rxvt_fontset::add_fonts (const char *desc) 1631rxvt_fontset::add_fonts (const char *desc)
1343{ 1632{
1344 if (desc) 1633 if (desc)
… …
1346 char buf[512]; 1635 char buf[512];
1347 const char *end; 1636 const char *end;
1348 1637
1349 do 1638 do
1350 { 1639 {
1351 while (*desc <= ' ') desc++; 1640 while (*desc && *desc <= ' ')
1641 desc++;
1352 1642
1353 codeset cs = CS_UNICODE; 1643 codeset cs = CS_UNICODE;
1354 1644
1355 if (*desc == '[') 1645 if (*desc == '[')
1356 { 1646 {
… …
1372 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1662 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1373 else 1663 else
1374 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1664 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1375 1665
1376 desc++; 1666 desc++;
1377 while (*desc <= ' ') desc++; 1667 while (*desc <= ' ' && *desc) desc++;
1378 } 1668 }
1379 1669
1380 end = strchr (desc, ','); 1670 end = strchr (desc, ',');
1381 if (!end) 1671 if (!end)
1382 end = desc + strlen (desc); 1672 end = desc + strlen (desc);
1383 1673
1384 if (end - desc < 511) 1674 if (end - desc < 511)
1385 { 1675 {
1386 strncpy (buf, desc, end - desc); 1676 memcpy (buf, desc, end - desc);
1387 buf[end - desc] = 0; 1677 buf[end - desc] = 0;
1388 1678
1389 fonts.push_back (new_font (buf, cs)); 1679 push_font (new_font (buf, cs));
1390 } 1680 }
1391 else 1681 else
1392 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1682 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1393 1683
1394 desc = end + 1; 1684 desc = end + 1;
1395 } 1685 }
1396 while (*end); 1686 while (*end);
1397 } 1687 }
… …
1406 if (fonts[i]->loaded) 1696 if (fonts[i]->loaded)
1407 return true; 1697 return true;
1408 1698
1409 fonts[i]->loaded = true; 1699 fonts[i]->loaded = true;
1410 1700
1411 if (!fonts[i]->load (prop)) 1701 if (!fonts[i]->load (prop, force_prop))
1412 { 1702 {
1413 fonts[i]->cs = CS_UNKNOWN; 1703 fonts[i]->cs = CS_UNKNOWN;
1414 return false; 1704 return false;
1415 } 1705 }
1416 1706
… …
1422{ 1712{
1423 clear (); 1713 clear ();
1424 1714
1425 fontdesc = strdup (desc); 1715 fontdesc = strdup (desc);
1426 1716
1427 fonts.push_back (new_font (0, CS_UNICODE)); 1717 push_font (new_font (0, CS_UNICODE));
1428 realize_font (0); 1718 realize_font (0);
1429 1719
1430 add_fonts (desc); 1720 add_fonts (desc);
1431 1721
1432 return true; 1722 return true;
… …
1441 1731
1442 return -1; 1732 return -1;
1443} 1733}
1444 1734
1445int 1735int
1446rxvt_fontset::find_font (unicode_t unicode) 1736rxvt_fontset::find_font_idx (unicode_t unicode)
1447{ 1737{
1448 if (unicode >= 1<<20) 1738 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1739 if (unicode > 0x1fffff)
1449 return 0; 1740 return 0;
1450 1741
1451 unicode_t hi = unicode >> 8; 1742 unicode_t hi = unicode >> 8;
1452 1743
1453 if (hi < fmap.size () 1744 if (hi < fmap.size ())
1454 && fmap[hi] 1745 if (pagemap *pm = fmap[hi])
1455 && (*fmap[hi])[unicode & 0xff] != 0xff) 1746 if ((*pm)[unicode & 0xff] != 0xff)
1456 return (*fmap[hi])[unicode & 0xff]; 1747 return (*pm)[unicode & 0xff];
1457 1748
1458 unsigned int i; 1749 unsigned int i;
1459 1750
1460 for (i = 0; i < fonts.size (); i++) 1751 for (i = 0; i < fonts.size (); i++)
1461 { 1752 {
… …
1466 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1757 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1467 goto next_font; 1758 goto next_font;
1468 1759
1469 if (!realize_font (i)) 1760 if (!realize_font (i))
1470 goto next_font; 1761 goto next_font;
1762
1763 if (prop.ascent != rxvt_fontprop::unset)
1764 max_it (f->ascent, prop.ascent);
1471 } 1765 }
1472 1766
1473 if (f->cs == CS_UNKNOWN) 1767 if (f->cs == CS_UNKNOWN)
1474 goto next_font; 1768 goto next_font;
1475 1769
1476 bool careful; 1770 bool careful;
1477 if (f->has_char (unicode, &prop, careful)) 1771 if (f->has_char (unicode, &prop, careful))
1478 { 1772 {
1479 if (careful) 1773 i = (i << 1) | careful;
1480 i |= 128;
1481 1774
1482 goto found; 1775 goto found;
1483 } 1776 }
1484 1777
1485 next_font: 1778 next_font:
1486 if (i == fonts.size () - 1) 1779 if (i == fonts.size () - 1)
1487 { 1780 {
1781 // compose characters are handled by the default font, unless another font takes over
1782 // we do not go via the fallback list for speed reasons.
1783 if (IS_COMPOSE (unicode))
1784 return 0;
1785
1488 if (fallback->name) 1786 if (fallback->name)
1489 { 1787 {
1490 // search through the fallback list 1788 // search through the fallback list
1491 fonts.push_back (new_font (fallback->name, fallback->cs)); 1789 push_font (new_font (fallback->name, fallback->cs));
1492 fallback++; 1790 fallback++;
1493 } 1791 }
1494 else 1792 else
1495 { 1793 {
1496 // try to find a new font. 1794 // try to find a new font.
… …
1498 // way to configure this and xft is easier to hack in, 1796 // way to configure this and xft is easier to hack in,
1499 // while x11 has more framework in place already. 1797 // while x11 has more framework in place already.
1500 // TODO: this is a real resource hog, xft takes ages(?) 1798 // TODO: this is a real resource hog, xft takes ages(?)
1501#if XFT && USE_SLOW_LOOKUP 1799#if XFT && USE_SLOW_LOOKUP
1502 // grab the first xft font that seems suitable 1800 // grab the first xft font that seems suitable
1801 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1503 FcPattern *p = FcPatternCreate (); 1802 FcPattern *p = FcPatternCreate ();
1504 1803
1505 FcCharSet *s = FcCharSetCreate (); 1804 FcCharSet *s = FcCharSetCreate ();
1506 FcCharSetAddChar (s, unicode); 1805 FcCharSetAddChar (s, unicode);
1507 FcPatternAddCharSet (p, FC_CHARSET, s); 1806 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1514 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1813 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1515 FcPatternAddBool (p, FC_MINSPACE, 1); 1814 FcPatternAddBool (p, FC_MINSPACE, 1);
1516 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1815 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1517 1816
1518 XftResult result; 1817 XftResult result;
1519 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1818 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1520 1819
1521 FcPatternDestroy (p); 1820 FcPatternDestroy (p);
1522 1821
1523 if (match) 1822 if (match)
1524 { 1823 {
… …
1527 FcPatternDestroy (match); 1826 FcPatternDestroy (match);
1528 1827
1529 if (find_font (font) < 0) 1828 if (find_font (font) < 0)
1530 { 1829 {
1531 char fontname[4096]; 1830 char fontname[4096];
1532 sprintf (fontname, "xft:%-.4090s", font); 1831 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1533 1832
1534 fonts.push_back (new_font (fontname, CS_UNICODE)); 1833 push_font (new_font (fontname, CS_UNICODE));
1535 } 1834 }
1536 1835
1537 free (font); 1836 free (font);
1538 } 1837 }
1539#endif 1838#endif
… …
1551 while (hi >= fmap.size ()) 1850 while (hi >= fmap.size ())
1552 fmap.push_back (0); 1851 fmap.push_back (0);
1553 1852
1554 if (!fmap[hi]) 1853 if (!fmap[hi])
1555 { 1854 {
1556 fmap[hi] = (pagemap *)new pagemap; 1855 fmap[hi] = new pagemap;
1557 memset (fmap[hi], 0xff, sizeof (pagemap)); 1856 memset (fmap[hi], 0xff, sizeof (pagemap));
1558 } 1857 }
1559 1858
1560 (*fmap[hi])[unicode & 0xff] = i; 1859 (*fmap[hi])[unicode & 0xff] = i;
1561 } 1860 }
1562 1861
1563 return i; 1862 return i;
1564} 1863}
1565 1864
1566
1567

Diff Legend

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