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

Diff Legend

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