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

Diff Legend

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