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.50 by root, Wed Dec 1 02:29:14 2004 UTC vs.
Revision 1.224 by root, Thu Jan 4 19:52:37 2024 UTC

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

Diff Legend

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