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

Diff Legend

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