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.64 by root, Tue Jan 11 05:45:57 2005 UTC vs.
Revision 1.178 by root, Mon Feb 21 07:41:03 2011 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: defaultfont.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 2 of the License, or
… …
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 15 * GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 "rxvtutil.h" 24#include "rxvtutil.h"
25#include "rxvtfont.h" 25#include "rxvtfont.h"
26 26
27#include <cstdlib> 27#include <cstdlib>
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->TermWin.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
130 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 137 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
131 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 138 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
132 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
133 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
134#if XFT 139#if XFT
135 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"}, 140 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
136 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 141 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Andale Mono:antialias=false" }, 142 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
138 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, 143 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
139 144
140 // FreeMono is usually uglier than x fonts, so try last only. 145 // FreeMono is usually uglier than x fonts, so try after the others
141 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 146 { CS_UNICODE, "xft:FreeMono:autohint=true" },
142#endif 147#endif
143 148
149 // generic font fallback, put this last, as many iso10646 fonts have extents
150 // specified for all glyphs in the range they cover, but most are simply empty
151 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
152 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
144 { CS_UNKNOWN, 0 } 153 { CS_UNKNOWN, 0 }
145}; 154};
146 155
147// these characters are used to guess the font height and width 156// these characters are used to guess the font height and width
148// pango uses a similar algorithm and doesn't trust the font either. 157// pango uses a similar algorithm and doesn't trust the font either.
… …
150 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 159 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
151 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 160 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
152 0x304c, 0x672c, // が本 161 0x304c, 0x672c, // が本
153}; 162};
154 163
155#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 164#define dTermDisplay Display *disp = term->dpy
165#define dTermGC GC gc = term->gc
156 166
157///////////////////////////////////////////////////////////////////////////// 167/////////////////////////////////////////////////////////////////////////////
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 168
193static const char * 169static const char *
194enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 170enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
195{ 171{
196 uint8_t *buf = (uint8_t *)get_enc_buf (len); 172 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
173 uint8_t *res = buf;
197 174
198 while (len--) 175 while (len--)
199 { 176 {
200 uint32_t c = FROM_UNICODE (cs, *text++); 177 uint32_t c = FROM_UNICODE (cs, *text++);
201 178
… …
206 } 183 }
207 184
208 *buf++ = c; 185 *buf++ = c;
209 } 186 }
210 187
211 return (const char *)enc_buf; 188 return (const char *)res;
212} 189}
213 190
214static const XChar2b * 191static const XChar2b *
215enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 192enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
216{ 193{
217 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 194 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
195 XChar2b *res = buf;
218 196
219 while (len--) 197 while (len--)
220 { 198 {
221 uint32_t c = FROM_UNICODE (cs, *text++); 199 uint32_t c = FROM_UNICODE (cs, *text++);
222 200
… …
229 buf->byte1 = c >> 8; 207 buf->byte1 = c >> 8;
230 buf->byte2 = c; 208 buf->byte2 = c;
231 buf++; 209 buf++;
232 } 210 }
233 211
234 return (XChar2b *)enc_buf; 212 return res;
235} 213}
236 214
237///////////////////////////////////////////////////////////////////////////// 215/////////////////////////////////////////////////////////////////////////////
238 216
217rxvt_font::rxvt_font ()
218: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
219{
220}
221
239void 222void
240rxvt_font::set_name (char *name) 223rxvt_font::set_name (char *name_)
241{ 224{
242 if (this->name == name) 225 if (name == name_)
243 return; 226 return;
244 227
245 if (this->name) free (this->name); // let the compiler optimize 228 if (name) free (name); // let the compiler optimize
246 this->name = name; 229 name = name_;
247} 230}
248 231
249void 232void
250rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) 233rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
251{ 234{
252 if (color == Color_bg) 235 dTermDisplay;
253 XClearArea (d.display->display, d, x, y, w, h, FALSE); 236 dTermGC;
237
238 if (color == Color_bg || color == Color_transparent)
239 XClearArea (disp, d, x, y, w, h, false);
254 else if (color >= 0) 240 else if (color >= 0)
255 { 241 {
256#if XFT 242#if XFT
243 Picture dst;
244
245# ifdef HAVE_BG_PIXMAP
246 if (term->bg_pixmap
247 && !term->pix_colors[color].is_opaque ()
248 && ((dst = XftDrawPicture (d))))
249 {
250 XClearArea (disp, d, x, y, w, h, false);
251
252 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
253 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
254 }
255 else
256# endif
257 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258
258#else 259#else
259 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 260 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 261 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 262#endif
262 } 263 }
263} 264}
264 265
265#include "table/linedraw.h" 266/////////////////////////////////////////////////////////////////////////////
266 267
267struct rxvt_font_default : rxvt_font { 268struct rxvt_font_default : rxvt_font {
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)
… …
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 if (IS_COMPOSE (unicode))
314 return true; 319 return true;
315 320
316 switch (unicode) 321 switch (unicode)
… …
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{
341 dTermDisplay;
342 dTermGC;
343
336 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 344 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
337 345
338 XSetForeground (d.display->display, TGC, r->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
339 347
340 while (len) 348 while (len)
341 { 349 {
342#if ENABLE_COMBINING 350#if ENABLE_COMBINING
343 compose_char *cc; 351 compose_char *cc;
… …
347 355
348 while (++text, --len && *text == NOCHAR) 356 while (++text, --len && *text == NOCHAR)
349 ; 357 ;
350 358
351 int width = text - tp; 359 int width = text - tp;
352 int fwidth = r->TermWin.fwidth * width; 360 int fwidth = term->fwidth * width;
353 361
362#ifdef BUILTIN_GLYPHS
354 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
355 { 364 {
365# include "table/linedraw.h"
356 uint16_t offs = linedraw_offs[t - 0x2500]; 366 uint16_t offs = linedraw_offs[t - 0x2500];
357 uint32_t *a = linedraw_command + (offs >> 4); 367 uint32_t *a = linedraw_command + (offs >> 4);
358 uint32_t *b = a + (offs & 15); 368 uint32_t *b = a + (offs & 15);
359 369
360 int W = fwidth; 370 int W = fwidth;
361 int H = r->TermWin.fheight; 371 int H = term->fheight;
362 372
363 int x_[16]; 373 int x_[16];
364 int y_[16]; 374 int y_[16];
365 375
366 for (int i = 0; i <= 8; i++) 376 for (int i = 0; i <= 8; i++)
… …
374 384
375 XGCValues gcv; 385 XGCValues gcv;
376 386
377 gcv.cap_style = CapButt; 387 gcv.cap_style = CapButt;
378 gcv.line_width = 0; 388 gcv.line_width = 0;
379 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 389 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
380 390
381 while (a < b) 391 while (a < b)
382 { 392 {
383 uint32_t command = *a++; 393 uint32_t command = *a++;
384 394
… …
391 int y2 = y_[(command >> 0) & 15]; 401 int y2 = y_[(command >> 0) & 15];
392 402
393 switch (op) 403 switch (op)
394 { 404 {
395 case 0: // line 405 case 0: // line
396 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 406 XDrawLine (disp, d, gc, x1, y1, x2, y2);
397 break; 407 break;
398 408
399 case 1: // rectangle, possibly stippled 409 case 1: // rectangle, possibly stippled
400 if (a) 410 if (a)
401 { 411 {
402 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
403 413
404 gcv.fill_style = FillStippled; 414 gcv.fill_style = FillStippled;
405 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
406 gcv.ts_x_origin = x; 416 gcv.ts_x_origin = x;
407 gcv.ts_y_origin = y; 417 gcv.ts_y_origin = y;
408 418
409 XChangeGC (d.display->display, TGC, 419 XChangeGC (disp, gc,
410 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 420 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
411 &gcv); 421 &gcv);
412 } 422 }
413 423
414 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 424 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
415 425
416 if (a) 426 if (a)
417 { 427 {
418 XFreePixmap (d.display->display, gcv.stipple); 428 XFreePixmap (disp, gcv.stipple);
419 gcv.stipple = 0; 429 gcv.stipple = 0;
420 gcv.fill_style = FillSolid; 430 gcv.fill_style = FillSolid;
421 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 431 XChangeGC (disp, gc, GCFillStyle, &gcv);
422 } 432 }
423 break; 433 break;
424 case 2: // arc 434 case 2: // arc
425 XDrawArc (d.display->display, d, TGC, 435 XDrawArc (disp, d, gc,
426 x1 - W/2, y1 - H/2, W-1, H-1, 436 x1 - W/2, y1 - H/2, W-1, H-1,
427 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
428 break; 438 break;
429 } 439 }
430 } 440 }
431 } 441 }
442#else
443 if (0)
444 ;
445#endif
432#if ENABLE_COMBINING 446#if ENABLE_COMBINING
433 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
434 { 448 {
449 min_it (width, 2); // we only support wcwidth up to 2
450
435 text_t chrs[2]; 451 text_t chrs[2];
436 width = min (2, width);
437 chrs [1] = NOCHAR; 452 chrs [1] = NOCHAR;
438 453
439 *chrs = cc->c1; 454 *chrs = cc->c1;
440 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
441 f1->draw (d, x, y, chrs, width, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
442 457
443 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
444 { 459 {
445 bool careful; 460 bool careful;
446 461
447 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
448 *chrs = cc->c2; 463 *chrs = cc->c2;
449 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
450 ? f1 465 ? f1
451 : (*fs)[fs->find_font (cc->c2)]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
452 467
453 f2->draw (d, x, y, chrs, width, fg, -1); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
454 } 469 }
455 } 470 }
456#endif 471#endif
457 else 472 else
458 switch (t) 473 switch (t)
… …
461 case ZERO_WIDTH_CHAR: 476 case ZERO_WIDTH_CHAR:
462 case NOCHAR: 477 case NOCHAR:
463 break; 478 break;
464 479
465 default: 480 default:
466 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, 481 XDrawRectangle (disp, d, gc, x + 2, y + 2,
467 fwidth - 4, r->TermWin.fheight - 4); 482 fwidth - 4, term->fheight - 4);
468 } 483 }
469 484
470 x += fwidth; 485 x += fwidth;
471 } 486 }
472} 487}
488
489struct rxvt_font_overflow : rxvt_font {
490 struct rxvt_fontset *fs;
491
492 rxvt_font_overflow (rxvt_fontset *fs)
493 : rxvt_font ()
494 {
495 this->fs = fs;
496 }
497
498 rxvt_fontprop properties ()
499 {
500 rxvt_fontprop p;
501
502 p.width = p.height = 1;
503 p.ascent = rxvt_fontprop::unset;
504 p.weight = rxvt_fontprop::medium;
505 p.slant = rxvt_fontprop::roman;
506
507 return p;
508 }
509
510 bool load (const rxvt_fontprop &prop, bool force_prop)
511 {
512 width = 1; height = 1;
513 ascent = 1; descent = 0;
514
515 set_name (strdup ("built-in rendition overflow font"));
516
517 return true;
518 }
519
520 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
521 {
522 return false;
523 }
524
525 void draw (rxvt_drawable &d, int x, int y,
526 const text_t *text, int len,
527 int fg, int bg)
528 {
529 while (len--)
530 {
531 int fid = fs->find_font_idx (*text);
532 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
533 ++text;
534 x += term->fwidth;
535 }
536 }
537};
473 538
474///////////////////////////////////////////////////////////////////////////// 539/////////////////////////////////////////////////////////////////////////////
475 540
476struct rxvt_font_x11 : rxvt_font { 541struct rxvt_font_x11 : rxvt_font {
477 rxvt_font_x11 () { f = 0; } 542 rxvt_font_x11 () { f = 0; }
478 543
479 void clear (); 544 void clear ();
480 545
481 rxvt_fontprop properties (); 546 rxvt_fontprop properties ();
482 547
483 bool load (const rxvt_fontprop &prop); 548 bool load (const rxvt_fontprop &prop, bool force_prop);
484 549
485 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 550 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
486 551
487 void draw (rxvt_drawable &d, int x, int y, 552 void draw (rxvt_drawable &d, int x, int y,
488 const text_t *text, int len, 553 const text_t *text, int len,
489 int fg, int bg); 554 int fg, int bg);
490 555
491 bool slow; // wether this is a proportional font or has other funny characteristics 556 bool slow; // whether this is a proportional font or has other funny characteristics
492 XFontStruct *f; 557 XFontStruct *f;
493 codeset cs;
494 bool enc2b, encm; 558 bool enc2b, encm;
495 559
496 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 560 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
497 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 561 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
498 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 562 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
499 bool set_properties (rxvt_fontprop &p, const char *name); 563 bool set_properties (rxvt_fontprop &p, const char *name);
500}; 564};
501 565
502char * 566char *
503rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 567rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
504{ 568{
505 unsigned long value; 569 unsigned long value;
506 570
507 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 571 if (XGetFontProperty (f, property, &value))
508 return XGetAtomName (DISPLAY, value); 572 return XGetAtomName (term->dpy, value);
509 else 573 else
510 return rxvt_strdup (repl); 574 return repl ? strdup (repl) : 0;
511} 575}
512 576
513rxvt_fontprop 577rxvt_fontprop
514rxvt_font_x11::properties () 578rxvt_font_x11::properties ()
515{ 579{
… …
519} 583}
520 584
521bool 585bool
522rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 586rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
523{ 587{
524 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 588 p.width = width != rxvt_fontprop::unset ? width
589 : avgwidth ? (avgwidth + 1) / 10
590 : (height + 1) / 2;
525 p.height = height; 591 p.height = height;
592 p.ascent = rxvt_fontprop::unset;
526 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 593 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
527 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 594 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
528 595
529 return true; 596 return true;
530} 597}
… …
533rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 600rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
534{ 601{
535 unsigned long height; 602 unsigned long height;
536 603
537#if 0 604#if 0
538 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 605 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
539 return false; 606 return false;
540#else 607#else
541 height = f->ascent + f->descent; 608 height = f->ascent + f->descent;
542#endif 609#endif
543 610
544 unsigned long avgwidth; 611 unsigned long avgwidth;
545 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 612 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
546 avgwidth = 0; 613 avgwidth = 0;
547 614
548 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 615 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
549 char *slant = get_property (f, "SLANT", "r"); 616 char *slant = get_property (f, term->xa [XA_SLANT], "r");
550 617
551 set_properties (p, height, weight, slant, avgwidth); 618 set_properties (p, height, weight, slant, avgwidth);
552 619
553 free (weight); 620 free (weight);
554 free (slant); 621 free (slant);
555 622
623 p.ascent = f->ascent;
624
556 return true; 625 return true;
557} 626}
558 627
559bool 628bool
560rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 629rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
561{ 630{
631 dTermDisplay;
562 int slashes = 0; 632 int slashes = 0;
563 const char *comp[13]; 633 const char *comp[13];
564 634
565 for (const char *c = name; *c; c++) 635 for (const char *c = name; *c; c++)
566 if (*c == '-') 636 if (*c == '-')
… …
574 if (slashes >= 13 644 if (slashes >= 13
575 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 645 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
576 && (*comp[11] >= '0' && *comp[11] <= '9')) 646 && (*comp[11] >= '0' && *comp[11] <= '9'))
577 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 647 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
578 648
579 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 649 XFontStruct *f = XLoadQueryFont (disp, name);
580 650
581 if (f) 651 if (f)
582 { 652 {
583 // the font should really exist now. if not, we have a problem 653 // the font should really exist now. if not, we have a problem
584 // (e.g. if the user did xset fp rehash just when we were searching fonts). 654 // (e.g. if the user did xset fp rehash just when we were searching fonts).
585 // in that case, just return garbage. 655 // in that case, just return garbage.
586 bool ret = set_properties (p, f); 656 bool ret = set_properties (p, f);
587 XFreeFont (DISPLAY, f); 657 XFreeFont (disp, f);
588 return ret; 658 return ret;
589 } 659 }
590 else 660 else
591 return false; 661 return false;
592} 662}
593 663
594// fix the size of scalable fonts 664// fix the size of scalable fonts
595static bool 665static bool
596replace_field (char *buf, const char *name, int index, const char old, const char *replace) 666replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
597{ 667{
598 int slashes = 0; 668 int slashes = 0;
599 const char *field, *end; 669 const char *field, *end;
600 670
601 for (const char *c = name; *c; c++) 671 for (const char *c = name; *c; c++)
… …
611 break; 681 break;
612 } 682 }
613 683
614 if (slashes >= 13 && (!old || *field == old)) 684 if (slashes >= 13 && (!old || *field == old))
615 { 685 {
616 // TODO: check for overflow in font-name 686 size_t len = field - name;
617 strncpy (buf, name, field - name); 687 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
618 buf += field - name; 688 memcpy (*ptr, name, len);
619 strcpy (buf, replace); 689 strcpy (*ptr + len, replace);
620 strcat (buf, end); 690 strcat (*ptr, end);
621 691
622 return true; 692 return true;
623 } 693 }
624 else 694 else
625 { 695 {
626 strcpy (buf, name); 696 *ptr = strdup (name);
627 697
628 return false; 698 return false;
629 } 699 }
630} 700}
631 701
632bool 702bool
633rxvt_font_x11::load (const rxvt_fontprop &prop) 703rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
634{ 704{
705 dTermDisplay;
706
635 clear (); 707 clear ();
636 708
637 char field_str[64]; // enough for 128 bits 709 char field_str[64]; // enough for 128 bits
638 710
639 // first morph the font if required 711 // first morph the font if required
640 if (prop.weight != rxvt_fontprop::unset 712 if (force_prop)
641 || prop.slant != rxvt_fontprop::unset)
642 { 713 {
643 char fname[1024]; 714 char *fname;
644 715
645 if (name[0] != '-') 716 if (name[0] != '-')
646 { 717 {
647 f = XLoadQueryFont (DISPLAY, name); 718 f = XLoadQueryFont (disp, name);
648 719
649 if (!f) 720 if (!f)
650 return false; 721 return false;
651 722
652 char *new_name = get_property (f, "FONT", name); 723 char *new_name = get_property (f, XA_FONT, 0);
653 724
654 if (new_name) 725 if (new_name)
655 set_name (new_name); 726 set_name (new_name);
656 else 727 else
657 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 728 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
658 729
659 XFreeFont (DISPLAY, f); 730 XFreeFont (disp, f);
660 f = 0; 731 f = 0;
661 } 732 }
662 733
663 if (prop.weight != rxvt_fontprop::unset) 734 if (prop.weight != rxvt_fontprop::unset)
664 { 735 {
665 replace_field (fname, name, 2, 0, 736 replace_field (&fname, name, 2, 0,
666 prop.weight < rxvt_fontprop::bold 737 prop.weight < rxvt_fontprop::bold
667 ? "medium" : "bold"); 738 ? "medium" : "bold");
668 set_name (strdup (fname)); 739 set_name (fname);
669 } 740 }
670 741
671 if (prop.slant != rxvt_fontprop::unset) 742 if (prop.slant != rxvt_fontprop::unset)
672 { 743 {
673 replace_field (fname, name, 3, 0, 744 replace_field (&fname, name, 3, 0,
674 prop.slant < rxvt_fontprop::italic 745 prop.slant < rxvt_fontprop::italic
675 ? "r" : "i"); // TODO: handle "o"blique, too 746 ? "r" : "i"); // TODO: handle "o"blique, too
676 set_name (strdup (fname)); 747 set_name (fname);
677 } 748 }
678 } 749 }
679 750
680 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 751 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
681 ? 0 : prop.height); 752 ? 0 : prop.height);
… …
694 ~font_weight () { free (name); } 765 ~font_weight () { free (name); }
695 }; 766 };
696 767
697 char **list; 768 char **list;
698 int count; 769 int count;
699 list = XListFonts (DISPLAY, name, 4000, &count); 770 list = XListFonts (disp, name, 4000, &count);
700 771
701 set_name (0); 772 set_name (0);
702 773
703 if (!list) 774 if (!list)
704 return false; 775 return false;
… …
706 font_weight *fonts = new font_weight[count]; 777 font_weight *fonts = new font_weight[count];
707 778
708 for (int i = 0; i < count; i++) 779 for (int i = 0; i < count; i++)
709 { 780 {
710 rxvt_fontprop p; 781 rxvt_fontprop p;
711 char fname[1024]; 782 char *fname;
712 783
713 int diff = 0; 784 int diff = 0;
714 785
715 if (replace_field (fname, list[i], 6, '0', field_str)) 786 if (replace_field (&fname, list[i], 6, '0', field_str))
716 diff += 10; // slightly penalize scalable fonts 787 diff += 10; // slightly penalize scalable fonts
788 else
789 {
790 free (fname);
791 if (replace_field (&fname, list[i], 11, '0', "0"))
792 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
793 }
717 794
718 if (!set_properties (p, fname)) 795 if (!set_properties (p, fname)
796 // also weed out too large fonts
797 || (prop.height != rxvt_fontprop::unset
798 && p.height > prop.height))
799 {
800 free (fname);
719 continue; 801 continue;
720 802 }
721 if (prop.height != rxvt_fontprop::unset
722 && p.height > prop.height) // weed out too large fonts
723 continue;
724 803
725 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 804 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
726 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 805 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
727 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 806 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
728 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 807 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
729 808
730 fonts[i].name = strdup (fname); 809 fonts[i].name = fname;
731 fonts[i].diff = diff; 810 fonts[i].diff = diff;
732 } 811 }
733 812
734 XFreeFontNames (list); 813 XFreeFontNames (list);
735 814
… …
737 for (;;) 816 for (;;)
738 { 817 {
739 font_weight *best = fonts + count - 1; 818 font_weight *best = fonts + count - 1;
740 819
741 for (font_weight *w = best; w-- > fonts; ) 820 for (font_weight *w = best; w-- > fonts; )
742 if (w->diff < best->diff) 821 if (w->diff <= best->diff)
743 best = w; 822 best = w;
744 823
745 if (!best->name 824 if (!best->name
746 || !(f = XLoadQueryFont (DISPLAY, best->name))) 825 || !(f = XLoadQueryFont (disp, best->name)))
747 break; 826 break;
748 827
749 set_name (best->name); 828 set_name (best->name);
750 best->clear (); 829 best->clear ();
751 830
… …
764 delete [] fonts; 843 delete [] fonts;
765 844
766 if (!f) 845 if (!f)
767 return false; 846 return false;
768 847
769 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 848 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
770 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 849 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
850
851 cs = CS_UNKNOWN;
771 852
772 if (registry && encoding) 853 if (registry && encoding)
773 { 854 {
774 char charset[64]; 855 char charset[64];
775 snprintf (charset, 64, "%s-%s", registry, encoding); 856 snprintf (charset, 64, "%s-%s", registry, encoding);
776 857
777 cs = codeset_from_name (charset); 858 cs = codeset_from_name (charset);
778 } 859
779 else 860 if (cs == CS_UNKNOWN)
861 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
780 { 862 }
863
864 free (registry);
865 free (encoding);
866
867 if (cs == CS_UNKNOWN)
868 {
781 const char *charset = get_property (f, "FONT", 0); 869 char *value = get_property (f, XA_FONT, 0);
870 const char *charset = value;
782 871
783 if (!charset) 872 if (!charset)
784 charset = name; 873 charset = name;
785 874
786 int count = 13; 875 int count = 13;
787 while (*charset) 876 while (*charset)
788 if (*charset++ == '-' && !--count) 877 if (*charset++ == '-' && !--count)
789 break; 878 break;
790 879
791 cs = codeset_from_name (charset); 880 cs = codeset_from_name (charset);
881 if (cs == CS_UNKNOWN)
882 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
883
884 free (value);
885 }
886
887 if (cs == CS_UNKNOWN)
792 } 888 {
793 889 clear ();
794 free (registry); 890 return false;
795 free (encoding); 891 }
796 892
797 if (cs == CS_UNICODE) 893 if (cs == CS_UNICODE)
798 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 894 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
799 895
800 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 896 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
801 enc2b = encm || f->max_char_or_byte2 > 255; 897 enc2b = encm || f->max_char_or_byte2 > 255;
802 898
803 slow = false; 899 slow = false;
804 900
805#if 1 // only used for slow detection, TODO optimize 901#if 1 // only used for slow detection, TODO optimize
806 if (f->min_bounds.width == f->max_bounds.width) 902 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
807 width = f->min_bounds.width;
808 else if (f->per_char == NULL)
809 width = f->max_bounds.width; 903 width = f->max_bounds.width;
810 else 904 else
811 { 905 {
812 slow = true; 906 slow = true;
813 907
814 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 908 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
815 909
816 if (encm) 910 if (encm)
817 N += (f->max_byte1 - f->min_byte1) 911 N += (f->max_byte1 - f->min_byte1)
818 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 912 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
819 913
820 while (N) 914 while (N)
821 { 915 {
822 if (f->per_char[N].width > width) 916 if (f->per_char[N].width > width)
823 width = f->per_char[N].width; 917 width = f->per_char[N].width;
824 918
… …
827 } 921 }
828#endif 922#endif
829 923
830 width = 1; 924 width = 1;
831 925
832 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 926 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
833 { 927 {
834 if (cs != CS_UNICODE
835 && *t > 0x100
836 && FROM_UNICODE (cs, *t) == NOCHAR) 928 if (FROM_UNICODE (cs, *t) == NOCHAR)
837 continue; 929 continue;
838 930
839 // ignore characters we wouldn't use anyways 931 // ignore characters we wouldn't use anyways
840 bool careful; 932 bool careful;
841 if (!has_char (*t, &prop, careful)) 933 if (!has_char (*t, &prop, careful))
… …
845 937
846 XCharStruct g; 938 XCharStruct g;
847 int dir_ret, asc_ret, des_ret; 939 int dir_ret, asc_ret, des_ret;
848 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 940 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
849 941
850 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 942 int wcw = WCWIDTH (*t);
943 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
851 944
852 if (width < g.width) width = g.width; 945 if (width < g.width) width = g.width;
853 }
854
855 if (cs == CS_UNKNOWN)
856 { 946 }
857 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
858 947
948#if 0 // do it per-character
949 if (prop && width > prop->width)
950 {
859 clear (); 951 clear ();
860 return false; 952 return false;
861 } 953 }
862
863#if 0 // do it per-character
864 if (prop && width > prop->width)
865 {
866 clear ();
867 return false;
868 }
869#endif 954#endif
870 955
871 return true; 956 return true;
872} 957}
873 958
874void 959void
875rxvt_font_x11::clear () 960rxvt_font_x11::clear ()
876{ 961{
877 if (f) 962 if (f)
878 { 963 {
879 XFreeFont (DISPLAY, f); 964 XFreeFont (term->dpy, f);
880 f = 0; 965 f = 0;
881 } 966 }
882} 967}
883 968
884bool 969bool
885rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 970rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
886{ 971{
972 careful = false;
973
887 uint32_t ch = FROM_UNICODE (cs, unicode); 974 uint32_t ch = FROM_UNICODE (cs, unicode);
888 975
889 if (ch == NOCHAR) 976 if (ch == NOCHAR)
890 return false; 977 return false;
891 978
892 /* check wether the character exists in _this_ font. horrible. */ 979 /* check whether the character exists in _this_ font. horrible. */
893 XCharStruct *xcs; 980 XCharStruct *xcs;
894 981
895 if (encm) 982 if (encm)
896 { 983 {
897 unsigned char byte1 = ch >> 8; 984 unsigned char byte1 = ch >> 8;
… …
927 return false; 1014 return false;
928 1015
929 if (!prop || prop->width == rxvt_fontprop::unset) 1016 if (!prop || prop->width == rxvt_fontprop::unset)
930 return true; 1017 return true;
931 1018
932 // check character against base font bounding box 1019 // check whether character overlaps previous/next character
933 int w = xcs->width; 1020 int w = xcs->rbearing - xcs->lbearing;
934 int wcw = wcwidth (unicode); 1021 int wcw = max (WCWIDTH (unicode), 1);
935 if (wcw > 0) w /= wcw;
936 1022
937 careful = w > prop->width; 1023 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
938 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1024
1025 if (careful && !OVERLAP_OK (w, wcw, prop))
939 return false; 1026 return false;
940 1027
941 return true; 1028 return true;
942} 1029}
943 1030
… …
949 // this looks like a mess /. 1036 // this looks like a mess /.
950 // and it is a mess /. 1037 // and it is a mess /.
951 // yet we are trying to be perfect /. 1038 // yet we are trying to be perfect /.
952 // but the result still isn't perfect /. 1039 // but the result still isn't perfect /.
953 1040
1041 dTermDisplay;
1042 dTermGC;
1043
954 bool slow = this->slow 1044 bool slow = this->slow
955 || width != r->TermWin.fwidth 1045 || width != term->fwidth
956 || height != r->TermWin.fheight; 1046 || height != term->fheight;
957 1047
958 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 1048 int base = ascent; // sorry, incorrect: term->fbase;
959 1049
960 XGCValues v; 1050 XGCValues v;
961 v.foreground = r->pix_colors[fg]; 1051 v.foreground = term->pix_colors[fg];
962 v.font = f->fid; 1052 v.font = f->fid;
963 1053
964 if (enc2b) 1054 if (enc2b)
965 { 1055 {
966 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 1056 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
967 1057
968 if (bg == Color_bg && !slow) 1058 if (bg == Color_bg && !slow)
969 { 1059 {
970 v.background = r->pix_colors[bg]; 1060 v.background = term->pix_colors[bg];
971 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1061 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
972 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 1062 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
973 } 1063 }
974 else 1064 else
975 { 1065 {
976 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1066 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
977 1067
978 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1068 XChangeGC (disp, gc, GCForeground | GCFont, &v);
979 1069
980 if (slow) 1070 if (slow)
981 { 1071 {
982 do 1072 do
983 { 1073 {
984 if (xc->byte1 || xc->byte2) 1074 if (xc->byte1 || xc->byte2)
985 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1075 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
986 1076
987 x += r->TermWin.fwidth; 1077 x += term->fwidth;
988 xc++; len--; 1078 xc++; len--;
989 } 1079 }
990 while (len); 1080 while (len);
991 } 1081 }
992 else 1082 else
993 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1083 XDrawString16 (disp, d, gc, x, y + base, xc, len);
994 } 1084 }
995 } 1085 }
996 else 1086 else
997 { 1087 {
998 const char *xc = enc_char (text, len, cs, slow); 1088 const char *xc = enc_char (text, len, cs, slow);
999 1089
1000 if (bg == Color_bg && !slow) 1090 if (bg == Color_bg && !slow)
1001 { 1091 {
1002 v.background = r->pix_colors[bg]; 1092 v.background = term->pix_colors[bg];
1003 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1093 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1004 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1094 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1005 } 1095 }
1006 else 1096 else
1007 { 1097 {
1008 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1098 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1009 1099
1010 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1100 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1011 1101
1012 if (slow) 1102 if (slow)
1013 { 1103 {
1014 do 1104 do
1015 { 1105 {
1016 if (*xc) 1106 if (*xc)
1017 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1107 XDrawString (disp, d, gc, x, y + base, xc, 1);
1018 1108
1019 x += r->TermWin.fwidth; 1109 x += term->fwidth;
1020 xc++; len--; 1110 xc++; len--;
1021 } 1111 }
1022 while (len); 1112 while (len);
1023 } 1113 }
1024 else 1114 else
1025 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1115 XDrawString (disp, d, gc, x, y + base, xc, len);
1026 } 1116 }
1027 } 1117 }
1028} 1118}
1029 1119
1030///////////////////////////////////////////////////////////////////////////// 1120/////////////////////////////////////////////////////////////////////////////
… …
1036 1126
1037 void clear (); 1127 void clear ();
1038 1128
1039 rxvt_fontprop properties (); 1129 rxvt_fontprop properties ();
1040 1130
1041 bool load (const rxvt_fontprop &prop); 1131 bool load (const rxvt_fontprop &prop, bool force_prop);
1042 1132
1043 void draw (rxvt_drawable &d, int x, int y, 1133 void draw (rxvt_drawable &d, int x, int y,
1044 const text_t *text, int len, 1134 const text_t *text, int len,
1045 int fg, int bg); 1135 int fg, int bg);
1046 1136
1047 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1137 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1048 1138
1049protected: 1139protected:
1050 XftFont *f; 1140 XftFont *f;
1051}; 1141};
1052 1142
1053void 1143void
1054rxvt_font_xft::clear () 1144rxvt_font_xft::clear ()
1055{ 1145{
1056 if (f) 1146 if (f)
1057 { 1147 {
1058 XftFontClose (DISPLAY, f); 1148 XftFontClose (term->dpy, f);
1059 f = 0; 1149 f = 0;
1060 } 1150 }
1061} 1151}
1062 1152
1063rxvt_fontprop 1153rxvt_fontprop
… …
1067 1157
1068 FT_Face face = XftLockFace (f); 1158 FT_Face face = XftLockFace (f);
1069 1159
1070 p.width = width; 1160 p.width = width;
1071 p.height = height; 1161 p.height = height;
1162 p.ascent = ascent;
1072 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1163 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1073 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1164 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1074 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1165 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1075 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1166 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1076 1167
… …
1078 1169
1079 return p; 1170 return p;
1080} 1171}
1081 1172
1082bool 1173bool
1083rxvt_font_xft::load (const rxvt_fontprop &prop) 1174rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1084{ 1175{
1176 dTermDisplay;
1177
1085 clear (); 1178 clear ();
1086 1179
1087 FcPattern *p = FcNameParse ((FcChar8 *) name); 1180 FcPattern *p = FcNameParse ((FcChar8 *) name);
1088 1181
1089 if (!p) 1182 if (!p)
1090 return false; 1183 return false;
1091 1184
1092 FcValue v; 1185 FcValue v;
1093 1186
1094 if (prop.height != rxvt_fontprop::unset 1187 if (prop.height != rxvt_fontprop::unset
1095 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1188 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1096 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1189 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1097 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1190 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1098 1191
1099 if (prop.weight != rxvt_fontprop::unset 1192 if (prop.weight != rxvt_fontprop::unset
1100 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1193 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1101 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1194 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1102 1195
1103 if (prop.slant != rxvt_fontprop::unset 1196 if (prop.slant != rxvt_fontprop::unset
1104 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1197 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1105 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1198 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1106 1199
1107#if 0 // clipping unfortunately destroys our precious double-width-characters 1200#if 0 // clipping unfortunately destroys our precious double-width-characters
1108 // clip width, we can't do better, or can we? 1201 // clip width, we can't do better, or can we?
1109 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1202 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1110 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1203 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1111#endif 1204#endif
1112 1205
1113 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1206 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1114 FcPatternAddBool (p, FC_MINSPACE, 1); 1207 FcPatternAddBool (p, FC_MINSPACE, 1);
1115 1208
1116 // store generated name so iso14755 view gives better results 1209 // store generated name so iso14755 view gives better results
1117 set_name ((char *)FcNameUnparse (p)); 1210 set_name ((char *)FcNameUnparse (p));
1118 1211
1119 XftResult result; 1212 XftResult result;
1120 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1213 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1121 1214
1122 FcPatternDestroy (p); 1215 FcPatternDestroy (p);
1123 1216
1124 if (!match) 1217 if (!match)
1125 return false; 1218 return false;
… …
1127 int ftheight = 0; 1220 int ftheight = 0;
1128 bool success = true; 1221 bool success = true;
1129 1222
1130 for (;;) 1223 for (;;)
1131 { 1224 {
1132 f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); 1225 p = FcPatternDuplicate (match);
1226 f = XftFontOpenPattern (disp, p);
1133 1227
1134 if (!f) 1228 if (!f)
1135 { 1229 {
1230 FcPatternDestroy (p);
1136 success = false; 1231 success = false;
1137 break; 1232 break;
1138 } 1233 }
1139 1234
1140 FT_Face face = XftLockFace (f); 1235 FT_Face face = XftLockFace (f);
… …
1146 1241
1147 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1242 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1148 1243
1149 XftUnlockFace (f); 1244 XftUnlockFace (f);
1150 1245
1246 int glheight = height;
1247
1151 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1248 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1152 { 1249 {
1153 FcChar16 ch = *t; 1250 FcChar16 ch = *t;
1154 1251
1155 if (cs != CS_UNICODE 1252 if (cs != CS_UNICODE
1156 && ch > 0x100 1253 && ch > 0x100
… …
1161 bool careful; 1258 bool careful;
1162 if (!has_char (*t, &prop, careful)) 1259 if (!has_char (*t, &prop, careful))
1163 continue; 1260 continue;
1164 1261
1165 XGlyphInfo g; 1262 XGlyphInfo g;
1166 XftTextExtents16 (DISPLAY, f, &ch, 1, &g); 1263 XftTextExtents16 (disp, f, &ch, 1, &g);
1167 1264
1265 g.width -= g.x;
1266
1168 int wcw = wcwidth (ch); 1267 int wcw = WCWIDTH (ch);
1169 if (wcw > 0) g.width = g.width / wcw; 1268 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1170 1269
1171 if (width < g.width) width = g.width; 1270 if (width < g.width ) width = g.width;
1172 if (height < g.height) height = g.height; 1271 if (height < g.height ) height = g.height;
1272 if (glheight < g.height - g.y) glheight = g.height - g.y;
1273 }
1274
1275 if (!width)
1276 {
1277 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1278
1279 XftFontClose (disp, f);
1280 f = 0;
1281
1282 success = false;
1283 break;
1173 } 1284 }
1174 1285
1175 if (prop.height == rxvt_fontprop::unset 1286 if (prop.height == rxvt_fontprop::unset
1176 || height <= prop.height 1287 || (height <= prop.height && glheight <= prop.height)
1177 || height <= 2 1288 || height <= 2
1178 || !scalable) 1289 || !scalable)
1179 break; 1290 break;
1180 1291
1181 if (ftheight) 1292 if (ftheight)
… …
1188 ftheight -= height - prop.height; 1299 ftheight -= height - prop.height;
1189 } 1300 }
1190 else 1301 else
1191 ftheight = prop.height - 1; 1302 ftheight = prop.height - 1;
1192 1303
1193 XftFontClose (DISPLAY, f); 1304 XftFontClose (disp, f);
1194 FcPatternDel (match, FC_PIXEL_SIZE); 1305 FcPatternDel (match, FC_PIXEL_SIZE);
1195 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1306 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1196 } 1307 }
1197 1308
1198 FcPatternDestroy (match); 1309 FcPatternDestroy (match);
1199 1310
1200#if 0 // do it per-character 1311#if 0 // do it per-character
… …
1207 1318
1208 return success; 1319 return success;
1209} 1320}
1210 1321
1211bool 1322bool
1212rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1323rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1213{ 1324{
1214 careful = false; 1325 careful = false;
1215 1326
1216 if (!XftCharExists (DISPLAY, f, unicode)) 1327 if (!XftCharExists (term->dpy, f, unicode))
1217 return false; 1328 return false;
1218 1329
1219 if (!prop || prop->width == rxvt_fontprop::unset) 1330 if (!prop || prop->width == rxvt_fontprop::unset)
1220 return true; 1331 return true;
1221 1332
1222 // check character against base font bounding box 1333 // check character against base font bounding box
1223 FcChar32 ch = unicode; 1334 FcChar32 ch = unicode;
1224 XGlyphInfo g; 1335 XGlyphInfo g;
1225 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1336 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1226 1337
1227 int w = g.width; 1338 int w = g.width - g.x;
1228 int wcw = wcwidth (unicode); 1339 int wcw = max (WCWIDTH (unicode), 1);
1229 if (wcw > 0) w /= wcw;
1230 1340
1231 careful = w > prop->width; 1341 careful = g.x > 0 || w > prop->width * wcw;
1232 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1342
1343 if (careful && !OVERLAP_OK (w, wcw, prop))
1344 return false;
1345
1346 // this weeds out _totally_ broken fonts, or glyphs
1347 if (!OVERLAP_OK (g.xOff, wcw, prop))
1233 return false; 1348 return false;
1234 1349
1235 return true; 1350 return true;
1236} 1351}
1237 1352
1238void 1353void
1239rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1354rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1240 const text_t *text, int len, 1355 const text_t *text, int len,
1241 int fg, int bg) 1356 int fg, int bg)
1242{ 1357{
1243 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
1244
1245 int base = ascent; // should be fbase, but that is incorrect
1246
1247 XGlyphInfo extents; 1358 XGlyphInfo extents;
1248 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1359 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1249 FcChar32 *ep = enc; 1360 XftGlyphSpec *ep = enc;
1250 int ewidth = 0; 1361
1251 int xoff = 0; 1362 dTermDisplay;
1363 dTermGC;
1364
1365 int w = term->fwidth * len;
1366 int h = term->fheight;
1367
1368 bool buffered = bg >= Color_transparent
1369 && term->option (Opt_buffered);
1370
1371 // cut trailing spaces
1372 while (len && text [len - 1] == ' ')
1373 len--;
1374
1375 int x_ = buffered ? 0 : x;
1376 int y_ = buffered ? 0 : y;
1252 1377
1253 while (len) 1378 while (len)
1254 { 1379 {
1255 int cwidth = r->TermWin.fwidth; 1380 int cwidth = term->fwidth;
1256 FcChar32 fc = *text++; len--; 1381 FcChar32 fc = *text++; len--;
1257 FT_UInt gl;
1258 1382
1259 while (len && *text == NOCHAR) 1383 while (len && *text == NOCHAR)
1260 text++, len--, cwidth += r->TermWin.fwidth; 1384 text++, len--, cwidth += term->fwidth;
1261
1262 gl = XftCharIndex (d.display->display, f, fc);
1263 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1264 1385
1265 if (extents.xOff != cwidth && ep != enc) 1386 if (fc != ' ') // skip spaces
1266 {
1267 if (xoff > ewidth) xoff = ewidth;
1268 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1269 x + (ewidth - xoff >> 1),
1270 y + base, enc, ep - enc);
1271 x += ewidth;
1272
1273 ep = enc;
1274 ewidth = 0;
1275 xoff = 0;
1276 } 1387 {
1388 FT_UInt glyph = XftCharIndex (disp, f, fc);
1389 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1277 1390
1278 if (fc == ' ' && ep == enc) // skip leading spaces 1391 ep->glyph = glyph;
1392 ep->x = x_ + (cwidth - extents.xOff >> 1);
1393 ep->y = y_ + ascent;
1394
1395 if (extents.xOff == 0)
1396 ep->x = x_ + cwidth;
1397
1398 ep++;
1279 { 1399 }
1400
1280 x += cwidth; 1401 x_ += cwidth;
1281 continue; 1402 }
1403
1404 if (buffered)
1405 {
1406 if (ep != enc)
1282 } 1407 {
1408 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1283 1409
1410#ifdef HAVE_BG_PIXMAP
1411 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1412
1413 if (term->bg_pixmap
1414 && (bg == Color_transparent || bg == Color_bg
1415 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1416 {
1417 int src_x = x, src_y = y;
1418
1419 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1420 {
1421 src_x += term->window_vt_x;
1422 src_y += term->window_vt_y;
1423 }
1424
1425 if (term->bg_pmap_width >= src_x + w
1426 && term->bg_pmap_height >= src_y + h)
1427 {
1428 XCopyArea (disp, term->bg_pixmap, d2, gc,
1429 src_x, src_y, w, h, 0, 0);
1430 }
1431 else
1432 {
1433 XGCValues gcv;
1434
1435 gcv.fill_style = FillTiled;
1436 gcv.tile = term->bg_pixmap;
1437 gcv.ts_x_origin = -src_x;
1438 gcv.ts_y_origin = -src_y;
1439
1440 XChangeGC (disp, gc,
1441 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1442 &gcv);
1443
1444 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1445
1446 gcv.fill_style = FillSolid;
1447 XChangeGC (disp, gc, GCFillStyle, &gcv);
1448 }
1449
1450 if (dst)
1451 {
1452 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1453
1454 // dst can only be set when bg >= 0
1455 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1456 }
1457 }
1458 else
1459#endif
1460 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1461
1462 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1463 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1464 }
1284 else 1465 else
1285 { 1466 clear_rect (d, x, y, w, h, bg);
1286 *ep++ = gl;
1287 ewidth += cwidth;
1288 xoff += extents.xOff;
1289 }
1290 }
1291
1292 if (ep != enc)
1293 { 1467 }
1294 if (xoff > ewidth) xoff = ewidth; 1468 else
1295 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1296 x + (ewidth - xoff >> 1),
1297 y + base, enc, ep - enc);
1298 } 1469 {
1470 clear_rect (d, x, y, w, h, bg);
1471 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1472 }
1299} 1473}
1474
1300#endif 1475#endif
1301 1476
1302///////////////////////////////////////////////////////////////////////////// 1477/////////////////////////////////////////////////////////////////////////////
1303 1478
1304rxvt_fontset::rxvt_fontset (rxvt_t r) 1479rxvt_fontset::rxvt_fontset (rxvt_term *term)
1305: r (r), fontdesc (0) 1480: fontdesc (0), term (term)
1306{ 1481{
1307 clear (); 1482 clear ();
1308} 1483}
1309 1484
1310rxvt_fontset::~rxvt_fontset () 1485rxvt_fontset::~rxvt_fontset ()
… …
1313} 1488}
1314 1489
1315void 1490void
1316rxvt_fontset::clear () 1491rxvt_fontset::clear ()
1317{ 1492{
1318 prop.width = prop.height = prop.weight = prop.slant 1493 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1319 = rxvt_fontprop::unset; 1494 = rxvt_fontprop::unset;
1495 force_prop = false;
1320 1496
1321 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1497 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1322 FONT_UNREF (*i); 1498 (*i)->unref ();
1323 1499
1324 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1500 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1325 delete *p; 1501 delete *p;
1326 1502
1327 free (fontdesc); fontdesc = 0; 1503 free (fontdesc); fontdesc = 0;
… …
1329 fonts.clear (); 1505 fonts.clear ();
1330 1506
1331 fallback = fallback_fonts; 1507 fallback = fallback_fonts;
1332} 1508}
1333 1509
1510void
1511rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1512{
1513 font->set_term (term);
1514
1515 font->cs = cs;
1516 font->loaded = false;
1517}
1518
1334rxvt_font * 1519rxvt_font *
1335rxvt_fontset::new_font (const char *name, codeset cs) 1520rxvt_fontset::new_font (const char *name, codeset cs)
1336{ 1521{
1337 rxvt_font *f; 1522 rxvt_font *f;
1338 1523
1339 if (!name || !*name) 1524 if (!name || !*name)
1340 { 1525 {
1341 name = ""; 1526 name = "";
1342 f = new rxvt_font_default (this); 1527 f = new rxvt_font_default (this);
1343 } 1528 }
… …
1354 f = new rxvt_font_x11; 1539 f = new rxvt_font_x11;
1355 } 1540 }
1356 else 1541 else
1357 f = new rxvt_font_x11; 1542 f = new rxvt_font_x11;
1358 1543
1359 f->set_term (r);
1360 f->set_name (strdup (name)); 1544 f->set_name (strdup (name));
1361 1545 prepare_font (f, cs);
1362 f->cs = cs;
1363 f->loaded = false;
1364 1546
1365 return f; 1547 return f;
1366} 1548}
1367 1549
1368///////////////////////////////////////////////////////////////////////////// 1550/////////////////////////////////////////////////////////////////////////////
1551
1552void
1553rxvt_fontset::push_font (rxvt_font *font)
1554{
1555 // the fontCount index is reserved for the overflow font, it is only
1556 // necessary when we get fontCount or more fonts, as they cannot be
1557 // represented in the rendition.
1558 if (fonts.size () == fontCount)
1559 {
1560 rxvt_font *f = new rxvt_font_overflow (this);
1561
1562 prepare_font (f, CS_UNICODE);
1563 fonts.push_back (f);
1564 }
1565
1566 fonts.push_back (font);
1567}
1369 1568
1370void 1569void
1371rxvt_fontset::add_fonts (const char *desc) 1570rxvt_fontset::add_fonts (const char *desc)
1372{ 1571{
1373 if (desc) 1572 if (desc)
… …
1375 char buf[512]; 1574 char buf[512];
1376 const char *end; 1575 const char *end;
1377 1576
1378 do 1577 do
1379 { 1578 {
1380 while (*desc <= ' ') desc++; 1579 while (*desc && *desc <= ' ')
1580 desc++;
1381 1581
1382 codeset cs = CS_UNICODE; 1582 codeset cs = CS_UNICODE;
1383 1583
1384 if (*desc == '[') 1584 if (*desc == '[')
1385 { 1585 {
… …
1410 if (!end) 1610 if (!end)
1411 end = desc + strlen (desc); 1611 end = desc + strlen (desc);
1412 1612
1413 if (end - desc < 511) 1613 if (end - desc < 511)
1414 { 1614 {
1415 strncpy (buf, desc, end - desc); 1615 memcpy (buf, desc, end - desc);
1416 buf[end - desc] = 0; 1616 buf[end - desc] = 0;
1417 1617
1418 fonts.push_back (new_font (buf, cs)); 1618 push_font (new_font (buf, cs));
1419 } 1619 }
1420 else 1620 else
1421 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1621 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1422 1622
1423 desc = end + 1; 1623 desc = end + 1;
1424 } 1624 }
1425 while (*end); 1625 while (*end);
1426 } 1626 }
… …
1435 if (fonts[i]->loaded) 1635 if (fonts[i]->loaded)
1436 return true; 1636 return true;
1437 1637
1438 fonts[i]->loaded = true; 1638 fonts[i]->loaded = true;
1439 1639
1440 if (!fonts[i]->load (prop)) 1640 if (!fonts[i]->load (prop, force_prop))
1441 { 1641 {
1442 fonts[i]->cs = CS_UNKNOWN; 1642 fonts[i]->cs = CS_UNKNOWN;
1443 return false; 1643 return false;
1444 } 1644 }
1445 1645
… …
1451{ 1651{
1452 clear (); 1652 clear ();
1453 1653
1454 fontdesc = strdup (desc); 1654 fontdesc = strdup (desc);
1455 1655
1456 fonts.push_back (new_font (0, CS_UNICODE)); 1656 push_font (new_font (0, CS_UNICODE));
1457 realize_font (0); 1657 realize_font (0);
1458 1658
1459 add_fonts (desc); 1659 add_fonts (desc);
1460 1660
1461 return true; 1661 return true;
… …
1470 1670
1471 return -1; 1671 return -1;
1472} 1672}
1473 1673
1474int 1674int
1475rxvt_fontset::find_font (unicode_t unicode) 1675rxvt_fontset::find_font_idx (unicode_t unicode)
1476{ 1676{
1477 if (unicode >= 1<<20) 1677 if (unicode >= 1<<20)
1478 return 0; 1678 return 0;
1479 1679
1480 unicode_t hi = unicode >> 8; 1680 unicode_t hi = unicode >> 8;
… …
1495 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1695 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1496 goto next_font; 1696 goto next_font;
1497 1697
1498 if (!realize_font (i)) 1698 if (!realize_font (i))
1499 goto next_font; 1699 goto next_font;
1700
1701 if (prop.ascent != rxvt_fontprop::unset)
1702 max_it (f->ascent, prop.ascent);
1500 } 1703 }
1501 1704
1502 if (f->cs == CS_UNKNOWN) 1705 if (f->cs == CS_UNKNOWN)
1503 goto next_font; 1706 goto next_font;
1504 1707
1505 bool careful; 1708 bool careful;
1506 if (f->has_char (unicode, &prop, careful)) 1709 if (f->has_char (unicode, &prop, careful))
1507 { 1710 {
1508 if (careful) 1711 i = (i << 1) | careful;
1509 i |= 128;
1510 1712
1511 goto found; 1713 goto found;
1512 } 1714 }
1513 1715
1514 next_font: 1716 next_font:
1515 if (i == fonts.size () - 1) 1717 if (i == fonts.size () - 1)
1516 { 1718 {
1517 if (fallback->name) 1719 if (fallback->name)
1518 { 1720 {
1519 // search through the fallback list 1721 // search through the fallback list
1520 fonts.push_back (new_font (fallback->name, fallback->cs)); 1722 push_font (new_font (fallback->name, fallback->cs));
1521 fallback++; 1723 fallback++;
1522 } 1724 }
1523 else 1725 else
1524 { 1726 {
1525 // try to find a new font. 1727 // try to find a new font.
… …
1543 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1745 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1544 FcPatternAddBool (p, FC_MINSPACE, 1); 1746 FcPatternAddBool (p, FC_MINSPACE, 1);
1545 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1747 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1546 1748
1547 XftResult result; 1749 XftResult result;
1548 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1750 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1549 1751
1550 FcPatternDestroy (p); 1752 FcPatternDestroy (p);
1551 1753
1552 if (match) 1754 if (match)
1553 { 1755 {
… …
1556 FcPatternDestroy (match); 1758 FcPatternDestroy (match);
1557 1759
1558 if (find_font (font) < 0) 1760 if (find_font (font) < 0)
1559 { 1761 {
1560 char fontname[4096]; 1762 char fontname[4096];
1561 sprintf (fontname, "xft:%-.4090s", font); 1763 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1562 1764
1563 fonts.push_back (new_font (fontname, CS_UNICODE)); 1765 push_font (new_font (fontname, CS_UNICODE));
1564 } 1766 }
1565 1767
1566 free (font); 1768 free (font);
1567 } 1769 }
1568#endif 1770#endif
… …
1590 } 1792 }
1591 1793
1592 return i; 1794 return i;
1593} 1795}
1594 1796
1595
1596

Diff Legend

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