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

Diff Legend

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