ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtfont.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.77 by root, Wed Jan 4 20:43:38 2006 UTC vs.
Revision 1.200 by root, Thu Jun 17 00:49:20 2021 UTC

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

Diff Legend

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