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

Diff Legend

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