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.180 by sf-exg, Mon May 30 18:39:03 2011 UTC

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

Diff Legend

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