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

Diff Legend

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