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

Diff Legend

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