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

Diff Legend

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