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.3 by root, Sun Aug 15 21:55:45 2004 UTC vs.
Revision 1.142 by root, Wed Jan 23 14:54:52 2008 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-2006 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 "rxvtfont.h" 25#include "rxvtfont.h"
25 26
26#include <cstdlib> 27#include <cstdlib>
27 28
28#define DISPLAY r->display->display 29#include <inttypes.h>
29#define TGC r->TermWin.gc 30
31#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
32#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
33
34#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
35 (prop)->slant >= rxvt_fontprop::italic \
36 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
37 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
38 ))
30 39
31const struct rxvt_fallback_font { 40const struct rxvt_fallback_font {
32 codeset cs; 41 codeset cs;
33 const char *name; 42 const char *name;
34} fallback_fonts[] = { 43} fallback_fonts[] = {
35 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 44 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
36 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 45 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
37 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
38 47
39#if ENCODING_EU 48#if ENCODING_EU
40 // cyrillic 49 // cyrillic
41 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 50 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
42 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 51 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
43 52
44 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 53 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
45 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 54 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
46 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 55 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
47 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 56 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
48 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 57 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
52 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, 61 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" },
53 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, 62 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" },
54 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 63 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
55 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 64 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
56 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 65 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
66
67# if XFT
68 { CS_KOI8_U, "xft::lang=ru" },
69
70 { CS_ISO8859_5, "xft::lang=ru" },
71 { CS_ISO8859_6, "xft::lang=ar" },
72 { CS_ISO8859_7, "xft::lang=el" },
73 { CS_ISO8859_8, "xft::lang=he" },
74 { CS_ISO8859_9, "xft::lang=tr" },
75 { CS_ISO8859_10, "xft::lang=se" },
76 { CS_ISO8859_11, "xft::lang=th" },
77# endif
57#endif 78#endif
58 79
59 // japanese 80 // japanese
60#if ENCODING_JP || ENCODING_JP_EXT 81#if ENCODING_JP || ENCODING_JP_EXT
61# if XFT 82# if XFT
62 // prefer xft for complex scripts 83 // prefer xft for complex scripts
63 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, 84 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
85 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
64# endif 88# endif
65 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 89 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
66 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 90 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
67 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 91 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
68 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 92 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
69 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 93 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
70 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 94 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
71#endif 95#endif
72 96
73#if ENCODING_CN || ENCODING_CN_EXT 97#if ENCODING_ZH || ENCODING_ZH_EXT
74# if XFT 98# if XFT
99 { CS_GBK_0, "xft:AR PL KaitiM GB" },
100 { CS_GBK_0, "xft:AR PL SungtiL GB" },
101 { CS_GBK_0, "xft::lang=zh" },
75 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 102 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
76 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
77 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 104 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
78 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
106 { CS_GB2312_1980_0, "xft::lang=zh" },
79# endif 107# endif
108 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
80 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 109 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
81 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 110 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
82 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 111 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
112 { CS_GB2312_1980_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
83 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, 113 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
84 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, 114 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
85 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, 115 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
86 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, 116 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
87 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, 117 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
… …
89 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, 119 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
90 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, 120 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
91 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, 121 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
92#endif 122#endif
93 123
124#if ENCODING_KR
125 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
126 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
127# if XFT
128 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
129 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
130# endif
131#endif
132
133 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
134 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
94#if XFT 135#if XFT
136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
138 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
139 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
140
141 // FreeMono is usually uglier than x fonts, so try after the others
95 { CS_UNICODE, "xft:Andale Mono" }, 142 { CS_UNICODE, "xft:FreeMono:autohint=true" },
96 { CS_UNICODE, "xft:Arial Unicode MS" },
97#endif 143#endif
98 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 144
99 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 145 // generic font fallback, put this last, as many iso10646 fonts have extents
146 // specified for all glyphs in the range they cover, but most are simply empty
100 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 147 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
101 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 148 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
102#if XFT
103 // FreeMono is usually uglier than x fonts, so try last only.
104 //{ CS_UNICODE, "xft:FreeMono" },
105#endif
106
107 { CS_UNKNOWN, 0 } 149 { CS_UNKNOWN, 0 }
108}; 150};
109 151
152// these characters are used to guess the font height and width
153// pango uses a similar algorithm and doesn't trust the font either.
154static uint16_t extent_test_chars[] = {
155 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
156 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
157 0x304c, 0x672c, // が本
158};
159
160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
161
162#define dTermDisplay Display *disp = term->dpy
163#define dTermGC GC gc = term->gc
164
110///////////////////////////////////////////////////////////////////////////// 165/////////////////////////////////////////////////////////////////////////////
111
112#if XFT
113rxvt_drawable::~rxvt_drawable ()
114{
115 if (xftdrawable)
116 XftDrawDestroy (xftdrawable);
117}
118
119rxvt_drawable::operator XftDraw *()
120{
121 if (!xftdrawable)
122 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
123
124 return xftdrawable;
125}
126#endif
127
128/////////////////////////////////////////////////////////////////////////////
129
130static void *enc_buf;
131static uint32_t enc_len;
132
133static inline void *
134get_enc_buf (uint32_t len)
135{
136 if (len > enc_len)
137 {
138 free (enc_buf);
139 enc_buf = malloc (len);
140 enc_len = len;
141 }
142
143 return enc_buf;
144}
145 166
146static const char * 167static const char *
147enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 168enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
148{ 169{
149 uint8_t *buf = (uint8_t *)get_enc_buf (len); 170 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
171 uint8_t *res = buf;
150 172
151 while (len--) 173 while (len--)
152 { 174 {
153 uint32_t c = FROM_UNICODE (cs, *text++); 175 uint32_t c = FROM_UNICODE (cs, *text++);
154 176
… …
159 } 181 }
160 182
161 *buf++ = c; 183 *buf++ = c;
162 } 184 }
163 185
164 return (const char *)enc_buf; 186 return (const char *)res;
165} 187}
166 188
167static const XChar2b * 189static const XChar2b *
168enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 190enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
169{ 191{
170 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 192 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
193 XChar2b *res = buf;
171 194
172 while (len--) 195 while (len--)
173 { 196 {
174 uint32_t c = FROM_UNICODE (cs, *text++); 197 uint32_t c = FROM_UNICODE (cs, *text++);
175 198
… …
182 buf->byte1 = c >> 8; 205 buf->byte1 = c >> 8;
183 buf->byte2 = c; 206 buf->byte2 = c;
184 buf++; 207 buf++;
185 } 208 }
186 209
187 return (XChar2b *)enc_buf; 210 return res;
188} 211}
189 212
190///////////////////////////////////////////////////////////////////////////// 213/////////////////////////////////////////////////////////////////////////////
191 214
215rxvt_font::rxvt_font ()
216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217{
218}
219
192void 220void
221rxvt_font::set_name (char *name)
222{
223 if (this->name == name)
224 return;
225
226 if (this->name) free (this->name); // let the compiler optimize
227 this->name = name;
228}
229
230void
193rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) 231rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
194{ 232{
195 if (color == Color_bg) 233 dTermDisplay;
196 XClearArea (d.display->display, d, x, y, w, h, FALSE); 234 dTermGC;
235
236 if (color == Color_bg || color == Color_transparent)
237 XClearArea (disp, d, x, y, w, h, false);
197 else if (color >= 0) 238 else if (color >= 0)
198 { 239 {
199#if XFT 240#if XFT
241 Picture dst;
242
243# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap
245 && !term->pix_colors[color].is_opaque ()
246 && ((dst = XftDrawPicture (d))))
247 {
248 XClearArea (disp, d, x, y, w, h, false);
249
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
251 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 }
253 else
254# endif
200 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 255 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
256
201#else 257#else
202 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 258 XSetForeground (disp, gc, term->pix_colors[color]);
203 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 259 XFillRectangle (disp, d, gc, x, y, w, h);
204#endif 260#endif
205 } 261 }
206} 262}
207 263
208#include "table/linedraw.h" 264/////////////////////////////////////////////////////////////////////////////
209 265
210struct rxvt_font_default : rxvt_font { 266struct rxvt_font_default : rxvt_font {
267 struct rxvt_fontset *fs;
268
269 rxvt_font_default (rxvt_fontset *fs)
270 : rxvt_font ()
271 {
272 this->fs = fs;
273 }
211 274
212 rxvt_fontprop properties () 275 rxvt_fontprop properties ()
213 { 276 {
214 rxvt_fontprop p; 277 rxvt_fontprop p;
215 278
216 p.width = p.height = 1; 279 p.width = p.height = 1;
280 p.ascent = rxvt_fontprop::unset;
217 p.weight = rxvt_fontprop::medium; 281 p.weight = rxvt_fontprop::medium;
218 p.slant = rxvt_fontprop::roman; 282 p.slant = rxvt_fontprop::roman;
219 283
220 return p; 284 return p;
221 } 285 }
222 286
223 bool load (const rxvt_fontprop &prop) 287 bool load (const rxvt_fontprop &prop, bool force_prop)
224 { 288 {
225 width = 1; height = 1; 289 width = 1; height = 1;
226 ascent = 1; descent = 0; 290 ascent = 1; descent = 0;
227 291
228 set_name (strdup ("built-in pseudofont")); 292 set_name (strdup ("built-in support font"));
229 293
230 return true; 294 return true;
231 } 295 }
232 296
233 bool has_codepoint (unicode_t unicode) 297 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
234 { 298 {
299 careful = false;
300
235 if (unicode <= 0x001f) 301 if (unicode <= 0x001f)
236 return true; 302 return true;
237 303
238 if (unicode <= 0x007f) 304 if (unicode <= 0x007f)
239 return false; 305 return false;
240 306
241 if (unicode <= 0x009f) 307 if (unicode <= 0x009f)
242 return true; 308 return true;
243 309
310#ifdef BUILTIN_GLYPHS
244 if (unicode >= 0x2500 && unicode <= 0x259f) 311 if (unicode >= 0x2500 && unicode <= 0x259f &&
312 !term->option (Opt_skipBuiltinGlyphs))
245 return true; 313 return true;
314#endif
246 315
247 if (IS_COMPOSE (unicode)) 316 if (IS_COMPOSE (unicode))
248 return true; 317 return true;
249 318
250 switch (unicode) 319 switch (unicode)
251 { 320 {
252 case ZERO_WIDTH_CHAR: 321 case ZERO_WIDTH_CHAR:
322 case NOCHAR:
253 return true; 323 return true;
254 } 324 }
255 325
256 return false; 326 return false;
257 } 327 }
… …
264void 334void
265rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 335rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
266 const text_t *text, int len, 336 const text_t *text, int len,
267 int fg, int bg) 337 int fg, int bg)
268{ 338{
339 dTermDisplay;
340 dTermGC;
341
269 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 342 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
270 343
271 XSetForeground (d.display->display, TGC, r->pix_colors[fg]); 344 XSetForeground (disp, gc, term->pix_colors[fg]);
272 345
273 while (len--) 346 while (len)
274 { 347 {
275#if ENABLE_COMBINING 348#if ENABLE_COMBINING
276 compose_char *cc; 349 compose_char *cc;
277#endif 350#endif
351 const text_t *tp = text;
278 text_t t = *text++; 352 text_t t = *tp;
279 353
354 while (++text, --len && *text == NOCHAR)
355 ;
356
357 int width = text - tp;
358 int fwidth = term->fwidth * width;
359
360#ifdef BUILTIN_GLYPHS
280 if (0x2500 <= t && t <= 0x259f) 361 if (0x2500 <= t && t <= 0x259f)
281 { 362 {
363# include "table/linedraw.h"
282 uint16_t offs = linedraw_offs[t - 0x2500]; 364 uint16_t offs = linedraw_offs[t - 0x2500];
283 uint32_t *a = linedraw_command + (offs >> 4); 365 uint32_t *a = linedraw_command + (offs >> 4);
284 uint32_t *b = a + (offs & 15); 366 uint32_t *b = a + (offs & 15);
285 367
286 int W = r->TermWin.fwidth; 368 int W = fwidth;
287 int H = r->TermWin.fheight; 369 int H = term->fheight;
288 370
289 int x_[16]; 371 int x_[16];
290 int y_[16]; 372 int y_[16];
291 373
292 for (int i = 0; i <= 8; i++) 374 for (int i = 0; i <= 8; i++)
… …
300 382
301 XGCValues gcv; 383 XGCValues gcv;
302 384
303 gcv.cap_style = CapButt; 385 gcv.cap_style = CapButt;
304 gcv.line_width = 0; 386 gcv.line_width = 0;
305 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 387 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
306 388
307 while (a < b) 389 while (a < b)
308 { 390 {
309 uint32_t command = *a++; 391 uint32_t command = *a++;
310 392
… …
317 int y2 = y_[(command >> 0) & 15]; 399 int y2 = y_[(command >> 0) & 15];
318 400
319 switch (op) 401 switch (op)
320 { 402 {
321 case 0: // line 403 case 0: // line
322 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 404 XDrawLine (disp, d, gc, x1, y1, x2, y2);
323 break; 405 break;
324 406
325 case 1: // rectangle, possibly stippled 407 case 1: // rectangle, possibly stippled
326 if (a) 408 if (a)
327 { 409 {
328 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 410 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
329 411
330 gcv.fill_style = FillStippled; 412 gcv.fill_style = FillStippled;
331 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 413 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
332 gcv.ts_x_origin = x; 414 gcv.ts_x_origin = x;
333 gcv.ts_y_origin = y; 415 gcv.ts_y_origin = y;
334 416
335 XChangeGC (d.display->display, TGC, 417 XChangeGC (disp, gc,
336 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 418 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
337 &gcv); 419 &gcv);
338 } 420 }
339 421
340 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 422 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
341 423
342 if (a) 424 if (a)
343 { 425 {
344 XFreePixmap (d.display->display, gcv.stipple); 426 XFreePixmap (disp, gcv.stipple);
345 gcv.stipple = 0; 427 gcv.stipple = 0;
346 gcv.fill_style = FillSolid; 428 gcv.fill_style = FillSolid;
347 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 429 XChangeGC (disp, gc, GCFillStyle, &gcv);
348 } 430 }
349 break; 431 break;
350 case 2: // arc 432 case 2: // arc
351 XDrawArc (d.display->display, d, TGC, 433 XDrawArc (disp, d, gc,
352 x1 - W/2, y1 - H/2, W-1, H-1, 434 x1 - W/2, y1 - H/2, W-1, H-1,
353 (a - 1) * 90*64, (b - 1) * 90*64); 435 (a - 1) * 90*64, (b - 1) * 90*64);
354 break; 436 break;
355 } 437 }
356 } 438 }
357 } 439 }
440#else
441 if (0)
442 ;
443#endif
358#if ENABLE_COMBINING 444#if ENABLE_COMBINING
359 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
360 { 446 {
447 min_it (width, 2); // we only support wcwidth up to 2
448
449 text_t chrs[2];
450 chrs [1] = NOCHAR;
451
452 *chrs = cc->c1;
361 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 453 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
362 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); 454 f1->draw (d, x, y, chrs, width, fg, bg);
455
363 if (cc->c2 != NOCHAR) 456 if (cc->c2 != NOCHAR)
364 { 457 {
458 bool careful;
459
365 // prefer font of first character, for no good reasons 460 // prefer font of first character, for no good reasons
366 rxvt_font *f2 = f1->has_codepoint (cc->c2) 461 *chrs = cc->c2;
462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
367 ? f1 463 ? f1
368 : (*fs)[fs->find_font (cc->c2)]; 464 : (*fs)[fs->find_font (cc->c2)];
369 465
370 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); 466 f2->draw (d, x, y, chrs, width, fg, Color_none);
371 } 467 }
372 } 468 }
373#endif 469#endif
374 else 470 else
375 switch (t) 471 switch (t)
376 { 472 {
473 case '\t':
377 case ZERO_WIDTH_CHAR: 474 case ZERO_WIDTH_CHAR:
475 case NOCHAR:
378 break; 476 break;
379 477
380 default: 478 default:
381 int w = 0;
382 while (len > 0 && *text == NOCHAR)
383 {
384 ++text;
385 --len;
386 w += r->TermWin.fwidth;
387 }
388
389 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, 479 XDrawRectangle (disp, d, gc, x + 2, y + 2,
390 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); 480 fwidth - 4, term->fheight - 4);
391 x += w;
392 } 481 }
393 482
394 x += r->TermWin.fwidth; 483 x += fwidth;
395 } 484 }
396} 485}
397 486
398///////////////////////////////////////////////////////////////////////////// 487/////////////////////////////////////////////////////////////////////////////
399 488
… …
402 491
403 void clear (); 492 void clear ();
404 493
405 rxvt_fontprop properties (); 494 rxvt_fontprop properties ();
406 495
407 bool load (const rxvt_fontprop &prop); 496 bool load (const rxvt_fontprop &prop, bool force_prop);
408 497
409 bool has_codepoint (unicode_t unicode); 498 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
410 499
411 void draw (rxvt_drawable &d, int x, int y, 500 void draw (rxvt_drawable &d, int x, int y,
412 const text_t *text, int len, 501 const text_t *text, int len,
413 int fg, int bg); 502 int fg, int bg);
414 503
504 bool slow; // wether this is a proportional font or has other funny characteristics
415 XFontStruct *f; 505 XFontStruct *f;
416 codeset cs;
417 bool enc2b, encm; 506 bool enc2b, encm;
418 507
419 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 508 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
420 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 509 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
421 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 510 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
422 bool set_properties (rxvt_fontprop &p, const char *name); 511 bool set_properties (rxvt_fontprop &p, const char *name);
423}; 512};
424 513
425char * 514char *
426rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 515rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
427{ 516{
428 unsigned long value; 517 unsigned long value;
429 518
430 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 519 if (XGetFontProperty (f, property, &value))
431 return XGetAtomName (DISPLAY, value); 520 return XGetAtomName (term->dpy, value);
432 else 521 else
433 return rxvt_strdup (repl); 522 return repl ? strdup (repl) : 0;
434} 523}
435 524
436rxvt_fontprop 525rxvt_fontprop
437rxvt_font_x11::properties () 526rxvt_font_x11::properties ()
438{ 527{
… …
442} 531}
443 532
444bool 533bool
445rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 534rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
446{ 535{
447 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 536 p.width = width != rxvt_fontprop::unset ? width
537 : avgwidth ? (avgwidth + 1) / 10
538 : (height + 1) / 2;
448 p.height = height; 539 p.height = height;
540 p.ascent = rxvt_fontprop::unset;
449 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 541 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
450 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 542 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
451 543
452 return true; 544 return true;
453} 545}
454 546
455bool 547bool
456rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 548rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
457{ 549{
458 unsigned long height; 550 unsigned long height;
551
552#if 0
459 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 553 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
460 return false; 554 return false;
555#else
556 height = f->ascent + f->descent;
557#endif
461 558
462 unsigned long avgwidth; 559 unsigned long avgwidth;
463 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 560 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
464 avgwidth = 0; 561 avgwidth = 0;
465 562
466 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 563 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
467 char *slant = get_property (f, "SLANT", "r"); 564 char *slant = get_property (f, term->xa [XA_SLANT], "r");
468 565
469 set_properties (p, height, weight, slant, avgwidth); 566 set_properties (p, height, weight, slant, avgwidth);
470 567
471 free (weight); 568 free (weight);
472 free (slant); 569 free (slant);
473 570
571 p.ascent = f->ascent;
572
474 return true; 573 return true;
475} 574}
476 575
477bool 576bool
478rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 577rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
479{ 578{
579 dTermDisplay;
480 int slashes = 0; 580 int slashes = 0;
481 const char *comp[13]; 581 const char *comp[13];
482 582
483 for (const char *c = name; *c; c++) 583 for (const char *c = name; *c; c++)
484 if (*c == '-') 584 if (*c == '-')
… …
492 if (slashes >= 13 592 if (slashes >= 13
493 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 593 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
494 && (*comp[11] >= '0' && *comp[11] <= '9')) 594 && (*comp[11] >= '0' && *comp[11] <= '9'))
495 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 595 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
496 596
497 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 597 XFontStruct *f = XLoadQueryFont (disp, name);
498 598
499 if (f) 599 if (f)
500 { 600 {
501 // the font should really exist now. if not, we have a problem 601 // the font should really exist now. if not, we have a problem
502 // (e.g. if the user did xset fp rehash just when we were searching fonts). 602 // (e.g. if the user did xset fp rehash just when we were searching fonts).
503 // in that case, just return garbage. 603 // in that case, just return garbage.
504 bool ret = set_properties (p, f); 604 bool ret = set_properties (p, f);
505 XFreeFont (DISPLAY, f); 605 XFreeFont (disp, f);
506 return ret; 606 return ret;
507 } 607 }
508 else 608 else
509 return false; 609 return false;
510} 610}
511 611
512// fix the size of scalable fonts 612// fix the size of scalable fonts
513static void 613static bool
514fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop) 614replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
515{ 615{
516 int slashes = 0; 616 int slashes = 0;
517 const char *size; 617 const char *field, *end;
518 618
519 for (const char *c = name; *c; c++) 619 for (const char *c = name; *c; c++)
520 if (*c == '-') 620 if (*c == '-')
521 { 621 {
522 if (slashes == 6) 622 if (slashes == index)
523 size = c + 1; 623 field = c + 1;
624
625 if (slashes == index + 1)
626 end = c;
524 627
525 if (++slashes >= 13) 628 if (++slashes >= 13)
526 break; 629 break;
527 } 630 }
528 631
529 if (slashes >= 13 && size[0] == '0') 632 if (slashes >= 13 && (!old || *field == old))
530 { 633 {
531 strncpy (buf, name, size - name); 634 size_t len = field - name;
532 buf += size - name; 635 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
533 buf += sprintf (buf, "%d", prop.height); 636 memcpy (*ptr, name, len);
534 strcpy (buf, size + 1); 637 strcpy (*ptr + len, replace);
638 strcat (*ptr, end);
639
640 return true;
535 } 641 }
536 else 642 else
537 strcpy (buf, name); 643 {
644 *ptr = strdup (name);
645
646 return false;
647 }
538} 648}
539 649
540bool 650bool
541rxvt_font_x11::load (const rxvt_fontprop &prop) 651rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
542{ 652{
653 dTermDisplay;
654
543 clear (); 655 clear ();
656
657 char field_str[64]; // enough for 128 bits
658
659 // first morph the font if required
660 if (force_prop)
661 {
662 char *fname;
663
664 if (name[0] != '-')
665 {
666 f = XLoadQueryFont (disp, name);
667
668 if (!f)
669 return false;
670
671 char *new_name = get_property (f, XA_FONT, name);
672
673 if (new_name)
674 set_name (new_name);
675 else
676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
677
678 XFreeFont (disp, f);
679 f = 0;
680 }
681
682 if (prop.weight != rxvt_fontprop::unset)
683 {
684 replace_field (&fname, name, 2, 0,
685 prop.weight < rxvt_fontprop::bold
686 ? "medium" : "bold");
687 set_name (fname);
688 }
689
690 if (prop.slant != rxvt_fontprop::unset)
691 {
692 replace_field (&fname, name, 3, 0,
693 prop.slant < rxvt_fontprop::italic
694 ? "r" : "i"); // TODO: handle "o"blique, too
695 set_name (fname);
696 }
697 }
698
699 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
700 ? 0 : prop.height);
701
702 struct font_weight {
703 char *name;
704 int diff;
705
706 void clear ()
707 {
708 name = 0;
709 diff = 0x7fffffff;
710 }
711
712 font_weight () { clear (); }
713 ~font_weight () { free (name); }
714 };
544 715
545 char **list; 716 char **list;
546 int count; 717 int count;
547 list = XListFonts (DISPLAY, name, 1024, &count); 718 list = XListFonts (disp, name, 4000, &count);
719
548 set_name (0); 720 set_name (0);
549 721
550 if (!list) 722 if (!list)
551 return false; 723 return false;
552 724
553 int bestdiff = 0x7fffffff; 725 font_weight *fonts = new font_weight[count];
726
554 for (int i = 0; i < count; i++) 727 for (int i = 0; i < count; i++)
555 { 728 {
556 rxvt_fontprop p; 729 rxvt_fontprop p;
557 char fname[1024]; 730 char *fname;
558 fix_scalable (fname, list[i], prop); 731
732 int diff = 0;
733
734 if (replace_field (&fname, list[i], 6, '0', field_str))
735 diff += 10; // slightly penalize scalable fonts
736 else
737 {
738 free (fname);
739 if (replace_field (&fname, list[i], 11, '0', "0"))
740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 }
559 742
560 if (!set_properties (p, fname)) 743 if (!set_properties (p, fname))
561 continue; 744 continue;
562 745
746 if (prop.height != rxvt_fontprop::unset
563 if (p.height > prop.height) // weed out too large fonts 747 && p.height > prop.height) // weed out too large fonts
564 continue; 748 continue;
565 749
566 int diff = (prop.height - p.height) * 32 750 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
567 + abs (prop.weight - p.weight) 751 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
568 + abs (prop.slant - p.slant ); 752 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
753 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
569 754
570 if (!name // compare against best found so far 755 fonts[i].name = fname;
571 || diff < bestdiff) 756 fonts[i].diff = diff;
572 {
573 set_name (strdup (fname));
574 bestdiff = diff;
575 }
576 } 757 }
577 758
578 XFreeFontNames (list); 759 XFreeFontNames (list);
579 760
580 if (!name) 761 // this loop only iterates when the guessed font-size is too small
581 return false; 762 for (;;)
763 {
764 font_weight *best = fonts + count - 1;
582 765
583 f = XLoadQueryFont (DISPLAY, name); 766 for (font_weight *w = best; w-- > fonts; )
767 if (w->diff <= best->diff)
768 best = w;
769
770 if (!best->name
771 || !(f = XLoadQueryFont (disp, best->name)))
772 break;
773
774 set_name (best->name);
775 best->clear ();
776
777 ascent = f->ascent;
778 descent = f->descent;
779 height = ascent + descent;
780
781 if (prop.height == rxvt_fontprop::unset
782 || height <= prop.height)
783 break; // font is ready for use
784
785 // PIXEL_SIZE small enough, but real height too large
786 clear ();
787 }
788
789 delete [] fonts;
584 790
585 if (!f) 791 if (!f)
586 return false; 792 return false;
587 793
588 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
589 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
590 796
591 if (registry && encoding) 797 if (registry && encoding)
592 { 798 {
593 char charset[64]; 799 char charset[64];
594 snprintf (charset, 64, "%s-%s", registry, encoding); 800 snprintf (charset, 64, "%s-%s", registry, encoding);
595 801
596 cs = codeset_from_name (charset); 802 cs = codeset_from_name (charset);
597 } 803 }
598 else 804 else
599 { 805 {
600 const char *charset = get_property (f, "FONT", 0); 806 const char *charset = get_property (f, XA_FONT, 0);
601 807
602 if (!charset) 808 if (!charset)
603 charset = name; 809 charset = name;
604 810
605 int count = 13; 811 int count = 13;
… …
617 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 823 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
618 824
619 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 825 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
620 enc2b = encm || f->max_char_or_byte2 > 255; 826 enc2b = encm || f->max_char_or_byte2 > 255;
621 827
622 ascent = f->ascent;
623 descent = f->descent;
624 height = ascent + descent;
625
626 slow = false; 828 slow = false;
627 829
830#if 1 // only used for slow detection, TODO optimize
628 if (f->min_bounds.width == f->max_bounds.width) 831 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
629 width = f->min_bounds.width;
630 else if (f->per_char == NULL)
631 width = f->max_bounds.width; 832 width = f->max_bounds.width;
632 else 833 else
633 { 834 {
634 slow = true; 835 slow = true;
635 836
636 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 837 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
637 838
638 if (encm) 839 if (encm)
639 N += (f->max_byte1 - f->min_byte1) 840 N += (f->max_byte1 - f->min_byte1)
640 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 841 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
641 842
642 while (N) 843 while (N)
643 { 844 {
644 if (f->per_char[N].width > width) 845 if (f->per_char[N].width > width)
645 width = f->per_char[N].width; 846 width = f->per_char[N].width;
646 847
647 --N; 848 --N;
648 } 849 }
649 } 850 }
851#endif
852
853 width = 1;
854
855 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
856 {
857 if (FROM_UNICODE (cs, *t) == NOCHAR)
858 continue;
859
860 // ignore characters we wouldn't use anyways
861 bool careful;
862 if (!has_char (*t, &prop, careful))
863 continue;
864
865 XChar2b ch = { *t >> 8, *t };
866
867 XCharStruct g;
868 int dir_ret, asc_ret, des_ret;
869 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
870
871 int wcw = WCWIDTH (*t);
872 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
873
874 if (width < g.width) width = g.width;
875 }
650 876
651 if (cs == CS_UNKNOWN) 877 if (cs == CS_UNKNOWN)
652 { 878 {
653 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 879 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
654 880
655 clear (); 881 clear ();
656
657 return false; 882 return false;
658 } 883 }
884
885#if 0 // do it per-character
886 if (prop && width > prop->width)
887 {
888 clear ();
889 return false;
890 }
891#endif
659 892
660 return true; 893 return true;
661} 894}
662 895
663void 896void
664rxvt_font_x11::clear () 897rxvt_font_x11::clear ()
665{ 898{
666 if (f) 899 if (f)
667 { 900 {
668 XFreeFont (DISPLAY, f); 901 XFreeFont (term->dpy, f);
669 f = 0; 902 f = 0;
670 } 903 }
671} 904}
672 905
673bool 906bool
674rxvt_font_x11::has_codepoint (unicode_t unicode) 907rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
675{ 908{
676 uint32_t ch = FROM_UNICODE (cs, unicode); 909 uint32_t ch = FROM_UNICODE (cs, unicode);
677 910
678 if (ch == NOCHAR) 911 if (ch == NOCHAR)
679 return false; 912 return false;
… …
688 921
689 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 922 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
690 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 923 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
691 return false; 924 return false;
692 925
693 if (!f->per_char) 926 if (f->per_char)
694 return true; 927 {
695
696 int D = f->max_char_or_byte2 - f->min_char_or_byte2 + 1; 928 int D = f->max_char_or_byte2 - f->min_char_or_byte2 + 1;
697 int N = (byte1 - f->min_byte1) * D + byte2 - f->min_char_or_byte2; 929 int N = (byte1 - f->min_byte1) * D + byte2 - f->min_char_or_byte2;
698 930
699 xcs = f->per_char + N; 931 xcs = f->per_char + N;
932 }
933 else
934 xcs = &f->max_bounds;
700 } 935 }
701 else 936 else
702 { 937 {
703 if (ch < f->min_char_or_byte2 || ch > f->max_char_or_byte2) 938 if (ch < f->min_char_or_byte2 || ch > f->max_char_or_byte2)
704 return false; 939 return false;
705 940
706 if (!f->per_char) 941 if (f->per_char)
707 return true;
708
709 xcs = f->per_char + (ch - f->min_char_or_byte2); 942 xcs = f->per_char + (ch - f->min_char_or_byte2);
943 else
944 xcs = &f->max_bounds;
710 } 945 }
711 946
712 if (xcs->lbearing == 0 && xcs->rbearing == 0 && xcs->width == 0 947 if (xcs->lbearing == 0 && xcs->rbearing == 0 && xcs->width == 0
713 && xcs->ascent == 0 && xcs->descent == 0) 948 && xcs->ascent == 0 && xcs->descent == 0)
949 return false;
950
951 if (!prop || prop->width == rxvt_fontprop::unset)
952 return true;
953
954 // check wether character overlaps previous/next character
955 int w = xcs->rbearing - xcs->lbearing;
956 int wcw = max (WCWIDTH (unicode), 1);
957
958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
959
960 if (careful && !OVERLAP_OK (w, wcw, prop))
714 return false; 961 return false;
715 962
716 return true; 963 return true;
717} 964}
718 965
… …
724 // this looks like a mess /. 971 // this looks like a mess /.
725 // and it is a mess /. 972 // and it is a mess /.
726 // yet we are trying to be perfect /. 973 // yet we are trying to be perfect /.
727 // but the result still isn't perfect /. 974 // but the result still isn't perfect /.
728 975
976 dTermDisplay;
977 dTermGC;
978
729 bool slow = this->slow 979 bool slow = this->slow
730 || width != r->TermWin.fwidth 980 || width != term->fwidth
731 || height != r->TermWin.fheight; 981 || height != term->fheight;
732 982
733 int base = r->TermWin.fbase; 983 int base = ascent; // sorry, incorrect: term->fbase;
734 984
735 XGCValues v; 985 XGCValues v;
736 v.foreground = r->pix_colors[fg]; 986 v.foreground = term->pix_colors[fg];
737 v.font = f->fid; 987 v.font = f->fid;
738 988
739 if (enc2b) 989 if (enc2b)
740 { 990 {
741 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 991 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
742 992
743 if (bg == Color_bg && !slow) 993 if (bg == Color_bg && !slow)
744 { 994 {
745 v.background = r->pix_colors[bg]; 995 v.background = term->pix_colors[bg];
746 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 996 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
747 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 997 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
748 } 998 }
749 else 999 else
750 { 1000 {
751 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1001 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
752 1002
753 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1003 XChangeGC (disp, gc, GCForeground | GCFont, &v);
754 1004
755 if (slow) 1005 if (slow)
756 { 1006 {
757 do 1007 do
758 { 1008 {
759 if (xc->byte1 || xc->byte2) 1009 if (xc->byte1 || xc->byte2)
760 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1010 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
761 1011
762 x += r->TermWin.fwidth; 1012 x += term->fwidth;
763 xc++; len--; 1013 xc++; len--;
764 } 1014 }
765 while (len); 1015 while (len);
766 } 1016 }
767 else 1017 else
768 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1018 XDrawString16 (disp, d, gc, x, y + base, xc, len);
769 } 1019 }
770 } 1020 }
771 else 1021 else
772 { 1022 {
773 const char *xc = enc_char (text, len, cs, slow); 1023 const char *xc = enc_char (text, len, cs, slow);
774 1024
775 if (bg == Color_bg && !slow) 1025 if (bg == Color_bg && !slow)
776 { 1026 {
777 v.background = r->pix_colors[bg]; 1027 v.background = term->pix_colors[bg];
778 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1028 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
779 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1029 XDrawImageString (disp, d, gc, x, y + base, xc, len);
780 } 1030 }
781 else 1031 else
782 { 1032 {
783 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1033 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
784 1034
785 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1035 XChangeGC (disp, gc, GCForeground | GCFont, &v);
786 1036
787 if (slow) 1037 if (slow)
788 { 1038 {
789 do 1039 do
790 { 1040 {
791 if (*xc) 1041 if (*xc)
792 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1042 XDrawString (disp, d, gc, x, y + base, xc, 1);
793 1043
794 x += r->TermWin.fwidth; 1044 x += term->fwidth;
795 xc++; len--; 1045 xc++; len--;
796 } 1046 }
797 while (len); 1047 while (len);
798 } 1048 }
799 else 1049 else
800 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1050 XDrawString (disp, d, gc, x, y + base, xc, len);
801 } 1051 }
802 } 1052 }
803} 1053}
804 1054
805///////////////////////////////////////////////////////////////////////////// 1055/////////////////////////////////////////////////////////////////////////////
806 1056
807#if XFT 1057#if XFT
808#if 0
809#define UNIBITS 21
810//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
811#define SWATHBITS 8
812#endif
813 1058
814struct rxvt_font_xft : rxvt_font { 1059struct rxvt_font_xft : rxvt_font {
815 rxvt_font_xft () { f = 0; } 1060 rxvt_font_xft () { f = 0; }
816 1061
817 void clear (); 1062 void clear ();
818 1063
819 rxvt_fontprop properties (); 1064 rxvt_fontprop properties ();
820 1065
821 bool load (const rxvt_fontprop &prop); 1066 bool load (const rxvt_fontprop &prop, bool force_prop);
822 1067
823 void draw (rxvt_drawable &d, int x, int y, 1068 void draw (rxvt_drawable &d, int x, int y,
824 const text_t *text, int len, 1069 const text_t *text, int len,
825 int fg, int bg); 1070 int fg, int bg);
826 1071
827 bool has_codepoint (unicode_t unicode); 1072 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
828 1073
829protected: 1074protected:
830 XftFont *f; 1075 XftFont *f;
831}; 1076};
832 1077
833void 1078void
834rxvt_font_xft::clear () 1079rxvt_font_xft::clear ()
835{ 1080{
836 if (f) 1081 if (f)
837 { 1082 {
838 XftFontClose (DISPLAY, f); 1083 XftFontClose (term->dpy, f);
839 f = 0; 1084 f = 0;
840 } 1085 }
841} 1086}
842 1087
843rxvt_fontprop 1088rxvt_fontprop
… …
847 1092
848 FT_Face face = XftLockFace (f); 1093 FT_Face face = XftLockFace (f);
849 1094
850 p.width = width; 1095 p.width = width;
851 p.height = height; 1096 p.height = height;
1097 p.ascent = ascent;
852 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1098 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
853 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1099 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
854 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1100 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
855 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1101 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
856 1102
… …
858 1104
859 return p; 1105 return p;
860} 1106}
861 1107
862bool 1108bool
863rxvt_font_xft::load (const rxvt_fontprop &prop) 1109rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
864{ 1110{
865#if 0 1111 dTermDisplay;
866 for (int i = 0; i < SWATHCOUNT; i++)
867 cvr[i] = 0;
868#endif
869 1112
870 clear (); 1113 clear ();
871 1114
872 FcPattern *p = FcNameParse ((FcChar8 *) name); 1115 FcPattern *p = FcNameParse ((FcChar8 *) name);
873 1116
874 if (!p) 1117 if (!p)
875 return false; 1118 return false;
876 1119
877 FcValue v; 1120 FcValue v;
878 1121
1122 if (prop.height != rxvt_fontprop::unset
879 if (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch) 1123 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1124 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
880 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1125 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
881 1126
1127 if (prop.weight != rxvt_fontprop::unset
882 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1128 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
883 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1129 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
884 1130
1131 if (prop.slant != rxvt_fontprop::unset
885 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1132 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
886 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1133 FcPatternAddInteger (p, FC_SLANT, prop.slant);
887
888 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
889 FcPatternAddBool (p, FC_MINSPACE, 1);
890 1134
891#if 0 // clipping unfortunately destroys our precious double-width-characters 1135#if 0 // clipping unfortunately destroys our precious double-width-characters
892 // clip width, we can't do better, or can we? 1136 // clip width, we can't do better, or can we?
893 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
894 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); 1138 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);
895#endif 1139#endif
1140
1141 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1142 FcPatternAddBool (p, FC_MINSPACE, 1);
1143
1144 // store generated name so iso14755 view gives better results
1145 set_name ((char *)FcNameUnparse (p));
896 1146
897 XftResult result; 1147 XftResult result;
898 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1148 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
899 1149
900 FcPatternDestroy (p); 1150 FcPatternDestroy (p);
901 1151
902 if (!match) 1152 if (!match)
903 return false; 1153 return false;
904 1154
905 f = XftFontOpenPattern (DISPLAY, match);
906
907 if (!f)
908 {
909 FcPatternDestroy (match);
910 return false;
911 }
912
913 FT_Face face = XftLockFace (f);
914
915 slow = !FT_IS_FIXED_WIDTH (face);
916
917 int ftheight = 0; 1155 int ftheight = 0;
1156 bool success = true;
918 1157
919 for (;;) 1158 for (;;)
920 { 1159 {
921 XGlyphInfo g1, g2; 1160 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
922 FcChar8 c;
923 1161
924 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1); 1162 if (!f)
925 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2); 1163 {
1164 success = false;
1165 break;
1166 }
926 1167
927 if (g1.xOff != g2.xOff) // don't simply trust the font 1168 FT_Face face = XftLockFace (f);
928 slow = true;
929 1169
930 width = g2.xOff;
931 ascent = (face->size->metrics.ascender + 63) >> 6; 1170 ascent = (face->size->metrics.ascender + 63) >> 6;
932 descent = (-face->size->metrics.descender + 63) >> 6; 1171 descent = (-face->size->metrics.descender + 63) >> 6;
933 height = ascent + descent; 1172 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
1173 width = 0;
934 1174
1175 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1176
1177 XftUnlockFace (f);
1178
1179 int glheight = height;
1180
1181 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1182 {
1183 FcChar16 ch = *t;
1184
1185 if (cs != CS_UNICODE
1186 && ch > 0x100
1187 && FROM_UNICODE (cs, ch) == NOCHAR)
1188 continue;
1189
1190 // ignore characters we wouldn't use anyways
1191 bool careful;
1192 if (!has_char (*t, &prop, careful))
1193 continue;
1194
1195 XGlyphInfo g;
1196 XftTextExtents16 (disp, f, &ch, 1, &g);
1197
1198 g.width -= g.x;
1199
1200 int wcw = WCWIDTH (ch);
1201 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1202
1203 if (width < g.width ) width = g.width;
1204 if (height < g.height ) height = g.height;
1205 if (glheight < g.height - g.y) glheight = g.height - g.y;
1206 }
1207
1208 if (!width)
1209 {
1210 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1211
1212 XftFontClose (disp, f);
1213 f = 0;
1214
1215 success = false;
1216 break;
1217 }
1218
1219 if (prop.height == rxvt_fontprop::unset
935 if (height <= prop.height || !prop.height) 1220 || (height <= prop.height && glheight <= prop.height)
1221 || height <= 2
1222 || !scalable)
936 break; 1223 break;
937 1224
938 if (ftheight) 1225 if (ftheight)
939 { 1226 {
940 // take smaller steps near the end 1227 // take smaller steps near the end
941 if (height > prop.height + 1) ftheight++; 1228 if (height > prop.height + 1) ftheight++;
942 if (height > prop.height + 2) ftheight++; 1229 if (height > prop.height + 2) ftheight++;
943 if (height > prop.height + 3) ftheight++; 1230 if (height > prop.height + 3) ftheight++;
944 1231
945 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height); 1232 ftheight -= height - prop.height;
946 } 1233 }
947 else 1234 else
948 FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height); 1235 ftheight = prop.height - 1;
1236
1237 XftFontClose (disp, f);
1238 FcPatternDel (match, FC_PIXEL_SIZE);
1239 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1240 }
1241
1242 FcPatternDestroy (match);
1243
1244#if 0 // do it per-character
1245 if (prop.width != rxvt_fontprop::unset && width > prop.width)
949 } 1246 {
1247 clear ();
1248 success = false;
1249 }
1250#endif
950 1251
951 XftUnlockFace (f); 1252 return success;
1253}
1254
1255bool
1256rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1257{
1258 careful = false;
1259
1260 if (!XftCharExists (term->dpy, f, unicode))
1261 return false;
1262
1263 if (!prop || prop->width == rxvt_fontprop::unset)
1264 return true;
1265
1266 // check character against base font bounding box
1267 FcChar32 ch = unicode;
1268 XGlyphInfo g;
1269 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1270
1271 int w = g.width - g.x;
1272 int wcw = max (WCWIDTH (unicode), 1);
1273
1274 careful = g.x > 0 || w > prop->width * wcw;
1275
1276 if (careful && !OVERLAP_OK (w, wcw, prop))
1277 return false;
1278
1279 // this weeds out _totally_ broken fonts, or glyphs
1280 if (!OVERLAP_OK (g.xOff, wcw, prop))
1281 return false;
952 1282
953 return true; 1283 return true;
954}
955
956bool
957rxvt_font_xft::has_codepoint (unicode_t unicode)
958{
959 return XftCharExists (DISPLAY, f, unicode);
960} 1284}
961 1285
962void 1286void
963rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
964 const text_t *text, int len, 1288 const text_t *text, int len,
965 int fg, int bg) 1289 int fg, int bg)
966{ 1290{
967 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1291 XGlyphInfo extents;
1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1293 XftGlyphSpec *ep = enc;
968 1294
969 if (!slow && width == r->TermWin.fwidth && 0) 1295 dTermDisplay;
970 { 1296 dTermGC;
971 if (sizeof (text_t) == sizeof (FcChar16)) 1297
972 XftDrawString16 (d, &r->pix_colors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 1298 int w = term->fwidth * len;
973 else 1299 int h = term->fheight;
974 XftDrawString32 (d, &r->pix_colors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); 1300
975 } 1301 /*
976 else 1302 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
977 { 1303 * good idea from the perspective of packaging for wide variety of user configs.
1304 */
1305 bool buffered = bg >= Color_transparent;
1306#ifdef FORCE_UNBUFFERED_XFT
1307 buffered = false;
1308#endif
1309
1310 // cut trailing spaces
1311 while (len && text [len - 1] == ' ')
1312 len--;
1313
1314 int x_ = buffered ? 0 : x;
1315 int y_ = buffered ? 0 : y;
1316
978 while (len) 1317 while (len)
1318 {
1319 int cwidth = term->fwidth;
1320 FcChar32 fc = *text++; len--;
1321
1322 while (len && *text == NOCHAR)
1323 text++, len--, cwidth += term->fwidth;
1324
1325 if (fc != ' ') // skip spaces
1326 {
1327 FT_UInt glyph = XftCharIndex (disp, f, fc);
1328 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1329
1330 ep->glyph = glyph;
1331 ep->x = x_ + (cwidth - extents.xOff >> 1);
1332 ep->y = y_ + ascent;
1333
1334 if (extents.xOff == 0)
1335 ep->x = x_ + cwidth;
1336
1337 ep++;
979 { 1338 }
980 if (*text != NOCHAR && *text != ' ') 1339
1340 x_ += cwidth;
1341 }
1342
1343 if (buffered)
1344 {
1345 if (ep != enc)
1346 {
1347 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1348
1349#ifdef HAVE_BG_PIXMAP
1350 Picture dst = 0;
1351
1352 if (term->bgPixmap.pixmap
1353 && (bg == Color_transparent || bg == Color_bg
1354 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
981 { 1355 {
982 int fwidth = r->TermWin.fwidth; 1356 int src_x = x, src_y = y;
983 if (len >= 2 && text[1] == NOCHAR)
984 fwidth *= 2;
985 1357
986 XGlyphInfo extents; 1358 if (term->bgPixmap.is_parentOrigin ())
987 if (sizeof (text_t) == sizeof (FcChar16))
988 { 1359 {
989 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents); 1360 src_x += term->window_vt_x;
990 XftDrawString16 (d, &r->pix_colors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 1361 src_y += term->window_vt_y;
991 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 1362 }
1363
1364 if (term->bgPixmap.pmap_width >= src_x + w
1365 && term->bgPixmap.pmap_height >= src_y + h)
1366 {
1367 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1368 src_x, src_y, w, h, 0, 0);
992 } 1369 }
993 else 1370 else
994 { 1371 {
995 XGlyphInfo extents; 1372 XGCValues gcv;
996 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents); 1373
997 XftDrawString32 (d, &r->pix_colors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 1374 gcv.fill_style = FillTiled;
998 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 1375 gcv.tile = term->bgPixmap.pixmap;
1376 gcv.ts_x_origin = -src_x;
1377 gcv.ts_y_origin = -src_y;
1378
1379 XChangeGC (disp, gc,
1380 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1381 &gcv);
1382
1383 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1384
1385 gcv.fill_style = FillSolid;
1386 XChangeGC (disp, gc, GCFillStyle, &gcv);
1387 }
1388
1389 if (dst)
1390 {
1391 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1392
1393 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
999 } 1394 }
1000 } 1395 }
1001
1002 x += r->TermWin.fwidth;
1003 text++;
1004 len--; 1396 else
1397#endif
1398 clear_rect (d2, 0, 0, w, h, bg);
1399
1400 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1401 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1005 } 1402 }
1403 else
1404 clear_rect (d, x, y, w, h, bg);
1405 }
1406 else
1006 } 1407 {
1408 clear_rect (d, x, y, w, h, bg);
1409 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1410 }
1007} 1411}
1412
1008#endif 1413#endif
1009 1414
1010///////////////////////////////////////////////////////////////////////////// 1415/////////////////////////////////////////////////////////////////////////////
1011 1416
1012rxvt_fontset::rxvt_fontset (rxvt_t r) 1417rxvt_fontset::rxvt_fontset (rxvt_term *term)
1013: r (r), fontdesc (0) 1418: fontdesc (0), term (term)
1014{ 1419{
1015 clear (); 1420 clear ();
1016} 1421}
1017 1422
1018rxvt_fontset::~rxvt_fontset () 1423rxvt_fontset::~rxvt_fontset ()
… …
1021} 1426}
1022 1427
1023void 1428void
1024rxvt_fontset::clear () 1429rxvt_fontset::clear ()
1025{ 1430{
1431 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1432 = rxvt_fontprop::unset;
1433 force_prop = false;
1434
1026 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1435 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1027 FONT_UNREF (*i); 1436 FONT_UNREF (*i);
1028 1437
1438 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1439 delete *p;
1440
1029 free (fontdesc); fontdesc = 0; 1441 free (fontdesc); fontdesc = 0;
1030 1442
1031 fonts.clear (); 1443 fonts.clear ();
1032 base_id = 0;
1033 base_prop.height = 0x7fffffff;
1034 base_prop.weight = rxvt_fontprop::medium;
1035 base_prop.slant = rxvt_fontprop::roman;
1036 1444
1037 fallback = fallback_fonts; 1445 fallback = fallback_fonts;
1038} 1446}
1039 1447
1040rxvt_font * 1448rxvt_font *
1041rxvt_fontset::new_font (const char *name, codeset cs) 1449rxvt_fontset::new_font (const char *name, codeset cs)
1042{ 1450{
1043 rxvt_font *f; 1451 rxvt_font *f;
1044 1452
1045 if (!name || !*name) 1453 if (!name || !*name)
1046 { 1454 {
1047 name = ""; 1455 name = "";
1048 f = new rxvt_font_default; 1456 f = new rxvt_font_default (this);
1049 } 1457 }
1050#if XFT 1458#if XFT
1051 else if (!strncmp (name, "xft:", 4)) 1459 else if (!strncmp (name, "xft:", 4))
1052 { 1460 {
1053 name += 4; 1461 name += 4;
1054 f = new rxvt_font_xft; 1462 f = new rxvt_font_xft ();
1055 } 1463 }
1056#endif 1464#endif
1057 else if (!strncmp (name, "x:", 2)) 1465 else if (!strncmp (name, "x:", 2))
1058 { 1466 {
1059 name += 2; 1467 name += 2;
1060 f = new rxvt_font_x11; 1468 f = new rxvt_font_x11;
1061 } 1469 }
1062 else 1470 else
1063 f = new rxvt_font_x11; 1471 f = new rxvt_font_x11;
1064 1472
1065 f->fs = this;
1066 f->set_term (r); 1473 f->set_term (term);
1067 f->set_name (strdup (name)); 1474 f->set_name (strdup (name));
1068 1475
1069 f->cs = cs; 1476 f->cs = cs;
1070 f->loaded = false; 1477 f->loaded = false;
1071 1478
… …
1082 char buf[512]; 1489 char buf[512];
1083 const char *end; 1490 const char *end;
1084 1491
1085 do 1492 do
1086 { 1493 {
1087 while (*desc <= ' ') desc++; 1494 while (*desc && *desc <= ' ')
1495 desc++;
1496
1497 codeset cs = CS_UNICODE;
1088 1498
1089 if (*desc == '[') 1499 if (*desc == '[')
1090 { 1500 {
1091 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1501 char spec[256];
1092
1093 //const char *extra = desc++; // not yet used 1502 const char *extra = ++desc; // not yet used
1094 1503
1095 desc = strchr (desc, ']'); 1504 desc = strchr (desc, ']');
1096 1505
1097 if (!desc) 1506 if (!desc)
1098 { 1507 {
1099 fprintf (stderr, "ERROR: opening '[' without closing ']' in font specification.\n"); 1508 rxvt_warn ("ERROR: opening '[' without closing ']' in font specification, trying to continue.\n");
1100 break; 1509 break;
1101 } 1510 }
1511
1512 memcpy (spec, extra, min (desc - extra, 255));
1513 spec[min (desc - extra, 255)] = 0;
1514
1515 if (!strncmp (extra, "codeset=", sizeof ("codeset=") - 1))
1516 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1517 else
1518 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1102 1519
1103 desc++; 1520 desc++;
1104 while (*desc <= ' ') desc++; 1521 while (*desc <= ' ') desc++;
1105 } 1522 }
1106 1523
… …
1108 if (!end) 1525 if (!end)
1109 end = desc + strlen (desc); 1526 end = desc + strlen (desc);
1110 1527
1111 if (end - desc < 511) 1528 if (end - desc < 511)
1112 { 1529 {
1113 strncpy (buf, desc, end - desc); 1530 memcpy (buf, desc, end - desc);
1114 buf[end - desc] = 0; 1531 buf[end - desc] = 0;
1115 1532
1116 fonts.push_back (new_font (buf, CS_UNICODE)); 1533 fonts.push_back (new_font (buf, cs));
1117 } 1534 }
1535 else
1536 rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1118 1537
1119 desc = end + 1; 1538 desc = end + 1;
1120 } 1539 }
1121 while (*end); 1540 while (*end);
1122 } 1541 }
1123} 1542}
1124 1543
1125bool 1544bool
1126rxvt_fontset::realize_font (int i) 1545rxvt_fontset::realize_font (int i)
1127{ 1546{
1547 if (i < 0 || i >= fonts.size ())
1548 return false;
1549
1128 if (fonts[i]->loaded) 1550 if (fonts[i]->loaded)
1129 return true; 1551 return true;
1130 1552
1131 fonts[i]->loaded = true; 1553 fonts[i]->loaded = true;
1132 1554
1133 if (!fonts[i]->load (base_prop)) 1555 if (!fonts[i]->load (prop, force_prop))
1134 { 1556 {
1135 fonts[i]->cs = CS_UNKNOWN; 1557 fonts[i]->cs = CS_UNKNOWN;
1136 return false; 1558 return false;
1137 } 1559 }
1138 1560
… …
1148 1570
1149 fonts.push_back (new_font (0, CS_UNICODE)); 1571 fonts.push_back (new_font (0, CS_UNICODE));
1150 realize_font (0); 1572 realize_font (0);
1151 1573
1152 add_fonts (desc); 1574 add_fonts (desc);
1153
1154 if (!base_id)
1155 base_id = 1;
1156
1157 // we currently need a base-font, no matter what
1158 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1159 {
1160 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1161 add_fonts ("fixed");
1162 base_id = fonts.size () - 1;
1163 }
1164
1165 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1166 return false;
1167
1168 base_prop = fonts[base_id]->properties ();
1169 1575
1170 return true; 1576 return true;
1171} 1577}
1172 1578
1173int 1579int
… …
1179 1585
1180 return -1; 1586 return -1;
1181} 1587}
1182 1588
1183int 1589int
1184rxvt_fontset::find_font (unicode_t unicode, bool bold) 1590rxvt_fontset::find_font (unicode_t unicode)
1185{ 1591{
1592 if (unicode >= 1<<20)
1593 return 0;
1186 1594
1187 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii 1595 unicode_t hi = unicode >> 8;
1188 i < fonts.size (); 1596
1189 i++) 1597 if (hi < fmap.size ()
1598 && fmap[hi]
1599 && (*fmap[hi])[unicode & 0xff] != 0xff)
1600 return (*fmap[hi])[unicode & 0xff];
1601
1602 unsigned int i;
1603
1604 for (i = 0; i < fonts.size (); i++)
1190 { 1605 {
1191 rxvt_font *f = fonts[i]; 1606 rxvt_font *f = fonts[i];
1192 1607
1193 if (!f->loaded) 1608 if (!f->loaded)
1194 { 1609 {
1195 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1610 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1196 goto next_font; 1611 goto next_font;
1197 1612
1198 if (!realize_font (i)) 1613 if (!realize_font (i))
1199 goto next_font; 1614 goto next_font;
1615
1616 if (prop.ascent != rxvt_fontprop::unset)
1617 max_it (f->ascent, prop.ascent);
1200 } 1618 }
1201 1619
1202 if (f->cs == CS_UNKNOWN) 1620 if (f->cs == CS_UNKNOWN)
1203 goto next_font; 1621 goto next_font;
1204 1622
1205 if (bold && f->properties ().weight < rxvt_fontprop::bold) 1623 bool careful;
1624 if (f->has_char (unicode, &prop, careful))
1625 {
1626 if (careful)
1627 i |= 128;
1628
1206 goto next_font; 1629 goto found;
1207 1630 }
1208 if (f->has_codepoint (unicode))
1209 return i;
1210 1631
1211 next_font: 1632 next_font:
1212 if (i == fonts.size () - 1) 1633 if (i == fonts.size () - 1)
1213 { 1634 {
1214 if (fallback->name) 1635 if (fallback->name)
… …
1221 { 1642 {
1222 // try to find a new font. 1643 // try to find a new font.
1223 // only xft currently supported, as there is no 1644 // only xft currently supported, as there is no
1224 // way to configure this and xft is easier to hack in, 1645 // way to configure this and xft is easier to hack in,
1225 // while x11 has more framework in place already. 1646 // while x11 has more framework in place already.
1226#if XFT 1647 // TODO: this is a real resource hog, xft takes ages(?)
1648#if XFT && USE_SLOW_LOOKUP
1227 // grab the first xft font that seems suitable 1649 // grab the first xft font that seems suitable
1228 FcPattern *p = FcPatternCreate (); 1650 FcPattern *p = FcPatternCreate ();
1229 1651
1230 FcCharSet *s = FcCharSetCreate (); 1652 FcCharSet *s = FcCharSetCreate ();
1231 FcCharSetAddChar (s, unicode); 1653 FcCharSetAddChar (s, unicode);
1232 FcPatternAddCharSet (p, FC_CHARSET, s); 1654 FcPatternAddCharSet (p, FC_CHARSET, s);
1233 // charsets don't help that much, as xft might return 1655 // charsets don't help that much, as xft might return
1234 // a non-matching font even if a better font is available :/ 1656 // a non-matching font even if a better font is available :/
1235 1657
1658 x x x x TODO prop might have unset contents
1236 FcPatternAddInteger (p, FC_PIXEL_SIZE, base_prop.height); 1659 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1237 FcPatternAddInteger (p, FC_WEIGHT, base_prop.weight); 1660 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1238 FcPatternAddInteger (p, FC_SLANT, base_prop.slant); 1661 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1239 FcPatternAddBool (p, FC_MINSPACE, 1); 1662 FcPatternAddBool (p, FC_MINSPACE, 1);
1240 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1663 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1241 1664
1242 XftResult result; 1665 XftResult result;
1243 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1666 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1244 1667
1245 FcPatternDestroy (p); 1668 FcPatternDestroy (p);
1246 1669
1247 if (match) 1670 if (match)
1248 { 1671 {
… …
1253 if (find_font (font) < 0) 1676 if (find_font (font) < 0)
1254 { 1677 {
1255 char fontname[4096]; 1678 char fontname[4096];
1256 sprintf (fontname, "xft:%-.4090s", font); 1679 sprintf (fontname, "xft:%-.4090s", font);
1257 1680
1258 fonts.push_back (new_font (fontname, CS_UNICODE)); 1681 fonts.push_back (new_font (fontname, CS_UNICODE));
1259 } 1682 }
1260 1683
1261 free (font); 1684 free (font);
1262 } 1685 }
1263#endif 1686#endif
1264 } 1687 }
1265 } 1688 }
1266 } 1689 }
1267 1690
1268 // if no bold font found, use a regular one 1691 /* we must return SOME font */
1269 if (bold) 1692 i = 0;
1270 return find_font (unicode);
1271 1693
1272 return 0; /* we must return SOME font */ 1694found:
1273} 1695 // found a font, cache it
1696 if (i < 255)
1697 {
1698 while (hi >= fmap.size ())
1699 fmap.push_back (0);
1274 1700
1701 if (!fmap[hi])
1702 {
1703 fmap[hi] = (pagemap *)new pagemap;
1704 memset (fmap[hi], 0xff, sizeof (pagemap));
1705 }
1275 1706
1707 (*fmap[hi])[unicode & 0xff] = i;
1708 }
1276 1709
1710 return i;
1711}
1712
1713
1714

Diff Legend

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