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

Diff Legend

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