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

Diff Legend

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