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.67 by root, Sat Feb 12 18:55:04 2005 UTC vs.
Revision 1.169 by sf-exg, Sat Dec 18 18:17:38 2010 UTC

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

Diff Legend

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