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.80 by root, Mon Jan 9 07:17:24 2006 UTC vs.
Revision 1.207 by root, Thu Jun 17 19:42:55 2021 UTC

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

Diff Legend

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