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.79 by root, Sun Jan 8 01:02:15 2006 UTC vs.
Revision 1.199 by root, Thu Jun 17 00:08:35 2021 UTC

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

Diff Legend

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