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.66 by root, Fri Feb 11 05:51:14 2005 UTC vs.
Revision 1.200 by root, Thu Jun 17 00:49:20 2021 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.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 doesn't trust the font either. 156// pango uses a similar algorithm and doesn't trust the font either.
… …
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), can_compose(false)
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 if (IS_COMPOSE (unicode))
314 return true; 319 return true;
315 320
316 switch (unicode) 321 switch (unicode)
… …
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{
336 Display *disp = d.display->display; 341 dTermDisplay;
342 dTermGC;
337 343
338 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);
339 345
340 XSetForeground (disp, TGC, r->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
341 347
342 while (len) 348 while (len)
343 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
344#if ENABLE_COMBINING 356#if ENABLE_COMBINING
345 compose_char *cc; 357 compose_char *cc;
346#endif 358#endif
347 const text_t *tp = text;
348 text_t t = *tp;
349
350 while (++text, --len && *text == NOCHAR)
351 ;
352
353 int width = text - tp; 359 int width = text - tp;
354 int fwidth = r->TermWin.fwidth * width; 360 int fwidth = term->fwidth * width;
355 361
362#ifdef BUILTIN_GLYPHS
356 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
357 { 364 {
365# include "table/linedraw.h"
358 uint16_t offs = linedraw_offs[t - 0x2500]; 366 uint16_t offs = linedraw_offs[t - 0x2500];
359 uint32_t *a = linedraw_command + (offs >> 4); 367 uint32_t *a = linedraw_command + (offs >> 4);
360 uint32_t *b = a + (offs & 15); 368 uint32_t *b = a + (offs & 15);
361 369
362 int W = fwidth; 370 int W = fwidth;
363 int H = r->TermWin.fheight; 371 int H = term->fheight;
364 372
365 int x_[16]; 373 int x_[16];
366 int y_[16]; 374 int y_[16];
367 375
368 for (int i = 0; i <= 8; i++) 376 for (int i = 0; i <= 8; i++)
… …
376 384
377 XGCValues gcv; 385 XGCValues gcv;
378 386
379 gcv.cap_style = CapButt; 387 gcv.cap_style = CapButt;
380 gcv.line_width = 0; 388 gcv.line_width = 0;
381 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 389 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
382 390
383 while (a < b) 391 while (a < b)
384 { 392 {
385 uint32_t command = *a++; 393 uint32_t command = *a++;
386 394
… …
393 int y2 = y_[(command >> 0) & 15]; 401 int y2 = y_[(command >> 0) & 15];
394 402
395 switch (op) 403 switch (op)
396 { 404 {
397 case 0: // line 405 case 0: // line
398 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 406 XDrawLine (disp, d, gc, x1, y1, x2, y2);
399 break; 407 break;
400 408
401 case 1: // rectangle, possibly stippled 409 case 1: // rectangle, possibly stippled
402 if (a) 410 if (a)
403 { 411 {
404 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
405 413
406 gcv.fill_style = FillStippled; 414 gcv.fill_style = FillStippled;
407 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
408 gcv.ts_x_origin = x; 416 gcv.ts_x_origin = x;
409 gcv.ts_y_origin = y; 417 gcv.ts_y_origin = y;
410 418
411 XChangeGC (disp, TGC, 419 XChangeGC (disp, gc,
412 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 420 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
413 &gcv); 421 &gcv);
414 } 422 }
415 423
416 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 424 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
417 425
418 if (a) 426 if (a)
419 { 427 {
420 XFreePixmap (disp, gcv.stipple); 428 XFreePixmap (disp, gcv.stipple);
421 gcv.stipple = 0; 429 gcv.stipple = 0;
422 gcv.fill_style = FillSolid; 430 gcv.fill_style = FillSolid;
423 XChangeGC (disp, TGC, GCFillStyle, &gcv); 431 XChangeGC (disp, gc, GCFillStyle, &gcv);
424 } 432 }
425 break; 433 break;
426 case 2: // arc 434 case 2: // arc
427 XDrawArc (disp, d, TGC, 435 XDrawArc (disp, d, gc,
428 x1 - W/2, y1 - H/2, W-1, H-1, 436 x1 - W/2, y1 - H/2, W-1, H-1,
429 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
430 break; 438 break;
431 } 439 }
432 } 440 }
433 } 441 }
442#else
443 if (0)
444 ;
445#endif
434#if ENABLE_COMBINING 446#if ENABLE_COMBINING
435 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && rxvt_composite[t])
448 {
449 min_it (width, 2); // we only support wcwidth up to 2
450
451 #if NOT_YET
452 vector<text_t> chrs;
453 chrs.reserve (rxvt_composite.expand (t));
454 rxvt_composite.expand (t, &chrs[0]);
455
456 while (!chrs.empty ())
436 { 457 {
458 rxvt_font *f1 = fs->find_font_idx (chrs[0])
459
460 int i = 0;
461 while (i < chrs.size () - 1
462 && f1->can_combine
463 && f1->has-char (chrs[i + 1], careful)
464 && !careful
465 ++i;
466
467 (*fs)[f1]->draw (d, x, y, &chrs[0], width, fg, bg);
468 chrs.erase (&chrs[0], &chrs[i]);
469 }
470 #endif
471
472 #if 1
437 text_t chrs[2]; 473 text_t chrs[2];
438 width = min (2, width);
439 chrs [1] = NOCHAR; 474 chrs [1] = NOCHAR;
440 475
441 *chrs = cc->c1; 476 *chrs = cc->c1;
442 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 477 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
443 f1->draw (d, x, y, chrs, width, fg, bg); 478 f1->draw (d, x, y, chrs, width, fg, bg);
444 479
445 if (cc->c2 != NOCHAR) 480 if (cc->c2 != NOCHAR)
446 { 481 {
447 bool careful; 482 bool careful;
448 483
449 // prefer font of first character, for no good reasons 484 // prefer font of first character, for no good reasons
450 *chrs = cc->c2; 485 *chrs = cc->c2;
451 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 486 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
452 ? f1 487 ? f1
453 : (*fs)[fs->find_font (cc->c2)]; 488 : (*fs)[fs->find_font_idx (cc->c2)];
454 489
455 f2->draw (d, x, y, chrs, width, fg, -1); 490 f2->draw (d, x, y, chrs, width, fg, Color_none);
456 } 491 }
492 #endif
457 } 493 }
458#endif 494#endif
459 else 495 else
460 switch (t) 496 switch (t)
461 { 497 {
462 case '\t': 498 case '\t':
463 case ZERO_WIDTH_CHAR: 499 case ZERO_WIDTH_CHAR:
464 case NOCHAR: 500 case NOCHAR:
465 break; 501 break;
466 502
503 /*
504 * If the base font does not support variation selectors, treat them as ZWC.
505 * a point could be made to do this for all wcwidth == 0 characters, but I
506 * decided against that until more data is available.
507 */
508 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
509 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
510 break;
511
467 default: 512 default:
468 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 513 XDrawRectangle (disp, d, gc, x + 2, y + 2,
469 fwidth - 4, r->TermWin.fheight - 4); 514 fwidth - 4, term->fheight - 4);
470 } 515 }
471 516
472 x += fwidth; 517 x += fwidth;
473 } 518 }
474} 519}
475 520
521struct rxvt_font_overflow : rxvt_font
522{
523 struct rxvt_fontset *fs;
524
525 rxvt_font_overflow (rxvt_fontset *fs)
526 : rxvt_font ()
527 {
528 this->fs = fs;
529 }
530
531 rxvt_fontprop properties ()
532 {
533 rxvt_fontprop p;
534
535 p.width = p.height = 1;
536 p.ascent = rxvt_fontprop::unset;
537 p.weight = rxvt_fontprop::medium;
538 p.slant = rxvt_fontprop::roman;
539
540 return p;
541 }
542
543 bool load (const rxvt_fontprop &prop, bool force_prop)
544 {
545 width = 1; height = 1;
546 ascent = 1; descent = 0;
547
548 set_name (strdup ("built-in rendition overflow font"));
549
550 return true;
551 }
552
553 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
554 {
555 return false;
556 }
557
558 void draw (rxvt_drawable &d, int x, int y,
559 const text_t *text, int len,
560 int fg, int bg)
561 {
562 while (len)
563 {
564 int fid = fs->find_font_idx (*text);
565 int w = 1;
566 while (w < len && text[w] == NOCHAR)
567 w++;
568 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
569 text += w;
570 len -= w;
571 x += term->fwidth * w;
572 }
573 }
574};
575
476///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
477 577
478struct rxvt_font_x11 : rxvt_font { 578struct rxvt_font_x11 : rxvt_font
579{
479 rxvt_font_x11 () { f = 0; } 580 rxvt_font_x11 () { f = 0; }
480 581
481 void clear (); 582 void clear ();
482 583
483 rxvt_fontprop properties (); 584 rxvt_fontprop properties ();
484 585
485 bool load (const rxvt_fontprop &prop); 586 bool load (const rxvt_fontprop &prop, bool force_prop);
486 587
487 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 588 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
488 589
489 void draw (rxvt_drawable &d, int x, int y, 590 void draw (rxvt_drawable &d, int x, int y,
490 const text_t *text, int len, 591 const text_t *text, int len,
491 int fg, int bg); 592 int fg, int bg);
492 593
493 bool slow; // wether this is a proportional font or has other funny characteristics 594 bool slow; // whether this is a proportional font or has other funny characteristics
494 XFontStruct *f; 595 XFontStruct *f;
495 codeset cs;
496 bool enc2b, encm; 596 bool enc2b, encm;
497 597
498 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 598 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
499 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 599 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
500 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 600 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
501 bool set_properties (rxvt_fontprop &p, const char *name); 601 bool set_properties (rxvt_fontprop &p, const char *name);
502}; 602};
503 603
504char * 604char *
505rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 605rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
506{ 606{
507 unsigned long value; 607 unsigned long value;
508 608
509 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 609 if (XGetFontProperty (f, property, &value))
510 return XGetAtomName (DISPLAY, value); 610 return XGetAtomName (term->dpy, value);
511 else 611 else
512 return rxvt_strdup (repl); 612 return repl ? strdup (repl) : 0;
513} 613}
514 614
515rxvt_fontprop 615rxvt_fontprop
516rxvt_font_x11::properties () 616rxvt_font_x11::properties ()
517{ 617{
… …
521} 621}
522 622
523bool 623bool
524rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 624rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
525{ 625{
526 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 626 p.width = width != rxvt_fontprop::unset ? width
627 : avgwidth ? (avgwidth + 1) / 10
628 : (height + 1) / 2;
527 p.height = height; 629 p.height = height;
630 p.ascent = rxvt_fontprop::unset;
528 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 631 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
529 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 632 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
530 633
531 return true; 634 return true;
532} 635}
… …
535rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 638rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
536{ 639{
537 unsigned long height; 640 unsigned long height;
538 641
539#if 0 642#if 0
540 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 643 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
541 return false; 644 return false;
542#else 645#else
543 height = f->ascent + f->descent; 646 height = f->ascent + f->descent;
544#endif 647#endif
545 648
546 unsigned long avgwidth; 649 unsigned long avgwidth;
547 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 650 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
548 avgwidth = 0; 651 avgwidth = 0;
549 652
550 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 653 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
551 char *slant = get_property (f, "SLANT", "r"); 654 char *slant = get_property (f, term->xa [XA_SLANT], "r");
552 655
553 set_properties (p, height, weight, slant, avgwidth); 656 set_properties (p, height, weight, slant, avgwidth);
554 657
555 free (weight); 658 free (weight);
556 free (slant); 659 free (slant);
557 660
661 p.ascent = f->ascent;
662
558 return true; 663 return true;
559} 664}
560 665
561bool 666bool
562rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 667rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
563{ 668{
669 dTermDisplay;
564 int slashes = 0; 670 int slashes = 0;
565 const char *comp[13]; 671 const char *comp[13];
566 672
567 for (const char *c = name; *c; c++) 673 for (const char *c = name; *c; c++)
568 if (*c == '-') 674 if (*c == '-')
… …
576 if (slashes >= 13 682 if (slashes >= 13
577 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 683 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
578 && (*comp[11] >= '0' && *comp[11] <= '9')) 684 && (*comp[11] >= '0' && *comp[11] <= '9'))
579 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 685 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
580 686
581 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 687 XFontStruct *f = XLoadQueryFont (disp, name);
582 688
583 if (f) 689 if (f)
584 { 690 {
585 // the font should really exist now. if not, we have a problem 691 // the font should really exist now. if not, we have a problem
586 // (e.g. if the user did xset fp rehash just when we were searching fonts). 692 // (e.g. if the user did xset fp rehash just when we were searching fonts).
587 // in that case, just return garbage. 693 // in that case, just return garbage.
588 bool ret = set_properties (p, f); 694 bool ret = set_properties (p, f);
589 XFreeFont (DISPLAY, f); 695 XFreeFont (disp, f);
590 return ret; 696 return ret;
591 } 697 }
592 else 698 else
593 return false; 699 return false;
594} 700}
595 701
596// fix the size of scalable fonts 702// fix the size of scalable fonts
597static bool 703static bool
598replace_field (char *buf, const char *name, int index, const char old, const char *replace) 704replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
599{ 705{
600 int slashes = 0; 706 int slashes = 0;
601 const char *field, *end; 707 const char *field, *end;
602 708
603 for (const char *c = name; *c; c++) 709 for (const char *c = name; *c; c++)
… …
613 break; 719 break;
614 } 720 }
615 721
616 if (slashes >= 13 && (!old || *field == old)) 722 if (slashes >= 13 && (!old || *field == old))
617 { 723 {
618 // TODO: check for overflow in font-name 724 size_t len = field - name;
619 strncpy (buf, name, field - name); 725 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
620 buf += field - name; 726 memcpy (*ptr, name, len);
621 strcpy (buf, replace); 727 strcpy (*ptr + len, replace);
622 strcat (buf, end); 728 strcat (*ptr, end);
623 729
624 return true; 730 return true;
625 } 731 }
626 else 732 else
627 { 733 {
628 strcpy (buf, name); 734 *ptr = strdup (name);
629 735
630 return false; 736 return false;
631 } 737 }
632} 738}
633 739
634bool 740bool
635rxvt_font_x11::load (const rxvt_fontprop &prop) 741rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
636{ 742{
637 Display *disp = DISPLAY; 743 dTermDisplay;
638 744
639 clear (); 745 clear ();
640 746
641 char field_str[64]; // enough for 128 bits 747 char field_str[64]; // enough for 128 bits
642 748
643 // first morph the font if required 749 // first morph the font if required
644 if (prop.weight != rxvt_fontprop::unset 750 if (force_prop)
645 || prop.slant != rxvt_fontprop::unset)
646 { 751 {
647 char fname[1024]; 752 char *fname;
648 753
649 if (name[0] != '-') 754 if (name[0] != '-')
650 { 755 {
651 f = XLoadQueryFont (disp, name); 756 f = XLoadQueryFont (disp, name);
652 757
653 if (!f) 758 if (!f)
654 return false; 759 return false;
655 760
656 char *new_name = get_property (f, "FONT", name); 761 char *new_name = get_property (f, XA_FONT, 0);
657 762
658 if (new_name) 763 if (new_name)
659 set_name (new_name); 764 set_name (new_name);
660 else 765 else
661 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 766 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
662 767
663 XFreeFont (disp, f); 768 XFreeFont (disp, f);
664 f = 0; 769 f = 0;
665 } 770 }
666 771
667 if (prop.weight != rxvt_fontprop::unset) 772 if (prop.weight != rxvt_fontprop::unset)
668 { 773 {
669 replace_field (fname, name, 2, 0, 774 replace_field (&fname, name, 2, 0,
670 prop.weight < rxvt_fontprop::bold 775 prop.weight < rxvt_fontprop::bold
671 ? "medium" : "bold"); 776 ? "medium" : "bold");
672 set_name (strdup (fname)); 777 set_name (fname);
673 } 778 }
674 779
675 if (prop.slant != rxvt_fontprop::unset) 780 if (prop.slant != rxvt_fontprop::unset)
676 { 781 {
677 replace_field (fname, name, 3, 0, 782 replace_field (&fname, name, 3, 0,
678 prop.slant < rxvt_fontprop::italic 783 prop.slant < rxvt_fontprop::italic
679 ? "r" : "i"); // TODO: handle "o"blique, too 784 ? "r" : "i"); // TODO: handle "o"blique, too
680 set_name (strdup (fname)); 785 set_name (fname);
681 } 786 }
682 } 787 }
683 788
684 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 789 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
685 ? 0 : prop.height); 790 ? 0 : prop.height);
… …
710 font_weight *fonts = new font_weight[count]; 815 font_weight *fonts = new font_weight[count];
711 816
712 for (int i = 0; i < count; i++) 817 for (int i = 0; i < count; i++)
713 { 818 {
714 rxvt_fontprop p; 819 rxvt_fontprop p;
715 char fname[1024]; 820 char *fname;
716 821
717 int diff = 0; 822 int diff = 0;
718 823
719 if (replace_field (fname, list[i], 6, '0', field_str)) 824 if (replace_field (&fname, list[i], 6, '0', field_str))
720 diff += 10; // slightly penalize scalable fonts 825 diff += 10; // slightly penalize scalable fonts
826 else
827 {
828 free (fname);
829 if (replace_field (&fname, list[i], 11, '0', "0"))
830 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
831 }
721 832
722 if (!set_properties (p, fname)) 833 if (!set_properties (p, fname)
834 // also weed out too large fonts
835 || (prop.height != rxvt_fontprop::unset
836 && p.height > prop.height))
837 {
838 free (fname);
723 continue; 839 continue;
724 840 }
725 if (prop.height != rxvt_fontprop::unset
726 && p.height > prop.height) // weed out too large fonts
727 continue;
728 841
729 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 842 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
730 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 843 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
731 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 844 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
732 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 845 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
733 846
734 fonts[i].name = strdup (fname); 847 fonts[i].name = fname;
735 fonts[i].diff = diff; 848 fonts[i].diff = diff;
736 } 849 }
737 850
738 XFreeFontNames (list); 851 XFreeFontNames (list);
739 852
740 // this loop only iterates when the guessed font-size is too small 853 // this loop only iterates when the guessed font-size is too small
741 for (;;) 854 for (;;)
742 { 855 {
743 font_weight *best = fonts + count - 1; 856 font_weight *best = fonts;
744 857
745 for (font_weight *w = best; w-- > fonts; ) 858 for (font_weight *w = fonts + 1; w < fonts + count; w++)
746 if (w->diff < best->diff) 859 if (w->diff < best->diff)
747 best = w; 860 best = w;
748 861
749 if (!best->name 862 if (!best->name
750 || !(f = XLoadQueryFont (disp, best->name))) 863 || !(f = XLoadQueryFont (disp, best->name)))
… …
768 delete [] fonts; 881 delete [] fonts;
769 882
770 if (!f) 883 if (!f)
771 return false; 884 return false;
772 885
773 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 886 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
774 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 887 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
888
889 cs = CS_UNKNOWN;
775 890
776 if (registry && encoding) 891 if (registry && encoding)
777 { 892 {
778 char charset[64]; 893 char charset[64];
779 snprintf (charset, 64, "%s-%s", registry, encoding); 894 snprintf (charset, 64, "%s-%s", registry, encoding);
780 895
781 cs = codeset_from_name (charset); 896 cs = codeset_from_name (charset);
782 } 897
783 else 898 if (cs == CS_UNKNOWN)
899 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
784 { 900 }
901
902 free (registry);
903 free (encoding);
904
905 if (cs == CS_UNKNOWN)
906 {
785 const char *charset = get_property (f, "FONT", 0); 907 char *value = get_property (f, XA_FONT, 0);
908 const char *charset = value;
786 909
787 if (!charset) 910 if (!charset)
788 charset = name; 911 charset = name;
789 912
790 int count = 13; 913 int count = 13;
791 while (*charset) 914 while (*charset)
792 if (*charset++ == '-' && !--count) 915 if (*charset++ == '-' && !--count)
793 break; 916 break;
794 917
795 cs = codeset_from_name (charset); 918 cs = codeset_from_name (charset);
919 if (cs == CS_UNKNOWN)
920 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
921
922 free (value);
923 }
924
925 if (cs == CS_UNKNOWN)
796 } 926 {
797 927 clear ();
798 free (registry); 928 return false;
799 free (encoding); 929 }
800 930
801 if (cs == CS_UNICODE) 931 if (cs == CS_UNICODE)
802 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 932 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
803 933
804 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 934 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
805 enc2b = encm || f->max_char_or_byte2 > 255; 935 enc2b = encm || f->max_char_or_byte2 > 255;
806 936
807 slow = false; 937 slow = false;
808 938
809#if 1 // only used for slow detection, TODO optimize 939#if 1 // only used for slow detection, TODO optimize
810 if (f->min_bounds.width == f->max_bounds.width) 940 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
811 width = f->min_bounds.width;
812 else if (f->per_char == NULL)
813 width = f->max_bounds.width; 941 width = f->max_bounds.width;
814 else 942 else
815 { 943 {
816 slow = true; 944 slow = true;
817 945
818 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 946 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
819 947
820 if (encm) 948 if (encm)
821 N += (f->max_byte1 - f->min_byte1) 949 N += (f->max_byte1 - f->min_byte1)
822 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 950 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
823 951
824 while (N) 952 while (N)
825 { 953 {
826 if (f->per_char[N].width > width) 954 if (f->per_char[N].width > width)
827 width = f->per_char[N].width; 955 width = f->per_char[N].width;
828 956
… …
831 } 959 }
832#endif 960#endif
833 961
834 width = 1; 962 width = 1;
835 963
836 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 964 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
837 { 965 {
838 if (cs != CS_UNICODE
839 && *t > 0x100
840 && FROM_UNICODE (cs, *t) == NOCHAR) 966 if (FROM_UNICODE (cs, *t) == NOCHAR)
841 continue; 967 continue;
842 968
843 // ignore characters we wouldn't use anyways 969 // ignore characters we wouldn't use anyways
844 bool careful; 970 bool careful;
845 if (!has_char (*t, &prop, careful)) 971 if (!has_char (*t, &prop, careful))
846 continue; 972 continue;
847 973
848 XChar2b ch = { *t >> 8, *t }; 974 // the casts are needed in C++11 (see 8.5.1)
975 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
849 976
850 XCharStruct g; 977 XCharStruct g;
851 int dir_ret, asc_ret, des_ret; 978 int dir_ret, asc_ret, des_ret;
852 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 979 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
853 980
854 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 981 int wcw = WCWIDTH (*t);
982 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
855 983
856 if (width < g.width) width = g.width; 984 if (width < g.width) width = g.width;
857 }
858
859 if (cs == CS_UNKNOWN)
860 { 985 }
861 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
862 986
987#if 0 // do it per-character
988 if (prop && width > prop->width)
989 {
863 clear (); 990 clear ();
864 return false; 991 return false;
865 } 992 }
866
867#if 0 // do it per-character
868 if (prop && width > prop->width)
869 {
870 clear ();
871 return false;
872 }
873#endif 993#endif
874 994
875 return true; 995 return true;
876} 996}
877 997
878void 998void
879rxvt_font_x11::clear () 999rxvt_font_x11::clear ()
880{ 1000{
881 if (f) 1001 if (f)
882 { 1002 {
883 XFreeFont (DISPLAY, f); 1003 XFreeFont (term->dpy, f);
884 f = 0; 1004 f = 0;
885 } 1005 }
886} 1006}
887 1007
888bool 1008bool
889rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1009rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
890{ 1010{
1011 careful = false;
1012
891 uint32_t ch = FROM_UNICODE (cs, unicode); 1013 uint32_t ch = FROM_UNICODE (cs, unicode);
892 1014
893 if (ch == NOCHAR) 1015 if (ch == NOCHAR)
894 return false; 1016 return false;
895 1017
896 /* check wether the character exists in _this_ font. horrible. */ 1018 /* check whether the character exists in _this_ font. horrible. */
897 XCharStruct *xcs; 1019 XCharStruct *xcs;
898 1020
899 if (encm) 1021 if (encm)
900 { 1022 {
901 unsigned char byte1 = ch >> 8; 1023 unsigned char byte1 = ch >> 8;
… …
931 return false; 1053 return false;
932 1054
933 if (!prop || prop->width == rxvt_fontprop::unset) 1055 if (!prop || prop->width == rxvt_fontprop::unset)
934 return true; 1056 return true;
935 1057
936 // check character against base font bounding box 1058 // check whether character overlaps previous/next character
937 int w = xcs->width; 1059 int w = xcs->rbearing - xcs->lbearing;
938 int wcw = wcwidth (unicode); 1060 int wcw = max (WCWIDTH (unicode), 1);
939 if (wcw > 0) w /= wcw;
940 1061
941 careful = w > prop->width; 1062 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
942 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1063
1064 if (careful && !OVERLAP_OK (w, wcw, prop))
943 return false; 1065 return false;
944 1066
945 return true; 1067 return true;
946} 1068}
947 1069
… …
953 // this looks like a mess /. 1075 // this looks like a mess /.
954 // and it is a mess /. 1076 // and it is a mess /.
955 // yet we are trying to be perfect /. 1077 // yet we are trying to be perfect /.
956 // but the result still isn't perfect /. 1078 // but the result still isn't perfect /.
957 1079
1080 dTermDisplay;
1081 dTermGC;
1082
958 bool slow = this->slow 1083 bool slow = this->slow
959 || width != r->TermWin.fwidth 1084 || width != term->fwidth
960 || height != r->TermWin.fheight; 1085 || height != term->fheight
1086 || ascent != f->ascent;
961 1087
962 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 1088 int base = ascent; // sorry, incorrect: term->fbase;
963 1089
964 XGCValues v; 1090 XGCValues v;
965 v.foreground = r->pix_colors[fg]; 1091 v.foreground = term->pix_colors[fg];
966 v.font = f->fid; 1092 v.font = f->fid;
967 1093
968 if (enc2b) 1094 if (enc2b)
969 { 1095 {
970 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 1096 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
971 1097
972 if (bg == Color_bg && !slow) 1098 if (bg == Color_bg && !slow)
973 { 1099 {
974 v.background = r->pix_colors[bg]; 1100 v.background = term->pix_colors[bg];
975 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1101 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
976 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 1102 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
977 } 1103 }
978 else 1104 else
979 { 1105 {
980 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1106 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
981 1107
982 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1108 XChangeGC (disp, gc, GCForeground | GCFont, &v);
983 1109
984 if (slow) 1110 if (slow)
985 { 1111 {
986 do 1112 do
987 { 1113 {
988 if (xc->byte1 || xc->byte2) 1114 if (xc->byte1 || xc->byte2)
989 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1115 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
990 1116
991 x += r->TermWin.fwidth; 1117 x += term->fwidth;
992 xc++; len--; 1118 xc++; len--;
993 } 1119 }
994 while (len); 1120 while (len);
995 } 1121 }
996 else 1122 else
997 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1123 XDrawString16 (disp, d, gc, x, y + base, xc, len);
998 } 1124 }
999 } 1125 }
1000 else 1126 else
1001 { 1127 {
1002 const char *xc = enc_char (text, len, cs, slow); 1128 const char *xc = enc_char (text, len, cs, slow);
1003 1129
1004 if (bg == Color_bg && !slow) 1130 if (bg == Color_bg && !slow)
1005 { 1131 {
1006 v.background = r->pix_colors[bg]; 1132 v.background = term->pix_colors[bg];
1007 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1133 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1008 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1134 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1009 } 1135 }
1010 else 1136 else
1011 { 1137 {
1012 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1138 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1013 1139
1014 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1140 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1015 1141
1016 if (slow) 1142 if (slow)
1017 { 1143 {
1018 do 1144 do
1019 { 1145 {
1020 if (*xc) 1146 if (*xc)
1021 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1147 XDrawString (disp, d, gc, x, y + base, xc, 1);
1022 1148
1023 x += r->TermWin.fwidth; 1149 x += term->fwidth;
1024 xc++; len--; 1150 xc++; len--;
1025 } 1151 }
1026 while (len); 1152 while (len);
1027 } 1153 }
1028 else 1154 else
1029 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1155 XDrawString (disp, d, gc, x, y + base, xc, len);
1030 } 1156 }
1031 } 1157 }
1032} 1158}
1033 1159
1034///////////////////////////////////////////////////////////////////////////// 1160/////////////////////////////////////////////////////////////////////////////
1035 1161
1036#if XFT 1162#if XFT
1037 1163
1038struct rxvt_font_xft : rxvt_font { 1164struct rxvt_font_xft : rxvt_font
1165{
1039 rxvt_font_xft () { f = 0; } 1166 rxvt_font_xft ()
1167 {
1168 can_compose = true;
1169 f = 0;
1170 }
1040 1171
1041 void clear (); 1172 void clear ();
1042 1173
1043 rxvt_fontprop properties (); 1174 rxvt_fontprop properties ();
1044 1175
1045 bool load (const rxvt_fontprop &prop); 1176 bool load (const rxvt_fontprop &prop, bool force_prop);
1046 1177
1047 void draw (rxvt_drawable &d, int x, int y, 1178 void draw (rxvt_drawable &d, int x, int y,
1048 const text_t *text, int len, 1179 const text_t *text, int len,
1049 int fg, int bg); 1180 int fg, int bg);
1050 1181
1051 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1182 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1052 1183
1053protected: 1184protected:
1054 XftFont *f; 1185 XftFont *f;
1055}; 1186};
1056 1187
1057void 1188void
1058rxvt_font_xft::clear () 1189rxvt_font_xft::clear ()
1059{ 1190{
1060 if (f) 1191 if (f)
1061 { 1192 {
1062 XftFontClose (DISPLAY, f); 1193 XftFontClose (term->dpy, f);
1063 f = 0; 1194 f = 0;
1064 } 1195 }
1065} 1196}
1066 1197
1067rxvt_fontprop 1198rxvt_fontprop
… …
1071 1202
1072 FT_Face face = XftLockFace (f); 1203 FT_Face face = XftLockFace (f);
1073 1204
1074 p.width = width; 1205 p.width = width;
1075 p.height = height; 1206 p.height = height;
1207 p.ascent = ascent;
1076 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1208 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1077 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1209 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1078 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1210 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1079 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1211 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1080 1212
… …
1082 1214
1083 return p; 1215 return p;
1084} 1216}
1085 1217
1086bool 1218bool
1087rxvt_font_xft::load (const rxvt_fontprop &prop) 1219rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1088{ 1220{
1089 Display *disp = DISPLAY; 1221 dTermDisplay;
1090 1222
1091 clear (); 1223 clear ();
1092 1224
1093 FcPattern *p = FcNameParse ((FcChar8 *) name); 1225 FcPattern *p = FcNameParse ((FcChar8 *) name);
1094 1226
… …
1096 return false; 1228 return false;
1097 1229
1098 FcValue v; 1230 FcValue v;
1099 1231
1100 if (prop.height != rxvt_fontprop::unset 1232 if (prop.height != rxvt_fontprop::unset
1101 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1233 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1234 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1235 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104 1236
1105 if (prop.weight != rxvt_fontprop::unset 1237 if (prop.weight != rxvt_fontprop::unset
1106 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1238 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1107 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1239 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1108 1240
1109 if (prop.slant != rxvt_fontprop::unset 1241 if (prop.slant != rxvt_fontprop::unset
1110 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1242 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1111 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1243 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1112 1244
1113#if 0 // clipping unfortunately destroys our precious double-width-characters 1245#if 0 // clipping unfortunately destroys our precious double-width-characters
1114 // clip width, we can't do better, or can we? 1246 // clip width, we can't do better, or can we?
1115 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1247 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1116 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1248 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1117#endif 1249#endif
1118 1250
1119 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1251 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1120 FcPatternAddBool (p, FC_MINSPACE, 1); 1252 FcPatternAddBool (p, FC_MINSPACE, 1);
1121 1253
1122 // store generated name so iso14755 view gives better results 1254 // store generated name so iso14755 view gives better results
1123 set_name ((char *)FcNameUnparse (p)); 1255 set_name ((char *)FcNameUnparse (p));
1124 1256
1125 XftResult result; 1257 XftResult result;
1126 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1258 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1127 1259
1128 FcPatternDestroy (p); 1260 FcPatternDestroy (p);
1129 1261
1130 if (!match) 1262 if (!match)
1131 return false; 1263 return false;
… …
1133 int ftheight = 0; 1265 int ftheight = 0;
1134 bool success = true; 1266 bool success = true;
1135 1267
1136 for (;;) 1268 for (;;)
1137 { 1269 {
1270 p = FcPatternDuplicate (match);
1138 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1271 f = XftFontOpenPattern (disp, p);
1139 1272
1140 if (!f) 1273 if (!f)
1141 { 1274 {
1275 FcPatternDestroy (p);
1142 success = false; 1276 success = false;
1143 break; 1277 break;
1144 } 1278 }
1145 1279
1146 FT_Face face = XftLockFace (f); 1280 FT_Face face = XftLockFace (f);
… …
1152 1286
1153 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1287 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1154 1288
1155 XftUnlockFace (f); 1289 XftUnlockFace (f);
1156 1290
1157 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1291 int glheight = height;
1292
1293 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1158 { 1294 {
1159 FcChar16 ch = *t; 1295 FcChar16 ch = *t;
1160 1296
1161 if (cs != CS_UNICODE 1297 if (cs != CS_UNICODE
1162 && ch > 0x100 1298 && ch > 0x100
… …
1169 continue; 1305 continue;
1170 1306
1171 XGlyphInfo g; 1307 XGlyphInfo g;
1172 XftTextExtents16 (disp, f, &ch, 1, &g); 1308 XftTextExtents16 (disp, f, &ch, 1, &g);
1173 1309
1310 g.width -= g.x;
1311
1174 int wcw = wcwidth (ch); 1312 int wcw = WCWIDTH (ch);
1175 if (wcw > 0) g.width = g.width / wcw; 1313 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1176 1314
1177 if (width < g.width) width = g.width; 1315 if (width < g.width ) width = g.width;
1178 if (height < g.height) height = g.height; 1316 if (height < g.height ) height = g.height;
1317 if (glheight < g.height - g.y) glheight = g.height - g.y;
1318 }
1319
1320 if (!width)
1321 {
1322 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1323
1324 XftFontClose (disp, f);
1325 f = 0;
1326
1327 success = false;
1328 break;
1179 } 1329 }
1180 1330
1181 if (prop.height == rxvt_fontprop::unset 1331 if (prop.height == rxvt_fontprop::unset
1182 || height <= prop.height 1332 || (height <= prop.height && glheight <= prop.height)
1183 || height <= 2 1333 || height <= 2
1184 || !scalable) 1334 || !scalable)
1185 break; 1335 break;
1186 1336
1187 if (ftheight) 1337 if (ftheight)
… …
1194 ftheight -= height - prop.height; 1344 ftheight -= height - prop.height;
1195 } 1345 }
1196 else 1346 else
1197 ftheight = prop.height - 1; 1347 ftheight = prop.height - 1;
1198 1348
1199 XftFontClose (disp, f); 1349 XftFontClose (disp, f);
1200 FcPatternDel (match, FC_PIXEL_SIZE); 1350 FcPatternDel (match, FC_PIXEL_SIZE);
1201 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1351 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1202 } 1352 }
1203 1353
1204 FcPatternDestroy (match); 1354 FcPatternDestroy (match);
1205 1355
1206#if 0 // do it per-character 1356#if 0 // do it per-character
… …
1213 1363
1214 return success; 1364 return success;
1215} 1365}
1216 1366
1217bool 1367bool
1218rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1368rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1219{ 1369{
1220 careful = false; 1370 careful = false;
1221 1371
1222 if (!XftCharExists (DISPLAY, f, unicode)) 1372 if (!XftCharExists (term->dpy, f, unicode))
1223 return false; 1373 return false;
1224 1374
1225 if (!prop || prop->width == rxvt_fontprop::unset) 1375 if (!prop || prop->width == rxvt_fontprop::unset)
1226 return true; 1376 return true;
1227 1377
1228 // check character against base font bounding box 1378 // check character against base font bounding box
1229 FcChar32 ch = unicode; 1379 FcChar32 ch = unicode;
1230 XGlyphInfo g; 1380 XGlyphInfo g;
1231 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1381 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1232 1382
1233 int w = g.width; 1383 int w = g.width - g.x;
1234 int wcw = wcwidth (unicode); 1384 int wcw = max (WCWIDTH (unicode), 1);
1235 if (wcw > 0) w /= wcw;
1236 1385
1237 careful = w > prop->width; 1386 careful = g.x > 0 || w > prop->width * wcw;
1238 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1387
1388 if (careful && !OVERLAP_OK (w, wcw, prop))
1389 return false;
1390
1391 // this weeds out _totally_ broken fonts, or glyphs
1392 if (!OVERLAP_OK (g.xOff, wcw, prop))
1239 return false; 1393 return false;
1240 1394
1241 return true; 1395 return true;
1242} 1396}
1243 1397
1244void 1398void
1245rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1399rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1246 const text_t *text, int len, 1400 const text_t *text, int len,
1247 int fg, int bg) 1401 int fg, int bg)
1248{ 1402{
1249 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
1250
1251 int base = ascent; // should be fbase, but that is incorrect
1252
1253 XGlyphInfo extents; 1403 XGlyphInfo extents;
1254 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1404 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1255 FcChar32 *ep = enc; 1405 XftGlyphSpec *ep = enc;
1256 int ewidth = 0; 1406
1257 int xoff = 0; 1407 dTermDisplay;
1408 dTermGC;
1409
1410 int w = term->fwidth * len;
1411 int h = term->fheight;
1412
1413 bool buffered = bg >= Color_transparent
1414 && term->option (Opt_buffered);
1415
1416 // cut trailing spaces
1417 while (len && text [len - 1] == ' ')
1418 len--;
1419
1420 int x_ = buffered ? 0 : x;
1421 int y_ = buffered ? 0 : y;
1258 1422
1259 while (len) 1423 while (len)
1260 { 1424 {
1261 int cwidth = r->TermWin.fwidth; 1425 int cwidth = term->fwidth;
1262 FcChar32 fc = *text++; len--; 1426 FcChar32 fc = *text++; len--;
1263 FT_UInt gl;
1264 1427
1265 while (len && *text == NOCHAR) 1428 while (len && *text == NOCHAR)
1266 text++, len--, cwidth += r->TermWin.fwidth; 1429 text++, len--, cwidth += term->fwidth;
1267
1268 gl = XftCharIndex (d.display->display, f, fc);
1269 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1270 1430
1271 if (extents.xOff != cwidth && ep != enc) 1431 if (fc != ' ') // skip spaces
1272 {
1273 if (xoff > ewidth) xoff = ewidth;
1274 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1275 x + (ewidth - xoff >> 1),
1276 y + base, enc, ep - enc);
1277 x += ewidth;
1278
1279 ep = enc;
1280 ewidth = 0;
1281 xoff = 0;
1282 } 1432 {
1433 FT_UInt glyph = XftCharIndex (disp, f, fc);
1434 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1283 1435
1284 if (fc == ' ' && ep == enc) // skip leading spaces 1436 ep->glyph = glyph;
1437 ep->x = x_ + (cwidth - extents.xOff >> 1);
1438 ep->y = y_ + ascent;
1439
1440 if (extents.xOff == 0)
1441 ep->x = x_ + cwidth;
1442
1443 ep++;
1285 { 1444 }
1445
1286 x += cwidth; 1446 x_ += cwidth;
1287 continue; 1447 }
1448
1449 if (buffered)
1450 {
1451 if (ep != enc)
1288 } 1452 {
1453 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1289 1454
1455#ifdef HAVE_IMG
1456 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1457
1458 if (term->bg_img
1459 && (bg == Color_transparent || bg == Color_bg
1460 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1461 {
1462 int src_x = x, src_y = y;
1463
1464 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1465 {
1466 src_x += term->window_vt_x;
1467 src_y += term->window_vt_y;
1468 }
1469
1470 if (term->bg_img->w >= src_x + w
1471 && term->bg_img->h >= src_y + h)
1472 {
1473 XCopyArea (disp, term->bg_img->pm, d2, gc,
1474 src_x, src_y, w, h, 0, 0);
1475 }
1476 else
1477 {
1478 XGCValues gcv;
1479
1480 gcv.fill_style = FillTiled;
1481 gcv.tile = term->bg_img->pm;
1482 gcv.ts_x_origin = -src_x;
1483 gcv.ts_y_origin = -src_y;
1484
1485 XChangeGC (disp, gc,
1486 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1487 &gcv);
1488
1489 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1490
1491 gcv.fill_style = FillSolid;
1492 XChangeGC (disp, gc, GCFillStyle, &gcv);
1493 }
1494
1495 if (dst)
1496 {
1497 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1498
1499 // dst can only be set when bg >= 0
1500 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1501 }
1502 }
1503 else
1504#endif
1505 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1506
1507 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1508 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1509 }
1290 else 1510 else
1291 { 1511 clear_rect (d, x, y, w, h, bg);
1292 *ep++ = gl;
1293 ewidth += cwidth;
1294 xoff += extents.xOff;
1295 }
1296 }
1297
1298 if (ep != enc)
1299 { 1512 }
1300 if (xoff > ewidth) xoff = ewidth; 1513 else
1301 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1302 x + (ewidth - xoff >> 1),
1303 y + base, enc, ep - enc);
1304 } 1514 {
1515 clear_rect (d, x, y, w, h, bg);
1516 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1517 }
1305} 1518}
1519
1306#endif 1520#endif
1307 1521
1308///////////////////////////////////////////////////////////////////////////// 1522/////////////////////////////////////////////////////////////////////////////
1309 1523
1310rxvt_fontset::rxvt_fontset (rxvt_t r) 1524rxvt_fontset::rxvt_fontset (rxvt_term *term)
1311: r (r), fontdesc (0) 1525: fontdesc (0), term (term)
1312{ 1526{
1313 clear (); 1527 clear ();
1314} 1528}
1315 1529
1316rxvt_fontset::~rxvt_fontset () 1530rxvt_fontset::~rxvt_fontset ()
… …
1319} 1533}
1320 1534
1321void 1535void
1322rxvt_fontset::clear () 1536rxvt_fontset::clear ()
1323{ 1537{
1324 prop.width = prop.height = prop.weight = prop.slant 1538 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1325 = rxvt_fontprop::unset; 1539 = rxvt_fontprop::unset;
1540 force_prop = false;
1326 1541
1327 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1542 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1328 FONT_UNREF (*i); 1543 (*i)->unref ();
1329 1544
1330 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1545 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1331 delete *p; 1546 delete *p;
1332 1547
1333 free (fontdesc); fontdesc = 0; 1548 free (fontdesc); fontdesc = 0;
… …
1335 fonts.clear (); 1550 fonts.clear ();
1336 1551
1337 fallback = fallback_fonts; 1552 fallback = fallback_fonts;
1338} 1553}
1339 1554
1555void
1556rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1557{
1558 font->set_term (term);
1559
1560 font->cs = cs;
1561 font->loaded = false;
1562}
1563
1340rxvt_font * 1564rxvt_font *
1341rxvt_fontset::new_font (const char *name, codeset cs) 1565rxvt_fontset::new_font (const char *name, codeset cs)
1342{ 1566{
1343 rxvt_font *f; 1567 rxvt_font *f;
1344 1568
1345 if (!name || !*name) 1569 if (!name || !*name)
1346 { 1570 {
1347 name = ""; 1571 name = "";
1348 f = new rxvt_font_default (this); 1572 f = new rxvt_font_default (this);
1349 } 1573 }
… …
1360 f = new rxvt_font_x11; 1584 f = new rxvt_font_x11;
1361 } 1585 }
1362 else 1586 else
1363 f = new rxvt_font_x11; 1587 f = new rxvt_font_x11;
1364 1588
1365 f->set_term (r);
1366 f->set_name (strdup (name)); 1589 f->set_name (strdup (name));
1367 1590 prepare_font (f, cs);
1368 f->cs = cs;
1369 f->loaded = false;
1370 1591
1371 return f; 1592 return f;
1372} 1593}
1373 1594
1374///////////////////////////////////////////////////////////////////////////// 1595/////////////////////////////////////////////////////////////////////////////
1596
1597void
1598rxvt_fontset::push_font (rxvt_font *font)
1599{
1600 // the fontCount index is reserved for the overflow font, it is only
1601 // necessary when we get fontCount or more fonts, as they cannot be
1602 // represented in the rendition.
1603 if (fonts.size () == fontCount)
1604 {
1605 rxvt_font *f = new rxvt_font_overflow (this);
1606
1607 prepare_font (f, CS_UNICODE);
1608 fonts.push_back (f);
1609 }
1610
1611 fonts.push_back (font);
1612}
1375 1613
1376void 1614void
1377rxvt_fontset::add_fonts (const char *desc) 1615rxvt_fontset::add_fonts (const char *desc)
1378{ 1616{
1379 if (desc) 1617 if (desc)
… …
1381 char buf[512]; 1619 char buf[512];
1382 const char *end; 1620 const char *end;
1383 1621
1384 do 1622 do
1385 { 1623 {
1386 while (*desc <= ' ') desc++; 1624 while (*desc && *desc <= ' ')
1625 desc++;
1387 1626
1388 codeset cs = CS_UNICODE; 1627 codeset cs = CS_UNICODE;
1389 1628
1390 if (*desc == '[') 1629 if (*desc == '[')
1391 { 1630 {
… …
1407 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1646 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1408 else 1647 else
1409 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1648 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1410 1649
1411 desc++; 1650 desc++;
1412 while (*desc <= ' ') desc++; 1651 while (*desc <= ' ' && *desc) desc++;
1413 } 1652 }
1414 1653
1415 end = strchr (desc, ','); 1654 end = strchr (desc, ',');
1416 if (!end) 1655 if (!end)
1417 end = desc + strlen (desc); 1656 end = desc + strlen (desc);
1418 1657
1419 if (end - desc < 511) 1658 if (end - desc < 511)
1420 { 1659 {
1421 strncpy (buf, desc, end - desc); 1660 memcpy (buf, desc, end - desc);
1422 buf[end - desc] = 0; 1661 buf[end - desc] = 0;
1423 1662
1424 fonts.push_back (new_font (buf, cs)); 1663 push_font (new_font (buf, cs));
1425 } 1664 }
1426 else 1665 else
1427 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1666 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1428 1667
1429 desc = end + 1; 1668 desc = end + 1;
1430 } 1669 }
1431 while (*end); 1670 while (*end);
1432 } 1671 }
… …
1441 if (fonts[i]->loaded) 1680 if (fonts[i]->loaded)
1442 return true; 1681 return true;
1443 1682
1444 fonts[i]->loaded = true; 1683 fonts[i]->loaded = true;
1445 1684
1446 if (!fonts[i]->load (prop)) 1685 if (!fonts[i]->load (prop, force_prop))
1447 { 1686 {
1448 fonts[i]->cs = CS_UNKNOWN; 1687 fonts[i]->cs = CS_UNKNOWN;
1449 return false; 1688 return false;
1450 } 1689 }
1451 1690
… …
1457{ 1696{
1458 clear (); 1697 clear ();
1459 1698
1460 fontdesc = strdup (desc); 1699 fontdesc = strdup (desc);
1461 1700
1462 fonts.push_back (new_font (0, CS_UNICODE)); 1701 push_font (new_font (0, CS_UNICODE));
1463 realize_font (0); 1702 realize_font (0);
1464 1703
1465 add_fonts (desc); 1704 add_fonts (desc);
1466 1705
1467 return true; 1706 return true;
… …
1476 1715
1477 return -1; 1716 return -1;
1478} 1717}
1479 1718
1480int 1719int
1481rxvt_fontset::find_font (unicode_t unicode) 1720rxvt_fontset::find_font_idx (unicode_t unicode)
1482{ 1721{
1483 if (unicode >= 1<<20) 1722 if (unicode >= 1<<20)
1484 return 0; 1723 return 0;
1485 1724
1486 unicode_t hi = unicode >> 8; 1725 unicode_t hi = unicode >> 8;
… …
1501 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1740 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1502 goto next_font; 1741 goto next_font;
1503 1742
1504 if (!realize_font (i)) 1743 if (!realize_font (i))
1505 goto next_font; 1744 goto next_font;
1745
1746 if (prop.ascent != rxvt_fontprop::unset)
1747 max_it (f->ascent, prop.ascent);
1506 } 1748 }
1507 1749
1508 if (f->cs == CS_UNKNOWN) 1750 if (f->cs == CS_UNKNOWN)
1509 goto next_font; 1751 goto next_font;
1510 1752
1511 bool careful; 1753 bool careful;
1512 if (f->has_char (unicode, &prop, careful)) 1754 if (f->has_char (unicode, &prop, careful))
1513 { 1755 {
1514 if (careful) 1756 i = (i << 1) | careful;
1515 i |= 128;
1516 1757
1517 goto found; 1758 goto found;
1518 } 1759 }
1519 1760
1520 next_font: 1761 next_font:
1521 if (i == fonts.size () - 1) 1762 if (i == fonts.size () - 1)
1522 { 1763 {
1523 if (fallback->name) 1764 if (fallback->name)
1524 { 1765 {
1525 // search through the fallback list 1766 // search through the fallback list
1526 fonts.push_back (new_font (fallback->name, fallback->cs)); 1767 push_font (new_font (fallback->name, fallback->cs));
1527 fallback++; 1768 fallback++;
1528 } 1769 }
1529 else 1770 else
1530 { 1771 {
1531 // try to find a new font. 1772 // try to find a new font.
… …
1533 // way to configure this and xft is easier to hack in, 1774 // way to configure this and xft is easier to hack in,
1534 // while x11 has more framework in place already. 1775 // while x11 has more framework in place already.
1535 // TODO: this is a real resource hog, xft takes ages(?) 1776 // TODO: this is a real resource hog, xft takes ages(?)
1536#if XFT && USE_SLOW_LOOKUP 1777#if XFT && USE_SLOW_LOOKUP
1537 // grab the first xft font that seems suitable 1778 // grab the first xft font that seems suitable
1779 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1538 FcPattern *p = FcPatternCreate (); 1780 FcPattern *p = FcPatternCreate ();
1539 1781
1540 FcCharSet *s = FcCharSetCreate (); 1782 FcCharSet *s = FcCharSetCreate ();
1541 FcCharSetAddChar (s, unicode); 1783 FcCharSetAddChar (s, unicode);
1542 FcPatternAddCharSet (p, FC_CHARSET, s); 1784 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1549 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1791 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1550 FcPatternAddBool (p, FC_MINSPACE, 1); 1792 FcPatternAddBool (p, FC_MINSPACE, 1);
1551 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1793 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1552 1794
1553 XftResult result; 1795 XftResult result;
1554 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1796 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1555 1797
1556 FcPatternDestroy (p); 1798 FcPatternDestroy (p);
1557 1799
1558 if (match) 1800 if (match)
1559 { 1801 {
… …
1562 FcPatternDestroy (match); 1804 FcPatternDestroy (match);
1563 1805
1564 if (find_font (font) < 0) 1806 if (find_font (font) < 0)
1565 { 1807 {
1566 char fontname[4096]; 1808 char fontname[4096];
1567 sprintf (fontname, "xft:%-.4090s", font); 1809 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1568 1810
1569 fonts.push_back (new_font (fontname, CS_UNICODE)); 1811 push_font (new_font (fontname, CS_UNICODE));
1570 } 1812 }
1571 1813
1572 free (font); 1814 free (font);
1573 } 1815 }
1574#endif 1816#endif
… …
1586 while (hi >= fmap.size ()) 1828 while (hi >= fmap.size ())
1587 fmap.push_back (0); 1829 fmap.push_back (0);
1588 1830
1589 if (!fmap[hi]) 1831 if (!fmap[hi])
1590 { 1832 {
1591 fmap[hi] = (pagemap *)new pagemap; 1833 fmap[hi] = new pagemap;
1592 memset (fmap[hi], 0xff, sizeof (pagemap)); 1834 memset (fmap[hi], 0xff, sizeof (pagemap));
1593 } 1835 }
1594 1836
1595 (*fmap[hi])[unicode & 0xff] = i; 1837 (*fmap[hi])[unicode & 0xff] = i;
1596 } 1838 }
1597 1839
1598 return i; 1840 return i;
1599} 1841}
1600 1842
1601
1602

Diff Legend

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