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

Diff Legend

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