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

Diff Legend

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