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

Diff Legend

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