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.3 by root, Sun Aug 15 21:55:45 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 "rxvtfont.h" 25#include "rxvtfont.h"
25 26
26#include <cstdlib> 27#include <stdlib.h>
27 28
28#define DISPLAY r->display->display 29#include <inttypes.h>
29#define TGC r->TermWin.gc
30 30
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
34
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
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
31const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
32 codeset cs; 45 codeset cs;
33 const char *name; 46 const char *name;
34} fallback_fonts[] = { 47} fallback_fonts[] = {
35 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
36 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
37 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 50 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
38 51
39#if ENCODING_EU 52#if ENCODING_EU
40 // cyrillic 53 // cyrillic
41 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 54 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
42 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 55 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
43 56
44 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 57 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
45 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 58 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
46 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 59 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
47 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 60 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
48 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 61 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
52 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, 65 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" },
53 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, 66 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" },
54 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 67 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
55 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 68 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
56 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 69 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
70
71# if XFT
72 { CS_KOI8_U, "xft::lang=ru" },
73
74 { CS_ISO8859_5, "xft::lang=ru" },
75 { CS_ISO8859_6, "xft::lang=ar" },
76 { CS_ISO8859_7, "xft::lang=el" },
77 { CS_ISO8859_8, "xft::lang=he" },
78 { CS_ISO8859_9, "xft::lang=tr" },
79 { CS_ISO8859_10, "xft::lang=se" },
80 { CS_ISO8859_11, "xft::lang=th" },
81# endif
57#endif 82#endif
58 83
59 // japanese 84 // japanese
60#if ENCODING_JP || ENCODING_JP_EXT 85#if ENCODING_JP || ENCODING_JP_EXT
61# if XFT 86# if XFT
62 // prefer xft for complex scripts 87 // prefer xft for complex scripts
88 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
63 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, 89 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
90 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
91 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
64# endif 92# endif
65 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
66 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
67 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 95 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
68 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 96 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
69 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 97 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
70 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 98 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
71#endif 99#endif
72 100
73#if ENCODING_CN || ENCODING_CN_EXT 101#if ENCODING_ZH || ENCODING_ZH_EXT
74# 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" },
75 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 106 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
76 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 107 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
77 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 108 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
78 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 109 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
110 { CS_GB2312_1980_0, "xft::lang=zh" },
79# endif 111# endif
112 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
80 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 113 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
81 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 114 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
82 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 115 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
116 { CS_GB2312_1980_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
83 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, 117 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
84 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, 118 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
85 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, 119 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
86 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, 120 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
87 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, 121 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
… …
89 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, 123 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
90 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, 124 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
91 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, 125 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
92#endif 126#endif
93 127
128#if ENCODING_KR
129 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
130 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
131# if XFT
132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
134# endif
135#endif
136
137 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
94#if XFT 138#if XFT
139 { CS_UNICODE, "xft:DejaVu Sans Mono:antialias=false:autohint=true" },
140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
142 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
143
144 // FreeMono is usually uglier than x fonts, so try after the others
95 { CS_UNICODE, "xft:Andale Mono" }, 145 { CS_UNICODE, "xft:FreeMono:autohint=true" },
96 { CS_UNICODE, "xft:Arial Unicode MS" },
97#endif 146#endif
98 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 147
99 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 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
100 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 150 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
101 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 151 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
102#if XFT
103 // FreeMono is usually uglier than x fonts, so try last only.
104 //{ CS_UNICODE, "xft:FreeMono" },
105#endif
106
107 { CS_UNKNOWN, 0 } 152 { CS_UNKNOWN, 0 }
108}; 153};
109 154
155// these characters are used to guess the font height and width
156// pango uses a similar algorithm and doesn't trust the font either.
157static uint32_t extent_test_chars[] = {
158 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
159 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
160 0x304c, 0x672c, // が本
161 0x1f600, // 😀
162};
163
164#define dTermDisplay Display *disp = term->dpy
165#define dTermGC GC gc = term->gc
166
110///////////////////////////////////////////////////////////////////////////// 167/////////////////////////////////////////////////////////////////////////////
111
112#if XFT
113rxvt_drawable::~rxvt_drawable ()
114{
115 if (xftdrawable)
116 XftDrawDestroy (xftdrawable);
117}
118
119rxvt_drawable::operator XftDraw *()
120{
121 if (!xftdrawable)
122 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
123
124 return xftdrawable;
125}
126#endif
127
128/////////////////////////////////////////////////////////////////////////////
129
130static void *enc_buf;
131static uint32_t enc_len;
132
133static inline void *
134get_enc_buf (uint32_t len)
135{
136 if (len > enc_len)
137 {
138 free (enc_buf);
139 enc_buf = malloc (len);
140 enc_len = len;
141 }
142
143 return enc_buf;
144}
145 168
146static const char * 169static const char *
147enc_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)
148{ 171{
149 uint8_t *buf = (uint8_t *)get_enc_buf (len); 172 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
173 uint8_t *res = buf;
150 174
151 while (len--) 175 while (len--)
152 { 176 {
153 uint32_t c = FROM_UNICODE (cs, *text++); 177 uint32_t c = FROM_UNICODE (cs, *text++);
154 178
… …
159 } 183 }
160 184
161 *buf++ = c; 185 *buf++ = c;
162 } 186 }
163 187
164 return (const char *)enc_buf; 188 return (const char *)res;
165} 189}
166 190
167static const XChar2b * 191static const XChar2b *
168enc_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)
169{ 193{
170 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 194 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
195 XChar2b *res = buf;
171 196
172 while (len--) 197 while (len--)
173 { 198 {
174 uint32_t c = FROM_UNICODE (cs, *text++); 199 uint32_t c = FROM_UNICODE (cs, *text++);
175 200
… …
182 buf->byte1 = c >> 8; 207 buf->byte1 = c >> 8;
183 buf->byte2 = c; 208 buf->byte2 = c;
184 buf++; 209 buf++;
185 } 210 }
186 211
187 return (XChar2b *)enc_buf; 212 return res;
188} 213}
189 214
190///////////////////////////////////////////////////////////////////////////// 215/////////////////////////////////////////////////////////////////////////////
191 216
217rxvt_font::rxvt_font ()
218: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
219{
220}
221
192void 222void
223rxvt_font::set_name (char *name_)
224{
225 if (name == name_)
226 return;
227
228 if (name) free (name); // let the compiler optimize
229 name = name_;
230}
231
232void
193rxvt_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
194{ 234{
195 if (color == Color_bg) 235 dTermDisplay;
196 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);
197 else if (color >= 0) 240 else if (color >= 0)
198 { 241 {
199#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
200 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258
201#else 259#else
202 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 260 XSetForeground (disp, gc, term->pix_colors[color]);
203 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 261 XFillRectangle (disp, d, gc, x, y, w, h);
204#endif 262#endif
205 } 263 }
206} 264}
207 265
208#include "table/linedraw.h" 266/////////////////////////////////////////////////////////////////////////////
209 267
210struct rxvt_font_default : rxvt_font { 268struct rxvt_font_default : rxvt_font
269{
270 struct rxvt_fontset *fs;
271
272 rxvt_font_default (rxvt_fontset *fs)
273 : rxvt_font ()
274 {
275 this->fs = fs;
276 }
211 277
212 rxvt_fontprop properties () 278 rxvt_fontprop properties ()
213 { 279 {
214 rxvt_fontprop p; 280 rxvt_fontprop p;
215 281
216 p.width = p.height = 1; 282 p.width = p.height = 1;
283 p.ascent = rxvt_fontprop::unset;
217 p.weight = rxvt_fontprop::medium; 284 p.weight = rxvt_fontprop::medium;
218 p.slant = rxvt_fontprop::roman; 285 p.slant = rxvt_fontprop::roman;
219 286
220 return p; 287 return p;
221 } 288 }
222 289
223 bool load (const rxvt_fontprop &prop) 290 bool load (const rxvt_fontprop &prop, bool force_prop)
224 { 291 {
225 width = 1; height = 1; 292 width = 1; height = 1;
226 ascent = 1; descent = 0; 293 ascent = 1; descent = 0;
227 294
228 set_name (strdup ("built-in pseudofont")); 295 set_name (strdup ("built-in support font"));
229 296
230 return true; 297 return true;
231 } 298 }
232 299
233 bool has_codepoint (unicode_t unicode) 300 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
234 { 301 {
302 careful = false;
303
235 if (unicode <= 0x001f) 304 if (unicode <= 0x001f)
236 return true; 305 return true;
237 306
238 if (unicode <= 0x007f) 307 if (unicode <= 0x007f)
239 return false; 308 return false;
240 309
241 if (unicode <= 0x009f) 310 if (unicode <= 0x009f)
242 return true; 311 return true;
243 312
313#ifdef BUILTIN_GLYPHS
244 if (unicode >= 0x2500 && unicode <= 0x259f) 314 if (unicode >= 0x2500 && unicode <= 0x259f &&
315 !term->option (Opt_skipBuiltinGlyphs))
245 return true; 316 return true;
317#endif
246 318
247 if (IS_COMPOSE (unicode)) 319 // we do not check for IS_COMPOSE here, as this would
248 return true; 320 // rob other fonts from taking over.
249 321
250 switch (unicode) 322 switch (unicode)
251 { 323 {
252 case ZERO_WIDTH_CHAR: 324 case ZERO_WIDTH_CHAR:
325 case NOCHAR:
253 return true; 326 return true;
254 } 327 }
255 328
256 return false; 329 return false;
257 } 330 }
… …
264void 337void
265rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 338rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
266 const text_t *text, int len, 339 const text_t *text, int len,
267 int fg, int bg) 340 int fg, int bg)
268{ 341{
342 dTermDisplay;
343 dTermGC;
344
269 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);
270 346
271 XSetForeground (d.display->display, TGC, r->pix_colors[fg]); 347 XSetForeground (disp, gc, term->pix_colors[fg]);
272 348
273 while (len--) 349 while (len)
274 { 350 {
351 const text_t *tp = text;
352 text_t t = *tp;
353
354 while (++text, --len && *text == NOCHAR)
355 ;
356
275#if ENABLE_COMBINING 357#if ENABLE_COMBINING
276 compose_char *cc; 358 compose_char *cc;
277#endif 359#endif
278 text_t t = *text++; 360 int width = text - tp;
361 int fwidth = term->fwidth * width;
279 362
363#ifdef BUILTIN_GLYPHS
280 if (0x2500 <= t && t <= 0x259f) 364 if (0x2500 <= t && t <= 0x259f)
281 { 365 {
366# include "table/linedraw.h"
282 uint16_t offs = linedraw_offs[t - 0x2500]; 367 uint16_t offs = linedraw_offs[t - 0x2500];
283 uint32_t *a = linedraw_command + (offs >> 4); 368 uint32_t *a = linedraw_command + (offs >> 4);
284 uint32_t *b = a + (offs & 15); 369 uint32_t *b = a + (offs & 15);
285 370
286 int W = r->TermWin.fwidth; 371 int W = fwidth;
287 int H = r->TermWin.fheight; 372 int H = term->fheight;
288 373
289 int x_[16]; 374 int x_[16];
290 int y_[16]; 375 int y_[16];
291 376
292 for (int i = 0; i <= 8; i++) 377 for (int i = 0; i <= 8; i++)
… …
300 385
301 XGCValues gcv; 386 XGCValues gcv;
302 387
303 gcv.cap_style = CapButt; 388 gcv.cap_style = CapButt;
304 gcv.line_width = 0; 389 gcv.line_width = 0;
305 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 390 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
306 391
307 while (a < b) 392 while (a < b)
308 { 393 {
309 uint32_t command = *a++; 394 uint32_t command = *a++;
310 395
… …
317 int y2 = y_[(command >> 0) & 15]; 402 int y2 = y_[(command >> 0) & 15];
318 403
319 switch (op) 404 switch (op)
320 { 405 {
321 case 0: // line 406 case 0: // line
322 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 407 XDrawLine (disp, d, gc, x1, y1, x2, y2);
323 break; 408 break;
324 409
325 case 1: // rectangle, possibly stippled 410 case 1: // rectangle, possibly stippled
326 if (a) 411 if (a)
327 { 412 {
328 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 413 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
329 414
330 gcv.fill_style = FillStippled; 415 gcv.fill_style = FillStippled;
331 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 416 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
332 gcv.ts_x_origin = x; 417 gcv.ts_x_origin = x;
333 gcv.ts_y_origin = y; 418 gcv.ts_y_origin = y;
334 419
335 XChangeGC (d.display->display, TGC, 420 XChangeGC (disp, gc,
336 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 421 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
337 &gcv); 422 &gcv);
338 } 423 }
339 424
340 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);
341 426
342 if (a) 427 if (a)
343 { 428 {
344 XFreePixmap (d.display->display, gcv.stipple); 429 XFreePixmap (disp, gcv.stipple);
345 gcv.stipple = 0; 430 gcv.stipple = 0;
346 gcv.fill_style = FillSolid; 431 gcv.fill_style = FillSolid;
347 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 432 XChangeGC (disp, gc, GCFillStyle, &gcv);
348 } 433 }
349 break; 434 break;
350 case 2: // arc 435 case 2: // arc
351 XDrawArc (d.display->display, d, TGC, 436 XDrawArc (disp, d, gc,
352 x1 - W/2, y1 - H/2, W-1, H-1, 437 x1 - W/2, y1 - H/2, W-1, H-1,
353 (a - 1) * 90*64, (b - 1) * 90*64); 438 (a - 1) * 90*64, (b - 1) * 90*64);
354 break; 439 break;
355 } 440 }
356 } 441 }
357 } 442 }
443#else
444 if (0)
445 ;
446#endif
358#if ENABLE_COMBINING 447#if ENABLE_COMBINING
359 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 448 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
360 { 449 {
450 min_it (width, 2); // we only support wcwidth up to 2
451 text_t chrs[2];
452 chrs [1] = NOCHAR;
453
454 *chrs = cc->c1;
361 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
362 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
457
363 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
364 { 459 {
460 bool careful;
461
365 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
366 rxvt_font *f2 = f1->has_codepoint (cc->c2) 463 *chrs = cc->c2;
464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
367 ? f1 465 ? f1
368 : (*fs)[fs->find_font (cc->c2)]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
369 467
370 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
371 } 469 }
372 } 470 }
373#endif 471#endif
374 else 472 else
375 switch (t) 473 switch (t)
376 { 474 {
475 case '\t':
377 case ZERO_WIDTH_CHAR: 476 case ZERO_WIDTH_CHAR:
477 case NOCHAR:
378 break; 478 break;
379 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
380 default: 489 default:
381 int w = 0;
382 while (len > 0 && *text == NOCHAR)
383 {
384 ++text;
385 --len;
386 w += r->TermWin.fwidth;
387 }
388
389 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, 490 XDrawRectangle (disp, d, gc, x + 2, y + 2,
390 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); 491 fwidth - 4, term->fheight - 4);
391 x += w;
392 } 492 }
393 493
394 x += r->TermWin.fwidth; 494 x += fwidth;
495 }
496}
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;
395 } 550 }
396} 551 }
552};
397 553
398///////////////////////////////////////////////////////////////////////////// 554/////////////////////////////////////////////////////////////////////////////
399 555
400struct rxvt_font_x11 : rxvt_font { 556struct rxvt_font_x11 : rxvt_font
557{
401 rxvt_font_x11 () { f = 0; } 558 rxvt_font_x11 () { f = 0; }
402 559
403 void clear (); 560 void clear ();
404 561
405 rxvt_fontprop properties (); 562 rxvt_fontprop properties ();
406 563
407 bool load (const rxvt_fontprop &prop); 564 bool load (const rxvt_fontprop &prop, bool force_prop);
408 565
409 bool has_codepoint (unicode_t unicode); 566 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
410 567
411 void draw (rxvt_drawable &d, int x, int y, 568 void draw (rxvt_drawable &d, int x, int y,
412 const text_t *text, int len, 569 const text_t *text, int len,
413 int fg, int bg); 570 int fg, int bg);
414 571
572 bool slow; // whether this is a proportional font or has other funny characteristics
415 XFontStruct *f; 573 XFontStruct *f;
416 codeset cs;
417 bool enc2b, encm; 574 bool enc2b, encm;
418 575
419 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 576 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
420 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);
421 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 578 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
422 bool set_properties (rxvt_fontprop &p, const char *name); 579 bool set_properties (rxvt_fontprop &p, const char *name);
423}; 580};
424 581
425char * 582char *
426rxvt_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
427{ 584{
428 unsigned long value; 585 unsigned long value;
429 586
430 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 587 if (XGetFontProperty (f, property, &value))
431 return XGetAtomName (DISPLAY, value); 588 return XGetAtomName (term->dpy, value);
432 else 589 else
433 return rxvt_strdup (repl); 590 return repl ? strdup (repl) : 0;
434} 591}
435 592
436rxvt_fontprop 593rxvt_fontprop
437rxvt_font_x11::properties () 594rxvt_font_x11::properties ()
438{ 595{
… …
442} 599}
443 600
444bool 601bool
445rxvt_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)
446{ 603{
447 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;
448 p.height = height; 607 p.height = height;
608 p.ascent = rxvt_fontprop::unset;
449 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;
450 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;
451 611
452 return true; 612 return true;
453} 613}
454 614
455bool 615bool
456rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 616rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
457{ 617{
458 unsigned long height; 618 unsigned long height;
619
620#if 0
459 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 621 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
460 return false; 622 return false;
623#else
624 height = f->ascent + f->descent;
625#endif
461 626
462 unsigned long avgwidth; 627 unsigned long avgwidth;
463 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 628 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
464 avgwidth = 0; 629 avgwidth = 0;
465 630
466 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 631 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
467 char *slant = get_property (f, "SLANT", "r"); 632 char *slant = get_property (f, term->xa [XA_SLANT], "r");
468 633
469 set_properties (p, height, weight, slant, avgwidth); 634 set_properties (p, height, weight, slant, avgwidth);
470 635
471 free (weight); 636 free (weight);
472 free (slant); 637 free (slant);
473 638
639 p.ascent = f->ascent;
640
474 return true; 641 return true;
475} 642}
476 643
477bool 644bool
478rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 645rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
479{ 646{
647 dTermDisplay;
480 int slashes = 0; 648 int slashes = 0;
481 const char *comp[13]; 649 const char *comp[13];
482 650
483 for (const char *c = name; *c; c++) 651 for (const char *c = name; *c; c++)
484 if (*c == '-') 652 if (*c == '-')
… …
492 if (slashes >= 13 660 if (slashes >= 13
493 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 661 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
494 && (*comp[11] >= '0' && *comp[11] <= '9')) 662 && (*comp[11] >= '0' && *comp[11] <= '9'))
495 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]));
496 664
497 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 665 XFontStruct *f = XLoadQueryFont (disp, name);
498 666
499 if (f) 667 if (f)
500 { 668 {
501 // 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
502 // (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).
503 // in that case, just return garbage. 671 // in that case, just return garbage.
504 bool ret = set_properties (p, f); 672 bool ret = set_properties (p, f);
505 XFreeFont (DISPLAY, f); 673 XFreeFont (disp, f);
506 return ret; 674 return ret;
507 } 675 }
508 else 676 else
509 return false; 677 return false;
510} 678}
511 679
512// fix the size of scalable fonts 680// fix the size of scalable fonts
513static void 681static bool
514fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop) 682replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
515{ 683{
516 int slashes = 0; 684 int slashes = 0;
517 const char *size; 685 const char *field, *end;
518 686
519 for (const char *c = name; *c; c++) 687 for (const char *c = name; *c; c++)
520 if (*c == '-') 688 if (*c == '-')
521 { 689 {
522 if (slashes == 6) 690 if (slashes == index)
523 size = c + 1; 691 field = c + 1;
692
693 if (slashes == index + 1)
694 end = c;
524 695
525 if (++slashes >= 13) 696 if (++slashes >= 13)
526 break; 697 break;
527 } 698 }
528 699
529 if (slashes >= 13 && size[0] == '0') 700 if (slashes >= 13 && (!old || *field == old))
530 { 701 {
531 strncpy (buf, name, size - name); 702 size_t len = field - name;
532 buf += size - name; 703 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
533 buf += sprintf (buf, "%d", prop.height); 704 memcpy (*ptr, name, len);
534 strcpy (buf, size + 1); 705 strcpy (*ptr + len, replace);
706 strcat (*ptr, end);
707
708 return true;
535 } 709 }
536 else 710 else
537 strcpy (buf, name); 711 {
712 *ptr = strdup (name);
713
714 return false;
715 }
538} 716}
539 717
540bool 718bool
541rxvt_font_x11::load (const rxvt_fontprop &prop) 719rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
542{ 720{
721 dTermDisplay;
722
543 clear (); 723 clear ();
724
725 char field_str[64]; // enough for 128 bits
726
727 // first morph the font if required
728 if (force_prop)
729 {
730 char *fname;
731
732 if (name[0] != '-')
733 {
734 f = XLoadQueryFont (disp, name);
735
736 if (!f)
737 return false;
738
739 char *new_name = get_property (f, XA_FONT, 0);
740
741 if (new_name)
742 set_name (new_name);
743 else
744 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
745
746 XFreeFont (disp, f);
747 f = 0;
748 }
749
750 if (prop.weight != rxvt_fontprop::unset)
751 {
752 replace_field (&fname, name, 2, 0,
753 prop.weight < rxvt_fontprop::bold
754 ? "medium" : "bold");
755 set_name (fname);
756 }
757
758 if (prop.slant != rxvt_fontprop::unset)
759 {
760 replace_field (&fname, name, 3, 0,
761 prop.slant < rxvt_fontprop::italic
762 ? "r" : "i"); // TODO: handle "o"blique, too
763 set_name (fname);
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 ()
775 {
776 name = 0;
777 diff = 0x7fffffff;
778 }
779
780 font_weight () { clear (); }
781 ~font_weight () { free (name); }
782 };
544 783
545 char **list; 784 char **list;
546 int count; 785 int count;
547 list = XListFonts (DISPLAY, name, 1024, &count); 786 list = XListFonts (disp, name, 4000, &count);
787
548 set_name (0); 788 set_name (0);
549 789
550 if (!list) 790 if (!list)
551 return false; 791 return false;
552 792
553 int bestdiff = 0x7fffffff; 793 font_weight *fonts = new font_weight[count];
794
554 for (int i = 0; i < count; i++) 795 for (int i = 0; i < count; i++)
555 { 796 {
556 rxvt_fontprop p; 797 rxvt_fontprop p;
557 char fname[1024]; 798 char *fname;
558 fix_scalable (fname, list[i], prop);
559 799
800 int diff = 0;
801
802 if (replace_field (&fname, list[i], 6, '0', field_str))
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 }
810
560 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);
561 continue; 817 continue;
562
563 if (p.height > prop.height) // weed out too large fonts
564 continue;
565
566 int diff = (prop.height - p.height) * 32
567 + abs (prop.weight - p.weight)
568 + abs (prop.slant - p.slant );
569
570 if (!name // compare against best found so far
571 || diff < bestdiff)
572 { 818 }
573 set_name (strdup (fname)); 819
574 bestdiff = diff; 820 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
575 } 821 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
822 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
823 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
824
825 fonts[i].name = fname;
826 fonts[i].diff = diff;
576 } 827 }
577 828
578 XFreeFontNames (list); 829 XFreeFontNames (list);
579 830
580 if (!name) 831 // this loop only iterates when the guessed font-size is too small
581 return false; 832 for (;;)
833 {
834 font_weight *best = fonts;
582 835
583 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;
584 860
585 if (!f) 861 if (!f)
586 return false; 862 return false;
587 863
588 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 864 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
589 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;
590 868
591 if (registry && encoding) 869 if (registry && encoding)
592 { 870 {
593 char charset[64]; 871 char charset[64];
594 snprintf (charset, 64, "%s-%s", registry, encoding); 872 snprintf (charset, 64, "%s-%s", registry, encoding);
595 873
596 cs = codeset_from_name (charset); 874 cs = codeset_from_name (charset);
597 } 875
598 else 876 if (cs == CS_UNKNOWN)
877 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
599 { 878 }
879
880 free (registry);
881 free (encoding);
882
883 if (cs == CS_UNKNOWN)
884 {
600 const char *charset = get_property (f, "FONT", 0); 885 char *value = get_property (f, XA_FONT, 0);
886 const char *charset = value;
601 887
602 if (!charset) 888 if (!charset)
603 charset = name; 889 charset = name;
604 890
605 int count = 13; 891 int count = 13;
606 while (*charset) 892 while (*charset)
607 if (*charset++ == '-' && !--count) 893 if (*charset++ == '-' && !--count)
608 break; 894 break;
609 895
610 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)
611 } 904 {
612 905 clear ();
613 free (registry); 906 return false;
614 free (encoding); 907 }
615 908
616 if (cs == CS_UNICODE) 909 if (cs == CS_UNICODE)
617 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
618 911
619 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 912 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
620 enc2b = encm || f->max_char_or_byte2 > 255; 913 enc2b = encm || f->max_char_or_byte2 > 255;
621 914
622 ascent = f->ascent;
623 descent = f->descent;
624 height = ascent + descent;
625
626 slow = false; 915 slow = false;
627 916
917#if 1 // only used for slow detection, TODO optimize
628 if (f->min_bounds.width == f->max_bounds.width) 918 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
629 width = f->min_bounds.width;
630 else if (f->per_char == NULL)
631 width = f->max_bounds.width; 919 width = f->max_bounds.width;
632 else 920 else
633 { 921 {
634 slow = true; 922 slow = true;
635 923
636 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;
637 925
638 if (encm) 926 if (encm)
639 N += (f->max_byte1 - f->min_byte1) 927 N += (f->max_byte1 - f->min_byte1)
640 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 928 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
641 929
642 while (N) 930 while (N)
643 { 931 {
644 if (f->per_char[N].width > width) 932 if (f->per_char[N].width > width)
645 width = f->per_char[N].width; 933 width = f->per_char[N].width;
646 934
647 --N; 935 --N;
648 } 936 }
649 } 937 }
938#endif
650 939
651 if (cs == CS_UNKNOWN) 940 width = 1;
941
942 for (uint32_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
943 {
944 if (FROM_UNICODE (cs, *t) == NOCHAR)
945 continue;
946
947 // ignore characters we wouldn't use anyways
948 bool careful;
949 if (!has_char (*t, &prop, careful))
950 continue;
951
952 // the casts are needed in C++11 (see 8.5.1)
953 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
954
955 XCharStruct g;
956 int dir_ret, asc_ret, des_ret;
957 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
958
959 int wcw = WCWIDTH (*t);
960 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
961
962 if (width < g.width) width = g.width;
652 { 963 }
653 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
654 964
965#if 0 // do it per-character
966 if (prop && width > prop->width)
967 {
655 clear (); 968 clear ();
656
657 return false; 969 return false;
658 } 970 }
971#endif
659 972
660 return true; 973 return true;
661} 974}
662 975
663void 976void
664rxvt_font_x11::clear () 977rxvt_font_x11::clear ()
665{ 978{
666 if (f) 979 if (f)
667 { 980 {
668 XFreeFont (DISPLAY, f); 981 XFreeFont (term->dpy, f);
669 f = 0; 982 f = 0;
670 } 983 }
671} 984}
672 985
673bool 986bool
674rxvt_font_x11::has_codepoint (unicode_t unicode) 987rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
675{ 988{
989 careful = false;
990
676 uint32_t ch = FROM_UNICODE (cs, unicode); 991 uint32_t ch = FROM_UNICODE (cs, unicode);
677 992
678 if (ch == NOCHAR) 993 if (ch == NOCHAR)
679 return false; 994 return false;
680 995
681 /* check wether the character exists in _this_ font. horrible. */ 996 /* check whether the character exists in _this_ font. horrible. */
682 XCharStruct *xcs; 997 XCharStruct *xcs;
683 998
684 if (encm) 999 if (encm)
685 { 1000 {
686 unsigned char byte1 = ch >> 8; 1001 unsigned char byte1 = ch >> 8;
… …
688 1003
689 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 1004 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
690 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 1005 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
691 return false; 1006 return false;
692 1007
693 if (!f->per_char) 1008 if (f->per_char)
694 return true; 1009 {
695
696 int D = f->max_char_or_byte2 - f->min_char_or_byte2 + 1; 1010 int D = f->max_char_or_byte2 - f->min_char_or_byte2 + 1;
697 int N = (byte1 - f->min_byte1) * D + byte2 - f->min_char_or_byte2; 1011 int N = (byte1 - f->min_byte1) * D + byte2 - f->min_char_or_byte2;
698 1012
699 xcs = f->per_char + N; 1013 xcs = f->per_char + N;
1014 }
1015 else
1016 xcs = &f->max_bounds;
700 } 1017 }
701 else 1018 else
702 { 1019 {
703 if (ch < f->min_char_or_byte2 || ch > f->max_char_or_byte2) 1020 if (ch < f->min_char_or_byte2 || ch > f->max_char_or_byte2)
704 return false; 1021 return false;
705 1022
706 if (!f->per_char) 1023 if (f->per_char)
707 return true;
708
709 xcs = f->per_char + (ch - f->min_char_or_byte2); 1024 xcs = f->per_char + (ch - f->min_char_or_byte2);
1025 else
1026 xcs = &f->max_bounds;
710 } 1027 }
711 1028
712 if (xcs->lbearing == 0 && xcs->rbearing == 0 && xcs->width == 0 1029 if (xcs->lbearing == 0 && xcs->rbearing == 0 && xcs->width == 0
713 && xcs->ascent == 0 && xcs->descent == 0) 1030 && xcs->ascent == 0 && xcs->descent == 0)
1031 return false;
1032
1033 if (!prop || prop->width == rxvt_fontprop::unset)
1034 return true;
1035
1036 // check whether character overlaps previous/next character
1037 int w = xcs->rbearing - xcs->lbearing;
1038 int wcw = max (WCWIDTH (unicode), 1);
1039
1040 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
1041
1042 if (careful && !OVERLAP_OK (w, wcw, prop))
714 return false; 1043 return false;
715 1044
716 return true; 1045 return true;
717} 1046}
718 1047
… …
724 // this looks like a mess /. 1053 // this looks like a mess /.
725 // and it is a mess /. 1054 // and it is a mess /.
726 // yet we are trying to be perfect /. 1055 // yet we are trying to be perfect /.
727 // but the result still isn't perfect /. 1056 // but the result still isn't perfect /.
728 1057
1058 dTermDisplay;
1059 dTermGC;
1060
729 bool slow = this->slow 1061 bool slow = this->slow
730 || width != r->TermWin.fwidth 1062 || width != term->fwidth
731 || height != r->TermWin.fheight; 1063 || height != term->fheight
1064 || ascent != f->ascent;
732 1065
733 int base = r->TermWin.fbase; 1066 int base = ascent; // sorry, incorrect: term->fbase;
734 1067
735 XGCValues v; 1068 XGCValues v;
736 v.foreground = r->pix_colors[fg]; 1069 v.foreground = term->pix_colors[fg];
737 v.font = f->fid; 1070 v.font = f->fid;
738 1071
739 if (enc2b) 1072 if (enc2b)
740 { 1073 {
741 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 1074 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
742 1075
743 if (bg == Color_bg && !slow) 1076 if (bg == Color_bg && !slow)
744 { 1077 {
745 v.background = r->pix_colors[bg]; 1078 v.background = term->pix_colors[bg];
746 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1079 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
747 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 1080 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
748 } 1081 }
749 else 1082 else
750 { 1083 {
751 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);
752 1085
753 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1086 XChangeGC (disp, gc, GCForeground | GCFont, &v);
754 1087
755 if (slow) 1088 if (slow)
756 { 1089 {
757 do 1090 do
758 { 1091 {
759 if (xc->byte1 || xc->byte2) 1092 if (xc->byte1 || xc->byte2)
760 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1093 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
761 1094
762 x += r->TermWin.fwidth; 1095 x += term->fwidth;
763 xc++; len--; 1096 xc++; len--;
764 } 1097 }
765 while (len); 1098 while (len);
766 } 1099 }
767 else 1100 else
768 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1101 XDrawString16 (disp, d, gc, x, y + base, xc, len);
769 } 1102 }
770 } 1103 }
771 else 1104 else
772 { 1105 {
773 const char *xc = enc_char (text, len, cs, slow); 1106 const char *xc = enc_char (text, len, cs, slow);
774 1107
775 if (bg == Color_bg && !slow) 1108 if (bg == Color_bg && !slow)
776 { 1109 {
777 v.background = r->pix_colors[bg]; 1110 v.background = term->pix_colors[bg];
778 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1111 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
779 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1112 XDrawImageString (disp, d, gc, x, y + base, xc, len);
780 } 1113 }
781 else 1114 else
782 { 1115 {
783 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);
784 1117
785 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1118 XChangeGC (disp, gc, GCForeground | GCFont, &v);
786 1119
787 if (slow) 1120 if (slow)
788 { 1121 {
789 do 1122 do
790 { 1123 {
791 if (*xc) 1124 if (*xc)
792 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1125 XDrawString (disp, d, gc, x, y + base, xc, 1);
793 1126
794 x += r->TermWin.fwidth; 1127 x += term->fwidth;
795 xc++; len--; 1128 xc++; len--;
796 } 1129 }
797 while (len); 1130 while (len);
798 } 1131 }
799 else 1132 else
800 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1133 XDrawString (disp, d, gc, x, y + base, xc, len);
801 } 1134 }
802 } 1135 }
803} 1136}
804 1137
805///////////////////////////////////////////////////////////////////////////// 1138/////////////////////////////////////////////////////////////////////////////
806 1139
807#if XFT 1140#if XFT
808#if 0
809#define UNIBITS 21
810//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
811#define SWATHBITS 8
812#endif
813 1141
814struct 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
815 rxvt_font_xft () { f = 0; } 1155 rxvt_font_xft ()
1156 {
1157 f = 0;
1158 }
816 1159
817 void clear (); 1160 void clear ();
818 1161
819 rxvt_fontprop properties (); 1162 rxvt_fontprop properties ();
820 1163
821 bool load (const rxvt_fontprop &prop); 1164 bool load (const rxvt_fontprop &prop, bool force_prop);
822 1165
823 void draw (rxvt_drawable &d, int x, int y, 1166 void draw (rxvt_drawable &d, int x, int y,
824 const text_t *text, int len, 1167 const text_t *text, int len,
825 int fg, int bg); 1168 int fg, int bg);
826 1169
827 bool has_codepoint (unicode_t unicode); 1170 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
828 1171
829protected: 1172protected:
830 XftFont *f; 1173 XftFont *f;
831}; 1174};
832 1175
833void 1176void
834rxvt_font_xft::clear () 1177rxvt_font_xft::clear ()
835{ 1178{
836 if (f) 1179 if (f)
837 { 1180 {
838 XftFontClose (DISPLAY, f); 1181 XftFontClose (term->dpy, f);
839 f = 0; 1182 f = 0;
840 } 1183 }
841} 1184}
842 1185
843rxvt_fontprop 1186rxvt_fontprop
… …
847 1190
848 FT_Face face = XftLockFace (f); 1191 FT_Face face = XftLockFace (f);
849 1192
850 p.width = width; 1193 p.width = width;
851 p.height = height; 1194 p.height = height;
1195 p.ascent = ascent;
852 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1196 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
853 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1197 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
854 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1198 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
855 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1199 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
856 1200
… …
858 1202
859 return p; 1203 return p;
860} 1204}
861 1205
862bool 1206bool
863rxvt_font_xft::load (const rxvt_fontprop &prop) 1207rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
864{ 1208{
865#if 0 1209 dTermDisplay;
866 for (int i = 0; i < SWATHCOUNT; i++)
867 cvr[i] = 0;
868#endif
869 1210
870 clear (); 1211 clear ();
871 1212
872 FcPattern *p = FcNameParse ((FcChar8 *) name); 1213 FcPattern *p = FcNameParse ((FcChar8 *) name);
873 1214
874 if (!p) 1215 if (!p)
875 return false; 1216 return false;
876 1217
877 FcValue v; 1218 FcValue v;
878 1219
1220 if (prop.height != rxvt_fontprop::unset
879 if (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch) 1221 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1222 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
880 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1223 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
881 1224
1225 if (prop.weight != rxvt_fontprop::unset
882 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1226 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
883 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1227 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
884 1228
1229 if (prop.slant != rxvt_fontprop::unset
885 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1230 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
886 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1231 FcPatternAddInteger (p, FC_SLANT, prop.slant);
887
888 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
889 FcPatternAddBool (p, FC_MINSPACE, 1);
890 1232
891#if 0 // clipping unfortunately destroys our precious double-width-characters 1233#if 0 // clipping unfortunately destroys our precious double-width-characters
892 // clip width, we can't do better, or can we? 1234 // clip width, we can't do better, or can we?
893 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1235 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
894 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); 1236 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
895#endif 1237#endif
896 1238
1239 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1240 FcPatternAddBool (p, FC_MINSPACE, 1);
1241
1242 // store generated name so iso14755 view gives better results
1243 set_name ((char *)FcNameUnparse (p));
1244
897 XftResult result; 1245 XftResult result;
898 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1246 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
899 1247
900 FcPatternDestroy (p); 1248 FcPatternDestroy (p);
901 1249
902 if (!match) 1250 if (!match)
903 return false; 1251 return false;
904 1252
905 f = XftFontOpenPattern (DISPLAY, match);
906
907 if (!f)
908 {
909 FcPatternDestroy (match);
910 return false;
911 }
912
913 FT_Face face = XftLockFace (f);
914
915 slow = !FT_IS_FIXED_WIDTH (face);
916
917 int ftheight = 0; 1253 int ftheight = 0;
1254 bool success = true;
918 1255
919 for (;;) 1256 for (;;)
920 { 1257 {
921 XGlyphInfo g1, g2; 1258 p = FcPatternDuplicate (match);
922 FcChar8 c; 1259 f = XftFontOpenPattern (disp, p);
923 1260
924 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1); 1261 if (!f)
925 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2); 1262 {
1263 FcPatternDestroy (p);
1264 success = false;
1265 break;
1266 }
926 1267
927 if (g1.xOff != g2.xOff) // don't simply trust the font 1268 FT_Face face = XftLockFace (f);
928 slow = true;
929 1269
930 width = g2.xOff; 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 }
1279
931 ascent = (face->size->metrics.ascender + 63) >> 6; 1280 ascent = (face->size->metrics.ascender + 63) >> 6;
932 descent = (-face->size->metrics.descender + 63) >> 6; 1281 descent = (-face->size->metrics.descender + 63) >> 6;
933 height = ascent + descent; 1282 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
1283 width = 0;
934 1284
1285 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1286
1287 XftUnlockFace (f);
1288
1289 int glheight = height;
1290
1291 for (uint32_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1292 {
1293 FcChar32 ch = *t;
1294
1295 if (cs != CS_UNICODE
1296 && ch > 0x100
1297 && FROM_UNICODE (cs, ch) == NOCHAR)
1298 continue;
1299
1300 // ignore characters we wouldn't use anyways
1301 bool careful;
1302 if (!has_char (*t, &prop, careful))
1303 continue;
1304
1305 XGlyphInfo g;
1306 XftTextExtents32 (disp, f, &ch, 1, &g);
1307
1308 g.width -= g.x;
1309
1310 int wcw = WCWIDTH (ch);
1311 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1312
1313 if (width < g.width ) width = g.width;
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;
1323 }
1324
1325 if (prop.height == rxvt_fontprop::unset
935 if (height <= prop.height || !prop.height) 1326 || (height <= prop.height && glheight <= prop.height)
1327 || height <= 2
1328 || !scalable)
936 break; 1329 break;
937 1330
938 if (ftheight) 1331 if (ftheight)
939 { 1332 {
940 // take smaller steps near the end 1333 // take smaller steps near the end
941 if (height > prop.height + 1) ftheight++; 1334 if (height > prop.height + 1) ftheight++;
942 if (height > prop.height + 2) ftheight++; 1335 if (height > prop.height + 2) ftheight++;
943 if (height > prop.height + 3) ftheight++; 1336 if (height > prop.height + 3) ftheight++;
944 1337
945 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height); 1338 ftheight -= height - prop.height;
946 } 1339 }
947 else 1340 else
948 FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height); 1341 ftheight = prop.height - 1;
1342
1343 XftFontClose (disp, f);
1344 FcPatternDel (match, FC_PIXEL_SIZE);
1345 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1346 }
1347
1348 FcPatternDestroy (match);
1349
1350#if 0 // do it per-character
1351 if (prop.width != rxvt_fontprop::unset && width > prop.width)
949 } 1352 {
1353 clear ();
1354 success = false;
1355 }
1356#endif
950 1357
951 XftUnlockFace (f); 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
1371 return success;
1372}
1373
1374bool
1375rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1376{
1377 careful = false;
1378
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))
1394 return false;
1395
1396 if (!prop || prop->width == rxvt_fontprop::unset)
1397 return true;
1398
1399 int wcw = max (WCWIDTH (chr), 1);
1400
1401 XGlyphInfo g;
1402 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
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
1410 int w = g.width - g.x;
1411
1412 careful = g.x > 0 || w > cwidth;
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))
1419 return false;
952 1420
953 return true; 1421 return true;
954}
955
956bool
957rxvt_font_xft::has_codepoint (unicode_t unicode)
958{
959 return XftCharExists (DISPLAY, f, unicode);
960} 1422}
961 1423
962void 1424void
963rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1425rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
964 const text_t *text, int len, 1426 const text_t *text, int len,
965 int fg, int bg) 1427 int fg, int bg)
966{ 1428{
967 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;
968 1431
969 if (!slow && width == r->TermWin.fwidth && 0) 1432 dTermDisplay;
970 { 1433 dTermGC;
971 if (sizeof (text_t) == sizeof (FcChar16)) 1434
972 XftDrawString16 (d, &r->pix_colors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 1435 int w = term->fwidth * len;
973 else 1436 int h = term->fheight;
974 XftDrawString32 (d, &r->pix_colors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); 1437
975 } 1438 bool buffered = bg >= Color_transparent
976 else 1439 && term->option (Opt_buffered);
977 { 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;
1447
978 while (len) 1448 while (len)
1449 {
1450 int cwidth = term->fwidth;
1451 FcChar32 chr = *text++; len--;
1452
1453 while (len && *text == NOCHAR)
1454 text++, len--, cwidth += term->fwidth;
1455
1456 if (chr != ' ') // skip spaces
979 { 1457 {
980 if (*text != NOCHAR && *text != ' ') 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
1465
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)
981 { 1473 {
982 int fwidth = r->TermWin.fwidth; 1474 XGlyphInfo ep;
983 if (len >= 2 && text[1] == NOCHAR) 1475 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
984 fwidth *= 2; 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
985 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);
986 XGlyphInfo extents; 1493 XGlyphInfo extents;
987 if (sizeof (text_t) == sizeof (FcChar16)) 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;
1516 }
1517
1518 x_ += cwidth;
1519 }
1520
1521 if (buffered)
1522 {
1523 if (ep != enc)
1524 {
1525 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
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)
988 { 1537 {
989 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents); 1538 src_x += term->window_vt_x;
990 XftDrawString16 (d, &r->pix_colors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 1539 src_y += term->window_vt_y;
991 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 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);
992 } 1547 }
993 else 1548 else
994 { 1549 {
995 XGlyphInfo extents; 1550 XGCValues gcv;
996 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents); 1551
997 XftDrawString32 (d, &r->pix_colors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 1552 gcv.fill_style = FillTiled;
998 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 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);
999 } 1573 }
1000 } 1574 }
1001
1002 x += r->TermWin.fwidth;
1003 text++;
1004 len--; 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);
1005 } 1581 }
1582 else
1583 clear_rect (d, x, y, w, h, bg);
1584 }
1585 else
1006 } 1586 {
1587 clear_rect (d, x, y, w, h, bg);
1588 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1589 }
1007} 1590}
1591
1008#endif 1592#endif
1009 1593
1010///////////////////////////////////////////////////////////////////////////// 1594/////////////////////////////////////////////////////////////////////////////
1011 1595
1012rxvt_fontset::rxvt_fontset (rxvt_t r) 1596rxvt_fontset::rxvt_fontset (rxvt_term *term)
1013: r (r), fontdesc (0) 1597: fontdesc (0), term (term)
1014{ 1598{
1015 clear (); 1599 clear ();
1016} 1600}
1017 1601
1018rxvt_fontset::~rxvt_fontset () 1602rxvt_fontset::~rxvt_fontset ()
… …
1021} 1605}
1022 1606
1023void 1607void
1024rxvt_fontset::clear () 1608rxvt_fontset::clear ()
1025{ 1609{
1610 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1611 = rxvt_fontprop::unset;
1612 force_prop = false;
1613
1026 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1614 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1027 FONT_UNREF (*i); 1615 (*i)->unref ();
1616
1617 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1618 delete *p;
1028 1619
1029 free (fontdesc); fontdesc = 0; 1620 free (fontdesc); fontdesc = 0;
1030 1621
1031 fonts.clear (); 1622 fonts.clear ();
1032 base_id = 0;
1033 base_prop.height = 0x7fffffff;
1034 base_prop.weight = rxvt_fontprop::medium;
1035 base_prop.slant = rxvt_fontprop::roman;
1036 1623
1037 fallback = fallback_fonts; 1624 fallback = fallback_fonts;
1625}
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;
1038} 1634}
1039 1635
1040rxvt_font * 1636rxvt_font *
1041rxvt_fontset::new_font (const char *name, codeset cs) 1637rxvt_fontset::new_font (const char *name, codeset cs)
1042{ 1638{
1043 rxvt_font *f; 1639 rxvt_font *f;
1044 1640
1045 if (!name || !*name) 1641 if (!name || !*name)
1046 { 1642 {
1047 name = ""; 1643 name = "";
1048 f = new rxvt_font_default; 1644 f = new rxvt_font_default (this);
1049 } 1645 }
1050#if XFT 1646#if XFT
1051 else if (!strncmp (name, "xft:", 4)) 1647 else if (!strncmp (name, "xft:", 4))
1052 { 1648 {
1053 name += 4; 1649 name += 4;
1054 f = new rxvt_font_xft; 1650 f = new rxvt_font_xft ();
1055 } 1651 }
1056#endif 1652#endif
1057 else if (!strncmp (name, "x:", 2)) 1653 else if (!strncmp (name, "x:", 2))
1058 { 1654 {
1059 name += 2; 1655 name += 2;
1060 f = new rxvt_font_x11; 1656 f = new rxvt_font_x11;
1061 } 1657 }
1062 else 1658 else
1063 f = new rxvt_font_x11; 1659 f = new rxvt_font_x11;
1064 1660
1065 f->fs = this;
1066 f->set_term (r);
1067 f->set_name (strdup (name)); 1661 f->set_name (strdup (name));
1068 1662 prepare_font (f, cs);
1069 f->cs = cs;
1070 f->loaded = false;
1071 1663
1072 return f; 1664 return f;
1073} 1665}
1074 1666
1075///////////////////////////////////////////////////////////////////////////// 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}
1076 1685
1077void 1686void
1078rxvt_fontset::add_fonts (const char *desc) 1687rxvt_fontset::add_fonts (const char *desc)
1079{ 1688{
1080 if (desc) 1689 if (desc)
… …
1082 char buf[512]; 1691 char buf[512];
1083 const char *end; 1692 const char *end;
1084 1693
1085 do 1694 do
1086 { 1695 {
1087 while (*desc <= ' ') desc++; 1696 while (*desc && *desc <= ' ')
1697 desc++;
1698
1699 codeset cs = CS_UNICODE;
1088 1700
1089 if (*desc == '[') 1701 if (*desc == '[')
1090 { 1702 {
1091 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1703 char spec[256];
1092
1093 //const char *extra = desc++; // not yet used 1704 const char *extra = ++desc; // not yet used
1094 1705
1095 desc = strchr (desc, ']'); 1706 desc = strchr (desc, ']');
1096 1707
1097 if (!desc) 1708 if (!desc)
1098 { 1709 {
1099 fprintf (stderr, "ERROR: opening '[' without closing ']' in font specification.\n"); 1710 rxvt_warn ("ERROR: opening '[' without closing ']' in font specification, trying to continue.\n");
1100 break; 1711 break;
1101 } 1712 }
1102 1713
1714 memcpy (spec, extra, min (desc - extra, 255));
1715 spec[min (desc - extra, 255)] = 0;
1716
1717 if (!strncmp (extra, "codeset=", sizeof ("codeset=") - 1))
1718 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1719 else
1720 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1721
1103 desc++; 1722 desc++;
1104 while (*desc <= ' ') desc++; 1723 while (*desc <= ' ' && *desc) desc++;
1105 } 1724 }
1106 1725
1107 end = strchr (desc, ','); 1726 end = strchr (desc, ',');
1108 if (!end) 1727 if (!end)
1109 end = desc + strlen (desc); 1728 end = desc + strlen (desc);
1110 1729
1111 if (end - desc < 511) 1730 if (end - desc < 511)
1112 { 1731 {
1113 strncpy (buf, desc, end - desc); 1732 memcpy (buf, desc, end - desc);
1114 buf[end - desc] = 0; 1733 buf[end - desc] = 0;
1115 1734
1116 fonts.push_back (new_font (buf, CS_UNICODE)); 1735 push_font (new_font (buf, cs));
1117 } 1736 }
1737 else
1738 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1118 1739
1119 desc = end + 1; 1740 desc = end + 1;
1120 } 1741 }
1121 while (*end); 1742 while (*end);
1122 } 1743 }
1123} 1744}
1124 1745
1125bool 1746bool
1126rxvt_fontset::realize_font (int i) 1747rxvt_fontset::realize_font (int i)
1127{ 1748{
1749 if (i < 0 || i >= fonts.size ())
1750 return false;
1751
1128 if (fonts[i]->loaded) 1752 if (fonts[i]->loaded)
1129 return true; 1753 return true;
1130 1754
1131 fonts[i]->loaded = true; 1755 fonts[i]->loaded = true;
1132 1756
1133 if (!fonts[i]->load (base_prop)) 1757 if (!fonts[i]->load (prop, force_prop))
1134 { 1758 {
1135 fonts[i]->cs = CS_UNKNOWN; 1759 fonts[i]->cs = CS_UNKNOWN;
1136 return false; 1760 return false;
1137 } 1761 }
1138 1762
… …
1144{ 1768{
1145 clear (); 1769 clear ();
1146 1770
1147 fontdesc = strdup (desc); 1771 fontdesc = strdup (desc);
1148 1772
1149 fonts.push_back (new_font (0, CS_UNICODE)); 1773 push_font (new_font (0, CS_UNICODE));
1150 realize_font (0); 1774 realize_font (0);
1151 1775
1152 add_fonts (desc); 1776 add_fonts (desc);
1153
1154 if (!base_id)
1155 base_id = 1;
1156
1157 // we currently need a base-font, no matter what
1158 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1159 {
1160 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1161 add_fonts ("fixed");
1162 base_id = fonts.size () - 1;
1163 }
1164
1165 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1166 return false;
1167
1168 base_prop = fonts[base_id]->properties ();
1169 1777
1170 return true; 1778 return true;
1171} 1779}
1172 1780
1173int 1781int
… …
1179 1787
1180 return -1; 1788 return -1;
1181} 1789}
1182 1790
1183int 1791int
1184rxvt_fontset::find_font (unicode_t unicode, bool bold) 1792rxvt_fontset::find_font_idx (unicode_t unicode)
1185{ 1793{
1794 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1795 if (unicode > 0x1fffff)
1796 return 0;
1186 1797
1187 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii 1798 unicode_t hi = unicode >> 8;
1188 i < fonts.size (); 1799
1189 i++) 1800 if (hi < fmap.size ())
1801 if (pagemap *pm = fmap[hi])
1802 if ((*pm)[unicode & 0xff] != 0xff)
1803 return (*pm)[unicode & 0xff];
1804
1805 unsigned int i;
1806
1807 for (i = 0; i < fonts.size (); i++)
1190 { 1808 {
1191 rxvt_font *f = fonts[i]; 1809 rxvt_font *f = fonts[i];
1192 1810
1193 if (!f->loaded) 1811 if (!f->loaded)
1194 { 1812 {
1195 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1813 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1196 goto next_font; 1814 goto next_font;
1197 1815
1198 if (!realize_font (i)) 1816 if (!realize_font (i))
1199 goto next_font; 1817 goto next_font;
1818
1819 if (prop.ascent != rxvt_fontprop::unset)
1820 max_it (f->ascent, prop.ascent);
1200 } 1821 }
1201 1822
1202 if (f->cs == CS_UNKNOWN) 1823 if (f->cs == CS_UNKNOWN)
1203 goto next_font; 1824 goto next_font;
1204 1825
1205 if (bold && f->properties ().weight < rxvt_fontprop::bold) 1826 bool careful;
1827 if (f->has_char (unicode, &prop, careful))
1828 {
1829 i = (i << 1) | careful;
1830
1206 goto next_font; 1831 goto found;
1207 1832 }
1208 if (f->has_codepoint (unicode))
1209 return i;
1210 1833
1211 next_font: 1834 next_font:
1212 if (i == fonts.size () - 1) 1835 if (i == fonts.size () - 1)
1213 { 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
1214 if (fallback->name) 1842 if (fallback->name)
1215 { 1843 {
1216 // search through the fallback list 1844 // search through the fallback list
1217 fonts.push_back (new_font (fallback->name, fallback->cs)); 1845 push_font (new_font (fallback->name, fallback->cs));
1218 fallback++; 1846 fallback++;
1219 } 1847 }
1220 else 1848 else
1221 { 1849 {
1222 // try to find a new font. 1850 // try to find a new font.
1223 // only xft currently supported, as there is no 1851 // only xft currently supported, as there is no
1224 // way to configure this and xft is easier to hack in, 1852 // way to configure this and xft is easier to hack in,
1225 // while x11 has more framework in place already. 1853 // while x11 has more framework in place already.
1226#if XFT 1854 // TODO: this is a real resource hog, xft takes ages(?)
1855#if XFT && USE_SLOW_LOOKUP
1227 // 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
1228 FcPattern *p = FcPatternCreate (); 1858 FcPattern *p = FcPatternCreate ();
1229 1859
1230 FcCharSet *s = FcCharSetCreate (); 1860 FcCharSet *s = FcCharSetCreate ();
1231 FcCharSetAddChar (s, unicode); 1861 FcCharSetAddChar (s, unicode);
1232 FcPatternAddCharSet (p, FC_CHARSET, s); 1862 FcPatternAddCharSet (p, FC_CHARSET, s);
1233 // charsets don't help that much, as xft might return 1863 // charsets don't help that much, as xft might return
1234 // a non-matching font even if a better font is available :/ 1864 // a non-matching font even if a better font is available :/
1235 1865
1866 x x x x TODO prop might have unset contents
1236 FcPatternAddInteger (p, FC_PIXEL_SIZE, base_prop.height); 1867 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1237 FcPatternAddInteger (p, FC_WEIGHT, base_prop.weight); 1868 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1238 FcPatternAddInteger (p, FC_SLANT, base_prop.slant); 1869 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1239 FcPatternAddBool (p, FC_MINSPACE, 1); 1870 FcPatternAddBool (p, FC_MINSPACE, 1);
1240 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1871 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1241 1872
1242 XftResult result; 1873 XftResult result;
1243 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1874 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1244 1875
1245 FcPatternDestroy (p); 1876 FcPatternDestroy (p);
1246 1877
1247 if (match) 1878 if (match)
1248 { 1879 {
… …
1251 FcPatternDestroy (match); 1882 FcPatternDestroy (match);
1252 1883
1253 if (find_font (font) < 0) 1884 if (find_font (font) < 0)
1254 { 1885 {
1255 char fontname[4096]; 1886 char fontname[4096];
1256 sprintf (fontname, "xft:%-.4090s", font); 1887 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1257 1888
1258 fonts.push_back (new_font (fontname, CS_UNICODE)); 1889 push_font (new_font (fontname, CS_UNICODE));
1259 } 1890 }
1260 1891
1261 free (font); 1892 free (font);
1262 } 1893 }
1263#endif 1894#endif
1264 } 1895 }
1265 } 1896 }
1266 } 1897 }
1267 1898
1268 // if no bold font found, use a regular one 1899 /* we must return SOME font */
1269 if (bold) 1900 i = 0;
1270 return find_font (unicode);
1271 1901
1272 return 0; /* we must return SOME font */ 1902found:
1273} 1903 // found a font, cache it
1904 if (i < 255)
1905 {
1906 while (hi >= fmap.size ())
1907 fmap.push_back (0);
1274 1908
1909 if (!fmap[hi])
1910 {
1911 fmap[hi] = new pagemap;
1912 memset (fmap[hi], 0xff, sizeof (pagemap));
1913 }
1275 1914
1915 (*fmap[hi])[unicode & 0xff] = i;
1916 }
1276 1917
1918 return i;
1919}
1920

Diff Legend

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