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

Diff Legend

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