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

Diff Legend

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