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.75 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.204 by root, Thu Jun 17 11:45:19 2021 UTC

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

Diff Legend

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