ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtfont.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.56 by root, Fri Dec 10 19:55:55 2004 UTC vs.
Revision 1.216 by root, Sat Jun 19 10:08:10 2021 UTC

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

Diff Legend

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