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

Diff Legend

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