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.41 by root, Wed Aug 25 02:33:09 2004 UTC vs.
Revision 1.200 by root, Thu Jun 17 00:49:20 2021 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: defaultfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 3 of the License, or
10 * (at your option) any later version. 10 * (at your option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 15 * GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtutil.h" 24#include "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" },
89 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 97 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-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_CN || ENCODING_CN_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"}, 139 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
131 { CS_UNICODE, "xft:Andale Mono:antialias=false" },
132 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" },
133 { CS_UNICODE, "xft:Courier New:antialias=false" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
142 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
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" }, 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 if (IS_COMPOSE (unicode))
309 return true; 319 return true;
310 320
311 switch (unicode) 321 switch (unicode)
… …
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 372
351 int x_[16]; 373 int x_[16];
352 int y_[16]; 374 int y_[16];
353 375
354 for (int i = 0; i <= 8; i++) 376 for (int i = 0; i <= 8; i++)
… …
362 384
363 XGCValues gcv; 385 XGCValues gcv;
364 386
365 gcv.cap_style = CapButt; 387 gcv.cap_style = CapButt;
366 gcv.line_width = 0; 388 gcv.line_width = 0;
367 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 389 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
368 390
369 while (a < b) 391 while (a < b)
370 { 392 {
371 uint32_t command = *a++; 393 uint32_t command = *a++;
372 394
… …
379 int y2 = y_[(command >> 0) & 15]; 401 int y2 = y_[(command >> 0) & 15];
380 402
381 switch (op) 403 switch (op)
382 { 404 {
383 case 0: // line 405 case 0: // line
384 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 406 XDrawLine (disp, d, gc, x1, y1, x2, y2);
385 break; 407 break;
386 408
387 case 1: // rectangle, possibly stippled 409 case 1: // rectangle, possibly stippled
388 if (a) 410 if (a)
389 { 411 {
390 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
391 413
392 gcv.fill_style = FillStippled; 414 gcv.fill_style = FillStippled;
393 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
394 gcv.ts_x_origin = x; 416 gcv.ts_x_origin = x;
395 gcv.ts_y_origin = y; 417 gcv.ts_y_origin = y;
396 418
397 XChangeGC (d.display->display, TGC, 419 XChangeGC (disp, gc,
398 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 420 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
399 &gcv); 421 &gcv);
400 } 422 }
401 423
402 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);
403 425
404 if (a) 426 if (a)
405 { 427 {
406 XFreePixmap (d.display->display, gcv.stipple); 428 XFreePixmap (disp, gcv.stipple);
407 gcv.stipple = 0; 429 gcv.stipple = 0;
408 gcv.fill_style = FillSolid; 430 gcv.fill_style = FillSolid;
409 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 431 XChangeGC (disp, gc, GCFillStyle, &gcv);
410 } 432 }
411 break; 433 break;
412 case 2: // arc 434 case 2: // arc
413 XDrawArc (d.display->display, d, TGC, 435 XDrawArc (disp, d, gc,
414 x1 - W/2, y1 - H/2, W-1, H-1, 436 x1 - W/2, y1 - H/2, W-1, H-1,
415 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
416 break; 438 break;
417 } 439 }
418 } 440 }
419 } 441 }
442#else
443 if (0)
444 ;
445#endif
420#if ENABLE_COMBINING 446#if ENABLE_COMBINING
421 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && rxvt_composite[t])
448 {
449 min_it (width, 2); // we only support wcwidth up to 2
450
451 #if NOT_YET
452 vector<text_t> chrs;
453 chrs.reserve (rxvt_composite.expand (t));
454 rxvt_composite.expand (t, &chrs[0]);
455
456 while (!chrs.empty ())
422 { 457 {
458 rxvt_font *f1 = fs->find_font_idx (chrs[0])
459
460 int i = 0;
461 while (i < chrs.size () - 1
462 && f1->can_combine
463 && f1->has-char (chrs[i + 1], careful)
464 && !careful
465 ++i;
466
467 (*fs)[f1]->draw (d, x, y, &chrs[0], width, fg, bg);
468 chrs.erase (&chrs[0], &chrs[i]);
469 }
470 #endif
471
472 #if 1
473 text_t chrs[2];
474 chrs [1] = NOCHAR;
475
476 *chrs = cc->c1;
423 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 477 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
424 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); 478 f1->draw (d, x, y, chrs, width, fg, bg);
479
425 if (cc->c2 != NOCHAR) 480 if (cc->c2 != NOCHAR)
426 { 481 {
482 bool careful;
483
427 // prefer font of first character, for no good reasons 484 // prefer font of first character, for no good reasons
428 bool careful; 485 *chrs = cc->c2;
429 rxvt_font *f2 = f1->has_char (cc->c2, 0, careful) 486 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
430 ? f1 487 ? f1
431 : (*fs)[fs->find_font (cc->c2)]; 488 : (*fs)[fs->find_font_idx (cc->c2)];
432 489
433 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); 490 f2->draw (d, x, y, chrs, width, fg, Color_none);
434 } 491 }
492 #endif
435 } 493 }
436#endif 494#endif
437 else 495 else
438 switch (t) 496 switch (t)
439 { 497 {
440 case '\t': 498 case '\t':
441 case ZERO_WIDTH_CHAR: 499 case ZERO_WIDTH_CHAR:
442 case NOCHAR: 500 case NOCHAR:
443 break; 501 break;
444 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
445 default: 512 default:
446 int w = 0;
447 while (len > 0 && *text == NOCHAR)
448 {
449 ++text;
450 --len;
451 w += r->TermWin.fwidth;
452 }
453
454 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, 513 XDrawRectangle (disp, d, gc, x + 2, y + 2,
455 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); 514 fwidth - 4, term->fheight - 4);
456 x += w;
457 } 515 }
458 516
459 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;
460 } 572 }
461} 573 }
574};
462 575
463///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
464 577
465struct rxvt_font_x11 : rxvt_font { 578struct rxvt_font_x11 : rxvt_font
579{
466 rxvt_font_x11 () { f = 0; } 580 rxvt_font_x11 () { f = 0; }
467 581
468 void clear (); 582 void clear ();
469 583
470 rxvt_fontprop properties (); 584 rxvt_fontprop properties ();
471 585
472 bool load (const rxvt_fontprop &prop); 586 bool load (const rxvt_fontprop &prop, bool force_prop);
473 587
474 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;
475 589
476 void draw (rxvt_drawable &d, int x, int y, 590 void draw (rxvt_drawable &d, int x, int y,
477 const text_t *text, int len, 591 const text_t *text, int len,
478 int fg, int bg); 592 int fg, int bg);
479 593
480 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
481 XFontStruct *f; 595 XFontStruct *f;
482 codeset cs;
483 bool enc2b, encm; 596 bool enc2b, encm;
484 597
485 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 598 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
486 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);
487 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 600 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
488 bool set_properties (rxvt_fontprop &p, const char *name); 601 bool set_properties (rxvt_fontprop &p, const char *name);
489}; 602};
490 603
491char * 604char *
492rxvt_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
493{ 606{
494 unsigned long value; 607 unsigned long value;
495 608
496 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 609 if (XGetFontProperty (f, property, &value))
497 return XGetAtomName (DISPLAY, value); 610 return XGetAtomName (term->dpy, value);
498 else 611 else
499 return rxvt_strdup (repl); 612 return repl ? strdup (repl) : 0;
500} 613}
501 614
502rxvt_fontprop 615rxvt_fontprop
503rxvt_font_x11::properties () 616rxvt_font_x11::properties ()
504{ 617{
… …
508} 621}
509 622
510bool 623bool
511rxvt_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)
512{ 625{
513 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;
514 p.height = height; 629 p.height = height;
630 p.ascent = rxvt_fontprop::unset;
515 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;
516 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;
517 633
518 return true; 634 return true;
519} 635}
520 636
521bool 637bool
522rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 638rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
523{ 639{
524 unsigned long height; 640 unsigned long height;
641
642#if 0
525 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 643 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
526 return false; 644 return false;
645#else
646 height = f->ascent + f->descent;
647#endif
527 648
528 unsigned long avgwidth; 649 unsigned long avgwidth;
529 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 650 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
530 avgwidth = 0; 651 avgwidth = 0;
531 652
532 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 653 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
533 char *slant = get_property (f, "SLANT", "r"); 654 char *slant = get_property (f, term->xa [XA_SLANT], "r");
534 655
535 set_properties (p, height, weight, slant, avgwidth); 656 set_properties (p, height, weight, slant, avgwidth);
536 657
537 free (weight); 658 free (weight);
538 free (slant); 659 free (slant);
539 660
661 p.ascent = f->ascent;
662
540 return true; 663 return true;
541} 664}
542 665
543bool 666bool
544rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 667rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
545{ 668{
669 dTermDisplay;
546 int slashes = 0; 670 int slashes = 0;
547 const char *comp[13]; 671 const char *comp[13];
548 672
549 for (const char *c = name; *c; c++) 673 for (const char *c = name; *c; c++)
550 if (*c == '-') 674 if (*c == '-')
… …
558 if (slashes >= 13 682 if (slashes >= 13
559 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 683 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
560 && (*comp[11] >= '0' && *comp[11] <= '9')) 684 && (*comp[11] >= '0' && *comp[11] <= '9'))
561 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]));
562 686
563 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 687 XFontStruct *f = XLoadQueryFont (disp, name);
564 688
565 if (f) 689 if (f)
566 { 690 {
567 // 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
568 // (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).
569 // in that case, just return garbage. 693 // in that case, just return garbage.
570 bool ret = set_properties (p, f); 694 bool ret = set_properties (p, f);
571 XFreeFont (DISPLAY, f); 695 XFreeFont (disp, f);
572 return ret; 696 return ret;
573 } 697 }
574 else 698 else
575 return false; 699 return false;
576} 700}
577 701
578// fix the size of scalable fonts 702// fix the size of scalable fonts
579static bool 703static bool
580replace_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)
581{ 705{
582 int slashes = 0; 706 int slashes = 0;
583 const char *field, *end; 707 const char *field, *end;
584 708
585 for (const char *c = name; *c; c++) 709 for (const char *c = name; *c; c++)
… …
595 break; 719 break;
596 } 720 }
597 721
598 if (slashes >= 13 && (!old || *field == old)) 722 if (slashes >= 13 && (!old || *field == old))
599 { 723 {
600 // TODO: check for overflow in font-name 724 size_t len = field - name;
601 strncpy (buf, name, field - name); 725 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
602 buf += field - name; 726 memcpy (*ptr, name, len);
603 strcpy (buf, replace); 727 strcpy (*ptr + len, replace);
604 strcat (buf, end); 728 strcat (*ptr, end);
605 729
606 return true; 730 return true;
607 } 731 }
608 else 732 else
609 { 733 {
610 strcpy (buf, name); 734 *ptr = strdup (name);
611 735
612 return false; 736 return false;
613 } 737 }
614} 738}
615 739
616bool 740bool
617rxvt_font_x11::load (const rxvt_fontprop &prop) 741rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
618{ 742{
743 dTermDisplay;
744
619 clear (); 745 clear ();
620 746
621 char field_str[64]; // enough for 128 bits 747 char field_str[64]; // enough for 128 bits
622 748
623 // first morph the font if required 749 // first morph the font if required
624 if (prop.weight != rxvt_fontprop::unset 750 if (force_prop)
625 || prop.slant != rxvt_fontprop::unset)
626 { 751 {
627 char fname[1024]; 752 char *fname;
628 753
629 if (name[0] != '-') 754 if (name[0] != '-')
630 { 755 {
631 f = XLoadQueryFont (DISPLAY, name); 756 f = XLoadQueryFont (disp, name);
632 757
633 if (!f) 758 if (!f)
634 return false; 759 return false;
635 760
636 char *new_name = get_property (f, "FONT", name); 761 char *new_name = get_property (f, XA_FONT, 0);
637 762
638 if (new_name) 763 if (new_name)
639 set_name (new_name); 764 set_name (new_name);
640 else 765 else
641 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 766 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
642 767
643 XFreeFont (DISPLAY, f); 768 XFreeFont (disp, f);
644 f = 0; 769 f = 0;
645 } 770 }
646 771
647 if (prop.weight != rxvt_fontprop::unset) 772 if (prop.weight != rxvt_fontprop::unset)
648 { 773 {
649 replace_field (fname, name, 2, 0, 774 replace_field (&fname, name, 2, 0,
650 prop.weight < rxvt_fontprop::bold 775 prop.weight < rxvt_fontprop::bold
651 ? "medium" : "bold"); 776 ? "medium" : "bold");
652 set_name (strdup (fname)); 777 set_name (fname);
653 } 778 }
654 779
655 if (prop.slant != rxvt_fontprop::unset) 780 if (prop.slant != rxvt_fontprop::unset)
656 { 781 {
657 replace_field (fname, name, 3, 0, 782 replace_field (&fname, name, 3, 0,
658 prop.slant < rxvt_fontprop::italic 783 prop.slant < rxvt_fontprop::italic
659 ? "r" : "i"); // TODO: handle "o"blique, too 784 ? "r" : "i"); // TODO: handle "o"blique, too
660 set_name (strdup (fname)); 785 set_name (fname);
661 } 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 ()
662 } 797 {
798 name = 0;
799 diff = 0x7fffffff;
800 }
801
802 font_weight () { clear (); }
803 ~font_weight () { free (name); }
804 };
663 805
664 char **list; 806 char **list;
665 int count; 807 int count;
666 list = XListFonts (DISPLAY, name, 1024, &count); 808 list = XListFonts (disp, name, 4000, &count);
667 809
668 set_name (0); 810 set_name (0);
669 811
670 if (!list) 812 if (!list)
671 return false; 813 return false;
672 814
673 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 815 font_weight *fonts = new font_weight[count];
674 ? 0 : prop.height);
675 816
676 int bestdiff = 0x7fffffff;
677 for (int i = 0; i < count; i++) 817 for (int i = 0; i < count; i++)
678 { 818 {
679 rxvt_fontprop p; 819 rxvt_fontprop p;
680 char fname[1024]; 820 char *fname;
681 821
682 int diff = 0; 822 int diff = 0;
683 823
684 if (replace_field (fname, list[i], 6, '0', field_str)) 824 if (replace_field (&fname, list[i], 6, '0', field_str))
685 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 }
686 832
687 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);
688 continue; 839 continue;
689 840 }
690 if (prop.height != rxvt_fontprop::unset
691 && p.height > prop.height) // weed out too large fonts
692 continue;
693 841
694 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;
695 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);
696 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);
697 //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);
698 846
699 if (!name // compare against best found so far 847 fonts[i].name = fname;
700 || diff < bestdiff) 848 fonts[i].diff = diff;
701 {
702 set_name (strdup (fname));
703 bestdiff = diff;
704 }
705 } 849 }
706 850
707 XFreeFontNames (list); 851 XFreeFontNames (list);
708 852
709 if (!name) 853 // this loop only iterates when the guessed font-size is too small
710 return false; 854 for (;;)
855 {
856 font_weight *best = fonts;
711 857
712 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;
713 882
714 if (!f) 883 if (!f)
715 return false; 884 return false;
716 885
717 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 886 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
718 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;
719 890
720 if (registry && encoding) 891 if (registry && encoding)
721 { 892 {
722 char charset[64]; 893 char charset[64];
723 snprintf (charset, 64, "%s-%s", registry, encoding); 894 snprintf (charset, 64, "%s-%s", registry, encoding);
724 895
725 cs = codeset_from_name (charset); 896 cs = codeset_from_name (charset);
726 } 897
727 else 898 if (cs == CS_UNKNOWN)
899 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
728 { 900 }
901
902 free (registry);
903 free (encoding);
904
905 if (cs == CS_UNKNOWN)
906 {
729 const char *charset = get_property (f, "FONT", 0); 907 char *value = get_property (f, XA_FONT, 0);
908 const char *charset = value;
730 909
731 if (!charset) 910 if (!charset)
732 charset = name; 911 charset = name;
733 912
734 int count = 13; 913 int count = 13;
735 while (*charset) 914 while (*charset)
736 if (*charset++ == '-' && !--count) 915 if (*charset++ == '-' && !--count)
737 break; 916 break;
738 917
739 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)
740 } 926 {
741 927 clear ();
742 free (registry); 928 return false;
743 free (encoding); 929 }
744 930
745 if (cs == CS_UNICODE) 931 if (cs == CS_UNICODE)
746 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
747 933
748 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 934 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
749 enc2b = encm || f->max_char_or_byte2 > 255; 935 enc2b = encm || f->max_char_or_byte2 > 255;
750 936
751 ascent = f->ascent;
752 descent = f->descent;
753 height = ascent + descent;
754
755 slow = false; 937 slow = false;
756 938
757#if 1 // only used for slow detection, TODO optimize 939#if 1 // only used for slow detection, TODO optimize
758 if (f->min_bounds.width == f->max_bounds.width) 940 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
759 width = f->min_bounds.width;
760 else if (f->per_char == NULL)
761 width = f->max_bounds.width; 941 width = f->max_bounds.width;
762 else 942 else
763 { 943 {
764 slow = true; 944 slow = true;
765 945
766 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;
767 947
768 if (encm) 948 if (encm)
769 N += (f->max_byte1 - f->min_byte1) 949 N += (f->max_byte1 - f->min_byte1)
770 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 950 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
771 951
772 while (N) 952 while (N)
773 { 953 {
774 if (f->per_char[N].width > width) 954 if (f->per_char[N].width > width)
775 width = f->per_char[N].width; 955 width = f->per_char[N].width;
776 956
… …
779 } 959 }
780#endif 960#endif
781 961
782 width = 1; 962 width = 1;
783 963
784 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++)
785 { 965 {
786 if (cs != CS_UNICODE
787 && *t > 0x100
788 && FROM_UNICODE (cs, *t) == NOCHAR) 966 if (FROM_UNICODE (cs, *t) == NOCHAR)
789 continue; 967 continue;
790 968
791 // ignore characters we wouldn't use anyways 969 // ignore characters we wouldn't use anyways
792 bool careful; 970 bool careful;
793 if (!has_char (*t, &prop, careful)) 971 if (!has_char (*t, &prop, careful))
794 continue; 972 continue;
795 973
796 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 };
797 976
798 XCharStruct g; 977 XCharStruct g;
799 int dir_ret, asc_ret, des_ret; 978 int dir_ret, asc_ret, des_ret;
800 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 979 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
801 980
802 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;
803 983
804 if (width < g.width) width = g.width; 984 if (width < g.width) width = g.width;
805 }
806
807 if (cs == CS_UNKNOWN)
808 { 985 }
809 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
810 986
987#if 0 // do it per-character
988 if (prop && width > prop->width)
989 {
811 clear (); 990 clear ();
812 return false; 991 return false;
813 } 992 }
814
815#if 0 // do it per-character
816 if (prop && width > prop->width)
817 {
818 clear ();
819 return false;
820 }
821#endif 993#endif
822 994
823 return true; 995 return true;
824} 996}
825 997
826void 998void
827rxvt_font_x11::clear () 999rxvt_font_x11::clear ()
828{ 1000{
829 if (f) 1001 if (f)
830 { 1002 {
831 XFreeFont (DISPLAY, f); 1003 XFreeFont (term->dpy, f);
832 f = 0; 1004 f = 0;
833 } 1005 }
834} 1006}
835 1007
836bool 1008bool
837rxvt_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
838{ 1010{
1011 careful = false;
1012
839 uint32_t ch = FROM_UNICODE (cs, unicode); 1013 uint32_t ch = FROM_UNICODE (cs, unicode);
840 1014
841 if (ch == NOCHAR) 1015 if (ch == NOCHAR)
842 return false; 1016 return false;
843 1017
844 /* check wether the character exists in _this_ font. horrible. */ 1018 /* check whether the character exists in _this_ font. horrible. */
845 XCharStruct *xcs; 1019 XCharStruct *xcs;
846 1020
847 if (encm) 1021 if (encm)
848 { 1022 {
849 unsigned char byte1 = ch >> 8; 1023 unsigned char byte1 = ch >> 8;
… …
879 return false; 1053 return false;
880 1054
881 if (!prop || prop->width == rxvt_fontprop::unset) 1055 if (!prop || prop->width == rxvt_fontprop::unset)
882 return true; 1056 return true;
883 1057
884 // check character against base font bounding box 1058 // check whether character overlaps previous/next character
885 int w = xcs->width; 1059 int w = xcs->rbearing - xcs->lbearing;
886 int wcw = wcwidth (unicode); 1060 int wcw = max (WCWIDTH (unicode), 1);
887 if (wcw > 0) w /= wcw;
888 1061
889 careful = w > prop->width; 1062 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
890 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1063
1064 if (careful && !OVERLAP_OK (w, wcw, prop))
891 return false; 1065 return false;
892 1066
893 return true; 1067 return true;
894} 1068}
895 1069
… …
901 // this looks like a mess /. 1075 // this looks like a mess /.
902 // and it is a mess /. 1076 // and it is a mess /.
903 // yet we are trying to be perfect /. 1077 // yet we are trying to be perfect /.
904 // but the result still isn't perfect /. 1078 // but the result still isn't perfect /.
905 1079
1080 dTermDisplay;
1081 dTermGC;
1082
906 bool slow = this->slow 1083 bool slow = this->slow
907 || width != r->TermWin.fwidth 1084 || width != term->fwidth
908 || height != r->TermWin.fheight; 1085 || height != term->fheight
1086 || ascent != f->ascent;
909 1087
910 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 1088 int base = ascent; // sorry, incorrect: term->fbase;
911 1089
912 XGCValues v; 1090 XGCValues v;
913 v.foreground = r->pix_colors[fg]; 1091 v.foreground = term->pix_colors[fg];
914 v.font = f->fid; 1092 v.font = f->fid;
915 1093
916 if (enc2b) 1094 if (enc2b)
917 { 1095 {
918 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 1096 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
919 1097
920 if (bg == Color_bg && !slow) 1098 if (bg == Color_bg && !slow)
921 { 1099 {
922 v.background = r->pix_colors[bg]; 1100 v.background = term->pix_colors[bg];
923 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1101 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
924 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 1102 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
925 } 1103 }
926 else 1104 else
927 { 1105 {
928 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);
929 1107
930 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1108 XChangeGC (disp, gc, GCForeground | GCFont, &v);
931 1109
932 if (slow) 1110 if (slow)
933 { 1111 {
934 do 1112 do
935 { 1113 {
936 if (xc->byte1 || xc->byte2) 1114 if (xc->byte1 || xc->byte2)
937 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1115 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
938 1116
939 x += r->TermWin.fwidth; 1117 x += term->fwidth;
940 xc++; len--; 1118 xc++; len--;
941 } 1119 }
942 while (len); 1120 while (len);
943 } 1121 }
944 else 1122 else
945 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1123 XDrawString16 (disp, d, gc, x, y + base, xc, len);
946 } 1124 }
947 } 1125 }
948 else 1126 else
949 { 1127 {
950 const char *xc = enc_char (text, len, cs, slow); 1128 const char *xc = enc_char (text, len, cs, slow);
951 1129
952 if (bg == Color_bg && !slow) 1130 if (bg == Color_bg && !slow)
953 { 1131 {
954 v.background = r->pix_colors[bg]; 1132 v.background = term->pix_colors[bg];
955 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1133 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
956 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1134 XDrawImageString (disp, d, gc, x, y + base, xc, len);
957 } 1135 }
958 else 1136 else
959 { 1137 {
960 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);
961 1139
962 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1140 XChangeGC (disp, gc, GCForeground | GCFont, &v);
963 1141
964 if (slow) 1142 if (slow)
965 { 1143 {
966 do 1144 do
967 { 1145 {
968 if (*xc) 1146 if (*xc)
969 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1147 XDrawString (disp, d, gc, x, y + base, xc, 1);
970 1148
971 x += r->TermWin.fwidth; 1149 x += term->fwidth;
972 xc++; len--; 1150 xc++; len--;
973 } 1151 }
974 while (len); 1152 while (len);
975 } 1153 }
976 else 1154 else
977 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1155 XDrawString (disp, d, gc, x, y + base, xc, len);
978 } 1156 }
979 } 1157 }
980} 1158}
981 1159
982///////////////////////////////////////////////////////////////////////////// 1160/////////////////////////////////////////////////////////////////////////////
983 1161
984#if XFT 1162#if XFT
985 1163
986struct rxvt_font_xft : rxvt_font { 1164struct rxvt_font_xft : rxvt_font
1165{
987 rxvt_font_xft () { f = 0; } 1166 rxvt_font_xft ()
1167 {
1168 can_compose = true;
1169 f = 0;
1170 }
988 1171
989 void clear (); 1172 void clear ();
990 1173
991 rxvt_fontprop properties (); 1174 rxvt_fontprop properties ();
992 1175
993 bool load (const rxvt_fontprop &prop); 1176 bool load (const rxvt_fontprop &prop, bool force_prop);
994 1177
995 void draw (rxvt_drawable &d, int x, int y, 1178 void draw (rxvt_drawable &d, int x, int y,
996 const text_t *text, int len, 1179 const text_t *text, int len,
997 int fg, int bg); 1180 int fg, int bg);
998 1181
999 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;
1000 1183
1001protected: 1184protected:
1002 XftFont *f; 1185 XftFont *f;
1003}; 1186};
1004 1187
1005void 1188void
1006rxvt_font_xft::clear () 1189rxvt_font_xft::clear ()
1007{ 1190{
1008 if (f) 1191 if (f)
1009 { 1192 {
1010 XftFontClose (DISPLAY, f); 1193 XftFontClose (term->dpy, f);
1011 f = 0; 1194 f = 0;
1012 } 1195 }
1013} 1196}
1014 1197
1015rxvt_fontprop 1198rxvt_fontprop
… …
1019 1202
1020 FT_Face face = XftLockFace (f); 1203 FT_Face face = XftLockFace (f);
1021 1204
1022 p.width = width; 1205 p.width = width;
1023 p.height = height; 1206 p.height = height;
1207 p.ascent = ascent;
1024 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1208 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1025 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1209 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1026 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1210 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1027 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1211 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1028 1212
… …
1030 1214
1031 return p; 1215 return p;
1032} 1216}
1033 1217
1034bool 1218bool
1035rxvt_font_xft::load (const rxvt_fontprop &prop) 1219rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1036{ 1220{
1221 dTermDisplay;
1222
1037 clear (); 1223 clear ();
1038 1224
1039 FcPattern *p = FcNameParse ((FcChar8 *) name); 1225 FcPattern *p = FcNameParse ((FcChar8 *) name);
1040 1226
1041 if (!p) 1227 if (!p)
1042 return false; 1228 return false;
1043 1229
1044 FcValue v; 1230 FcValue v;
1045 1231
1046 if (prop.height != rxvt_fontprop::unset 1232 if (prop.height != rxvt_fontprop::unset
1047 && FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch) 1233 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1234 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1048 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1235 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1049 1236
1050 if (prop.weight != rxvt_fontprop::unset 1237 if (prop.weight != rxvt_fontprop::unset
1051 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1238 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1052 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1239 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1053 1240
1054 if (prop.slant != rxvt_fontprop::unset 1241 if (prop.slant != rxvt_fontprop::unset
1055 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1242 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1056 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1243 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1057 1244
1058#if 0 // clipping unfortunately destroys our precious double-width-characters 1245#if 0 // clipping unfortunately destroys our precious double-width-characters
1059 // clip width, we can't do better, or can we? 1246 // clip width, we can't do better, or can we?
1060 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1247 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1061 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1248 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1062#endif 1249#endif
1063 1250
1064 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1251 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1065 FcPatternAddBool (p, FC_MINSPACE, 1); 1252 FcPatternAddBool (p, FC_MINSPACE, 1);
1066 1253
1067 // store generated name so iso14755 view gives better results 1254 // store generated name so iso14755 view gives better results
1068 set_name ((char *)FcNameUnparse (p)); 1255 set_name ((char *)FcNameUnparse (p));
1069 1256
1070 XftResult result; 1257 XftResult result;
1071 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1258 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1072 1259
1073 FcPatternDestroy (p); 1260 FcPatternDestroy (p);
1074 1261
1075 if (!match) 1262 if (!match)
1076 return false; 1263 return false;
… …
1078 int ftheight = 0; 1265 int ftheight = 0;
1079 bool success = true; 1266 bool success = true;
1080 1267
1081 for (;;) 1268 for (;;)
1082 { 1269 {
1083 f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); 1270 p = FcPatternDuplicate (match);
1271 f = XftFontOpenPattern (disp, p);
1084 1272
1085 if (!f) 1273 if (!f)
1086 { 1274 {
1275 FcPatternDestroy (p);
1087 success = false; 1276 success = false;
1088 break; 1277 break;
1089 } 1278 }
1090 1279
1091 FT_Face face = XftLockFace (f); 1280 FT_Face face = XftLockFace (f);
… …
1097 1286
1098 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1287 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1099 1288
1100 XftUnlockFace (f); 1289 XftUnlockFace (f);
1101 1290
1102 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++)
1103 { 1294 {
1104 FcChar16 ch = *t; 1295 FcChar16 ch = *t;
1105 1296
1106 if (cs != CS_UNICODE 1297 if (cs != CS_UNICODE
1107 && ch > 0x100 1298 && ch > 0x100
… …
1112 bool careful; 1303 bool careful;
1113 if (!has_char (*t, &prop, careful)) 1304 if (!has_char (*t, &prop, careful))
1114 continue; 1305 continue;
1115 1306
1116 XGlyphInfo g; 1307 XGlyphInfo g;
1117 XftTextExtents16 (DISPLAY, f, &ch, 1, &g); 1308 XftTextExtents16 (disp, f, &ch, 1, &g);
1118 1309
1310 g.width -= g.x;
1311
1119 int wcw = wcwidth (ch); 1312 int wcw = WCWIDTH (ch);
1120 if (wcw > 0) g.width = g.width / wcw; 1313 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1121 1314
1122 if (width < g.width) width = g.width; 1315 if (width < g.width ) width = g.width;
1123 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;
1124 } 1329 }
1125 1330
1126 if (prop.height == rxvt_fontprop::unset 1331 if (prop.height == rxvt_fontprop::unset
1127 || height <= prop.height 1332 || (height <= prop.height && glheight <= prop.height)
1128 || height <= 2 1333 || height <= 2
1129 || !scalable) 1334 || !scalable)
1130 break; 1335 break;
1131 1336
1132 if (ftheight) 1337 if (ftheight)
… …
1139 ftheight -= height - prop.height; 1344 ftheight -= height - prop.height;
1140 } 1345 }
1141 else 1346 else
1142 ftheight = prop.height - 1; 1347 ftheight = prop.height - 1;
1143 1348
1144 XftFontClose (DISPLAY, f); 1349 XftFontClose (disp, f);
1145 FcPatternDel (match, FC_PIXEL_SIZE); 1350 FcPatternDel (match, FC_PIXEL_SIZE);
1146 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1351 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1147 } 1352 }
1148 1353
1149 FcPatternDestroy (match); 1354 FcPatternDestroy (match);
1150 1355
1151#if 0 // do it per-character 1356#if 0 // do it per-character
… …
1158 1363
1159 return success; 1364 return success;
1160} 1365}
1161 1366
1162bool 1367bool
1163rxvt_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
1164{ 1369{
1165 careful = false; 1370 careful = false;
1166 1371
1167 if (!XftCharExists (DISPLAY, f, unicode)) 1372 if (!XftCharExists (term->dpy, f, unicode))
1168 return false; 1373 return false;
1169 1374
1170 if (!prop || prop->width == rxvt_fontprop::unset) 1375 if (!prop || prop->width == rxvt_fontprop::unset)
1171 return true; 1376 return true;
1172 1377
1173 // check character against base font bounding box 1378 // check character against base font bounding box
1174 FcChar32 ch = unicode; 1379 FcChar32 ch = unicode;
1175 XGlyphInfo g; 1380 XGlyphInfo g;
1176 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1381 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1177 1382
1178 int w = g.width; 1383 int w = g.width - g.x;
1179 int wcw = wcwidth (unicode); 1384 int wcw = max (WCWIDTH (unicode), 1);
1180 if (wcw > 0) w /= wcw;
1181 1385
1182 careful = w > prop->width; 1386 careful = g.x > 0 || w > prop->width * wcw;
1183 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1387
1388 if (careful && !OVERLAP_OK (w, wcw, prop))
1389 return false;
1390
1391 // this weeds out _totally_ broken fonts, or glyphs
1392 if (!OVERLAP_OK (g.xOff, wcw, prop))
1184 return false; 1393 return false;
1185 1394
1186 return true; 1395 return true;
1187} 1396}
1188 1397
1189void 1398void
1190rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1399rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1191 const text_t *text, int len, 1400 const text_t *text, int len,
1192 int fg, int bg) 1401 int fg, int bg)
1193{ 1402{
1194 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
1195
1196 int base = ascent; // should be fbase, but that is incorrect
1197
1198 XGlyphInfo extents; 1403 XGlyphInfo extents;
1199 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1404 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1200 FcChar32 *ep = enc; 1405 XftGlyphSpec *ep = enc;
1201 int ewidth = 0; 1406
1202 int xoff = 0; 1407 dTermDisplay;
1408 dTermGC;
1409
1410 int w = term->fwidth * len;
1411 int h = term->fheight;
1412
1413 bool buffered = bg >= Color_transparent
1414 && term->option (Opt_buffered);
1415
1416 // cut trailing spaces
1417 while (len && text [len - 1] == ' ')
1418 len--;
1419
1420 int x_ = buffered ? 0 : x;
1421 int y_ = buffered ? 0 : y;
1203 1422
1204 while (len) 1423 while (len)
1205 { 1424 {
1206 int cwidth = r->TermWin.fwidth; 1425 int cwidth = term->fwidth;
1207 FcChar32 fc = *text++; len--; 1426 FcChar32 fc = *text++; len--;
1208 FT_UInt gl;
1209 1427
1210 while (len && *text == NOCHAR) 1428 while (len && *text == NOCHAR)
1211 text++, len--, cwidth += r->TermWin.fwidth; 1429 text++, len--, cwidth += term->fwidth;
1212
1213 gl = XftCharIndex (d.display->display, f, fc);
1214 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1215 1430
1216 if (extents.xOff != cwidth && ep != enc) 1431 if (fc != ' ') // skip spaces
1217 {
1218 if (xoff > ewidth) xoff = ewidth;
1219 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1220 x + (ewidth - xoff >> 1),
1221 y + base, enc, ep - enc);
1222 x += ewidth;
1223
1224 ep = enc;
1225 ewidth = 0;
1226 xoff = 0;
1227 } 1432 {
1433 FT_UInt glyph = XftCharIndex (disp, f, fc);
1434 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1228 1435
1229 if (fc == ' ' && ep == enc) // skip leading spaces 1436 ep->glyph = glyph;
1437 ep->x = x_ + (cwidth - extents.xOff >> 1);
1438 ep->y = y_ + ascent;
1439
1440 if (extents.xOff == 0)
1441 ep->x = x_ + cwidth;
1442
1443 ep++;
1230 { 1444 }
1445
1231 x += cwidth; 1446 x_ += cwidth;
1232 continue; 1447 }
1448
1449 if (buffered)
1450 {
1451 if (ep != enc)
1233 } 1452 {
1453 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1234 1454
1455#ifdef HAVE_IMG
1456 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1457
1458 if (term->bg_img
1459 && (bg == Color_transparent || bg == Color_bg
1460 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1461 {
1462 int src_x = x, src_y = y;
1463
1464 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1465 {
1466 src_x += term->window_vt_x;
1467 src_y += term->window_vt_y;
1468 }
1469
1470 if (term->bg_img->w >= src_x + w
1471 && term->bg_img->h >= src_y + h)
1472 {
1473 XCopyArea (disp, term->bg_img->pm, d2, gc,
1474 src_x, src_y, w, h, 0, 0);
1475 }
1476 else
1477 {
1478 XGCValues gcv;
1479
1480 gcv.fill_style = FillTiled;
1481 gcv.tile = term->bg_img->pm;
1482 gcv.ts_x_origin = -src_x;
1483 gcv.ts_y_origin = -src_y;
1484
1485 XChangeGC (disp, gc,
1486 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1487 &gcv);
1488
1489 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1490
1491 gcv.fill_style = FillSolid;
1492 XChangeGC (disp, gc, GCFillStyle, &gcv);
1493 }
1494
1495 if (dst)
1496 {
1497 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1498
1499 // dst can only be set when bg >= 0
1500 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1501 }
1502 }
1503 else
1504#endif
1505 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1506
1507 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1508 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1509 }
1235 else 1510 else
1236 { 1511 clear_rect (d, x, y, w, h, bg);
1237 *ep++ = gl;
1238 ewidth += cwidth;
1239 xoff += extents.xOff;
1240 }
1241 }
1242
1243 if (ep != enc)
1244 { 1512 }
1245 if (xoff > ewidth) xoff = ewidth; 1513 else
1246 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1247 x + (ewidth - xoff >> 1),
1248 y + base, enc, ep - enc);
1249 } 1514 {
1515 clear_rect (d, x, y, w, h, bg);
1516 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1517 }
1250} 1518}
1519
1251#endif 1520#endif
1252 1521
1253///////////////////////////////////////////////////////////////////////////// 1522/////////////////////////////////////////////////////////////////////////////
1254 1523
1255rxvt_fontset::rxvt_fontset (rxvt_t r) 1524rxvt_fontset::rxvt_fontset (rxvt_term *term)
1256: r (r), fontdesc (0) 1525: fontdesc (0), term (term)
1257{ 1526{
1258 clear (); 1527 clear ();
1259} 1528}
1260 1529
1261rxvt_fontset::~rxvt_fontset () 1530rxvt_fontset::~rxvt_fontset ()
… …
1264} 1533}
1265 1534
1266void 1535void
1267rxvt_fontset::clear () 1536rxvt_fontset::clear ()
1268{ 1537{
1538 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1539 = rxvt_fontprop::unset;
1540 force_prop = false;
1541
1269 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1542 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1270 FONT_UNREF (*i); 1543 (*i)->unref ();
1271 1544
1272 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1545 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1273 delete *p; 1546 delete *p;
1274 1547
1275 free (fontdesc); fontdesc = 0; 1548 free (fontdesc); fontdesc = 0;
… …
1277 fonts.clear (); 1550 fonts.clear ();
1278 1551
1279 fallback = fallback_fonts; 1552 fallback = fallback_fonts;
1280} 1553}
1281 1554
1555void
1556rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1557{
1558 font->set_term (term);
1559
1560 font->cs = cs;
1561 font->loaded = false;
1562}
1563
1282rxvt_font * 1564rxvt_font *
1283rxvt_fontset::new_font (const char *name, codeset cs) 1565rxvt_fontset::new_font (const char *name, codeset cs)
1284{ 1566{
1285 rxvt_font *f; 1567 rxvt_font *f;
1286 1568
1287 if (!name || !*name) 1569 if (!name || !*name)
1288 { 1570 {
1289 name = ""; 1571 name = "";
1290 f = new rxvt_font_default (this); 1572 f = new rxvt_font_default (this);
1291 } 1573 }
… …
1302 f = new rxvt_font_x11; 1584 f = new rxvt_font_x11;
1303 } 1585 }
1304 else 1586 else
1305 f = new rxvt_font_x11; 1587 f = new rxvt_font_x11;
1306 1588
1307 f->set_term (r);
1308 f->set_name (strdup (name)); 1589 f->set_name (strdup (name));
1309 1590 prepare_font (f, cs);
1310 f->cs = cs;
1311 f->loaded = false;
1312 1591
1313 return f; 1592 return f;
1314} 1593}
1315 1594
1316///////////////////////////////////////////////////////////////////////////// 1595/////////////////////////////////////////////////////////////////////////////
1596
1597void
1598rxvt_fontset::push_font (rxvt_font *font)
1599{
1600 // the fontCount index is reserved for the overflow font, it is only
1601 // necessary when we get fontCount or more fonts, as they cannot be
1602 // represented in the rendition.
1603 if (fonts.size () == fontCount)
1604 {
1605 rxvt_font *f = new rxvt_font_overflow (this);
1606
1607 prepare_font (f, CS_UNICODE);
1608 fonts.push_back (f);
1609 }
1610
1611 fonts.push_back (font);
1612}
1317 1613
1318void 1614void
1319rxvt_fontset::add_fonts (const char *desc) 1615rxvt_fontset::add_fonts (const char *desc)
1320{ 1616{
1321 if (desc) 1617 if (desc)
… …
1323 char buf[512]; 1619 char buf[512];
1324 const char *end; 1620 const char *end;
1325 1621
1326 do 1622 do
1327 { 1623 {
1328 while (*desc <= ' ') desc++; 1624 while (*desc && *desc <= ' ')
1625 desc++;
1329 1626
1330 codeset cs = CS_UNICODE; 1627 codeset cs = CS_UNICODE;
1331 1628
1332 if (*desc == '[') 1629 if (*desc == '[')
1333 { 1630 {
… …
1349 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1646 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1350 else 1647 else
1351 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1648 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1352 1649
1353 desc++; 1650 desc++;
1354 while (*desc <= ' ') desc++; 1651 while (*desc <= ' ' && *desc) desc++;
1355 } 1652 }
1356 1653
1357 end = strchr (desc, ','); 1654 end = strchr (desc, ',');
1358 if (!end) 1655 if (!end)
1359 end = desc + strlen (desc); 1656 end = desc + strlen (desc);
1360 1657
1361 if (end - desc < 511) 1658 if (end - desc < 511)
1362 { 1659 {
1363 strncpy (buf, desc, end - desc); 1660 memcpy (buf, desc, end - desc);
1364 buf[end - desc] = 0; 1661 buf[end - desc] = 0;
1365 1662
1366 fonts.push_back (new_font (buf, cs)); 1663 push_font (new_font (buf, cs));
1367 } 1664 }
1368 else 1665 else
1369 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1666 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1370 1667
1371 desc = end + 1; 1668 desc = end + 1;
1372 } 1669 }
1373 while (*end); 1670 while (*end);
1374 } 1671 }
… …
1383 if (fonts[i]->loaded) 1680 if (fonts[i]->loaded)
1384 return true; 1681 return true;
1385 1682
1386 fonts[i]->loaded = true; 1683 fonts[i]->loaded = true;
1387 1684
1388 if (!fonts[i]->load (prop)) 1685 if (!fonts[i]->load (prop, force_prop))
1389 { 1686 {
1390 fonts[i]->cs = CS_UNKNOWN; 1687 fonts[i]->cs = CS_UNKNOWN;
1391 return false; 1688 return false;
1392 } 1689 }
1393 1690
1394 return true; 1691 return true;
1395} 1692}
1396 1693
1397bool 1694bool
1398rxvt_fontset::populate (const char *desc, const rxvt_fontprop &prop) 1695rxvt_fontset::populate (const char *desc)
1399{ 1696{
1400 clear (); 1697 clear ();
1401 1698
1402 fontdesc = strdup (desc); 1699 fontdesc = strdup (desc);
1403 1700
1404 fonts.push_back (new_font (0, CS_UNICODE)); 1701 push_font (new_font (0, CS_UNICODE));
1405 realize_font (0); 1702 realize_font (0);
1406
1407 this->prop = prop;
1408 1703
1409 add_fonts (desc); 1704 add_fonts (desc);
1410 1705
1411 return true; 1706 return true;
1412} 1707}
… …
1420 1715
1421 return -1; 1716 return -1;
1422} 1717}
1423 1718
1424int 1719int
1425rxvt_fontset::find_font (unicode_t unicode) 1720rxvt_fontset::find_font_idx (unicode_t unicode)
1426{ 1721{
1427 if (unicode >= 1<<20) 1722 if (unicode >= 1<<20)
1428 return 0; 1723 return 0;
1429 1724
1430 unicode_t hi = unicode >> 8; 1725 unicode_t hi = unicode >> 8;
… …
1445 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1740 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1446 goto next_font; 1741 goto next_font;
1447 1742
1448 if (!realize_font (i)) 1743 if (!realize_font (i))
1449 goto next_font; 1744 goto next_font;
1745
1746 if (prop.ascent != rxvt_fontprop::unset)
1747 max_it (f->ascent, prop.ascent);
1450 } 1748 }
1451 1749
1452 if (f->cs == CS_UNKNOWN) 1750 if (f->cs == CS_UNKNOWN)
1453 goto next_font; 1751 goto next_font;
1454 1752
1455 bool careful; 1753 bool careful;
1456 if (f->has_char (unicode, &prop, careful)) 1754 if (f->has_char (unicode, &prop, careful))
1457 { 1755 {
1458 if (careful) 1756 i = (i << 1) | careful;
1459 i |= 128;
1460 1757
1461 goto found; 1758 goto found;
1462 } 1759 }
1463 1760
1464 next_font: 1761 next_font:
1465 if (i == fonts.size () - 1) 1762 if (i == fonts.size () - 1)
1466 { 1763 {
1467 if (fallback->name) 1764 if (fallback->name)
1468 { 1765 {
1469 // search through the fallback list 1766 // search through the fallback list
1470 fonts.push_back (new_font (fallback->name, fallback->cs)); 1767 push_font (new_font (fallback->name, fallback->cs));
1471 fallback++; 1768 fallback++;
1472 } 1769 }
1473 else 1770 else
1474 { 1771 {
1475 // try to find a new font. 1772 // try to find a new font.
… …
1477 // way to configure this and xft is easier to hack in, 1774 // way to configure this and xft is easier to hack in,
1478 // while x11 has more framework in place already. 1775 // while x11 has more framework in place already.
1479 // TODO: this is a real resource hog, xft takes ages(?) 1776 // TODO: this is a real resource hog, xft takes ages(?)
1480#if XFT && USE_SLOW_LOOKUP 1777#if XFT && USE_SLOW_LOOKUP
1481 // grab the first xft font that seems suitable 1778 // grab the first xft font that seems suitable
1779 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1482 FcPattern *p = FcPatternCreate (); 1780 FcPattern *p = FcPatternCreate ();
1483 1781
1484 FcCharSet *s = FcCharSetCreate (); 1782 FcCharSet *s = FcCharSetCreate ();
1485 FcCharSetAddChar (s, unicode); 1783 FcCharSetAddChar (s, unicode);
1486 FcPatternAddCharSet (p, FC_CHARSET, s); 1784 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1493 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1791 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1494 FcPatternAddBool (p, FC_MINSPACE, 1); 1792 FcPatternAddBool (p, FC_MINSPACE, 1);
1495 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1793 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1496 1794
1497 XftResult result; 1795 XftResult result;
1498 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1796 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1499 1797
1500 FcPatternDestroy (p); 1798 FcPatternDestroy (p);
1501 1799
1502 if (match) 1800 if (match)
1503 { 1801 {
… …
1506 FcPatternDestroy (match); 1804 FcPatternDestroy (match);
1507 1805
1508 if (find_font (font) < 0) 1806 if (find_font (font) < 0)
1509 { 1807 {
1510 char fontname[4096]; 1808 char fontname[4096];
1511 sprintf (fontname, "xft:%-.4090s", font); 1809 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1512 1810
1513 fonts.push_back (new_font (fontname, CS_UNICODE)); 1811 push_font (new_font (fontname, CS_UNICODE));
1514 } 1812 }
1515 1813
1516 free (font); 1814 free (font);
1517 } 1815 }
1518#endif 1816#endif
… …
1530 while (hi >= fmap.size ()) 1828 while (hi >= fmap.size ())
1531 fmap.push_back (0); 1829 fmap.push_back (0);
1532 1830
1533 if (!fmap[hi]) 1831 if (!fmap[hi])
1534 { 1832 {
1535 fmap[hi] = (pagemap *)new pagemap; 1833 fmap[hi] = new pagemap;
1536 memset (fmap[hi], 0xff, sizeof (pagemap)); 1834 memset (fmap[hi], 0xff, sizeof (pagemap));
1537 } 1835 }
1538 1836
1539 (*fmap[hi])[unicode & 0xff] = i; 1837 (*fmap[hi])[unicode & 0xff] = i;
1540 } 1838 }
1541 1839
1542 return i; 1840 return i;
1543} 1841}
1544 1842
1545
1546

Diff Legend

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