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

Diff Legend

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