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

Diff Legend

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