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

Diff Legend

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