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.131 by root, Wed Jan 23 06:00:53 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#ifdef HAVE_BG_PIXMAP
243 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00)
244 {
245 Picture dst = XftDrawPicture (d);
246 if (dst != 0)
247 {
248 XClearArea (disp, d, x, y, w, h, false);
249 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
250 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
251 done = true;
252 }
253 }
254#endif
255 if (!done)
252 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
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 (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 (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;
460 } 484 }
461} 485}
462 486
463///////////////////////////////////////////////////////////////////////////// 487/////////////////////////////////////////////////////////////////////////////
464 488
… …
467 491
468 void clear (); 492 void clear ();
469 493
470 rxvt_fontprop properties (); 494 rxvt_fontprop properties ();
471 495
472 bool load (const rxvt_fontprop &prop); 496 bool load (const rxvt_fontprop &prop, bool force_prop);
473 497
474 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 498 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
475 499
476 void draw (rxvt_drawable &d, int x, int y, 500 void draw (rxvt_drawable &d, int x, int y,
477 const text_t *text, int len, 501 const text_t *text, int len,
478 int fg, int bg); 502 int fg, int bg);
479 503
480 bool slow; // wether this is a proportional font or has other funny characteristics 504 bool slow; // wether this is a proportional font or has other funny characteristics
481 XFontStruct *f; 505 XFontStruct *f;
482 codeset cs;
483 bool enc2b, encm; 506 bool enc2b, encm;
484 507
485 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 508 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); 509 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); 510 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
488 bool set_properties (rxvt_fontprop &p, const char *name); 511 bool set_properties (rxvt_fontprop &p, const char *name);
489}; 512};
490 513
491char * 514char *
492rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 515rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
493{ 516{
494 unsigned long value; 517 unsigned long value;
495 518
496 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 519 if (XGetFontProperty (f, property, &value))
497 return XGetAtomName (DISPLAY, value); 520 return XGetAtomName (term->dpy, value);
498 else 521 else
499 return rxvt_strdup (repl); 522 return repl ? strdup (repl) : 0;
500} 523}
501 524
502rxvt_fontprop 525rxvt_fontprop
503rxvt_font_x11::properties () 526rxvt_font_x11::properties ()
504{ 527{
… …
508} 531}
509 532
510bool 533bool
511rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 534rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
512{ 535{
513 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 536 p.width = width != rxvt_fontprop::unset ? width
537 : avgwidth ? (avgwidth + 1) / 10
538 : (height + 1) / 2;
514 p.height = height; 539 p.height = height;
540 p.ascent = rxvt_fontprop::unset;
515 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 541 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; 542 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
517 543
518 return true; 544 return true;
519} 545}
520 546
521bool 547bool
522rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 548rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
523{ 549{
524 unsigned long height; 550 unsigned long height;
551
552#if 0
525 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 553 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
526 return false; 554 return false;
555#else
556 height = f->ascent + f->descent;
557#endif
527 558
528 unsigned long avgwidth; 559 unsigned long avgwidth;
529 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 560 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
530 avgwidth = 0; 561 avgwidth = 0;
531 562
532 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 563 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
533 char *slant = get_property (f, "SLANT", "r"); 564 char *slant = get_property (f, term->xa [XA_SLANT], "r");
534 565
535 set_properties (p, height, weight, slant, avgwidth); 566 set_properties (p, height, weight, slant, avgwidth);
536 567
537 free (weight); 568 free (weight);
538 free (slant); 569 free (slant);
539 570
571 p.ascent = f->ascent;
572
540 return true; 573 return true;
541} 574}
542 575
543bool 576bool
544rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 577rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
545{ 578{
579 dTermDisplay;
546 int slashes = 0; 580 int slashes = 0;
547 const char *comp[13]; 581 const char *comp[13];
548 582
549 for (const char *c = name; *c; c++) 583 for (const char *c = name; *c; c++)
550 if (*c == '-') 584 if (*c == '-')
… …
558 if (slashes >= 13 592 if (slashes >= 13
559 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 593 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
560 && (*comp[11] >= '0' && *comp[11] <= '9')) 594 && (*comp[11] >= '0' && *comp[11] <= '9'))
561 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 595 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
562 596
563 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 597 XFontStruct *f = XLoadQueryFont (disp, name);
564 598
565 if (f) 599 if (f)
566 { 600 {
567 // the font should really exist now. if not, we have a problem 601 // 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). 602 // (e.g. if the user did xset fp rehash just when we were searching fonts).
569 // in that case, just return garbage. 603 // in that case, just return garbage.
570 bool ret = set_properties (p, f); 604 bool ret = set_properties (p, f);
571 XFreeFont (DISPLAY, f); 605 XFreeFont (disp, f);
572 return ret; 606 return ret;
573 } 607 }
574 else 608 else
575 return false; 609 return false;
576} 610}
577 611
578// fix the size of scalable fonts 612// fix the size of scalable fonts
579static bool 613static bool
580replace_field (char *buf, const char *name, int index, const char old, const char *replace) 614replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
581{ 615{
582 int slashes = 0; 616 int slashes = 0;
583 const char *field, *end; 617 const char *field, *end;
584 618
585 for (const char *c = name; *c; c++) 619 for (const char *c = name; *c; c++)
… …
595 break; 629 break;
596 } 630 }
597 631
598 if (slashes >= 13 && (!old || *field == old)) 632 if (slashes >= 13 && (!old || *field == old))
599 { 633 {
600 // TODO: check for overflow in font-name 634 size_t len = field - name;
601 strncpy (buf, name, field - name); 635 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
602 buf += field - name; 636 memcpy (*ptr, name, len);
603 strcpy (buf, replace); 637 strcpy (*ptr + len, replace);
604 strcat (buf, end); 638 strcat (*ptr, end);
605 639
606 return true; 640 return true;
607 } 641 }
608 else 642 else
609 { 643 {
610 strcpy (buf, name); 644 *ptr = strdup (name);
611 645
612 return false; 646 return false;
613 } 647 }
614} 648}
615 649
616bool 650bool
617rxvt_font_x11::load (const rxvt_fontprop &prop) 651rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
618{ 652{
653 dTermDisplay;
654
619 clear (); 655 clear ();
620 656
621 char field_str[64]; // enough for 128 bits 657 char field_str[64]; // enough for 128 bits
622 658
623 // first morph the font if required 659 // first morph the font if required
624 if (prop.weight != rxvt_fontprop::unset 660 if (force_prop)
625 || prop.slant != rxvt_fontprop::unset)
626 { 661 {
627 char fname[1024]; 662 char *fname;
628 663
629 if (name[0] != '-') 664 if (name[0] != '-')
630 { 665 {
631 f = XLoadQueryFont (DISPLAY, name); 666 f = XLoadQueryFont (disp, name);
632 667
633 if (!f) 668 if (!f)
634 return false; 669 return false;
635 670
636 char *new_name = get_property (f, "FONT", name); 671 char *new_name = get_property (f, XA_FONT, name);
637 672
638 if (new_name) 673 if (new_name)
639 set_name (new_name); 674 set_name (new_name);
640 else 675 else
641 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
642 677
643 XFreeFont (DISPLAY, f); 678 XFreeFont (disp, f);
644 f = 0; 679 f = 0;
645 } 680 }
646 681
647 if (prop.weight != rxvt_fontprop::unset) 682 if (prop.weight != rxvt_fontprop::unset)
648 { 683 {
649 replace_field (fname, name, 2, 0, 684 replace_field (&fname, name, 2, 0,
650 prop.weight < rxvt_fontprop::bold 685 prop.weight < rxvt_fontprop::bold
651 ? "medium" : "bold"); 686 ? "medium" : "bold");
652 set_name (strdup (fname)); 687 set_name (fname);
653 } 688 }
654 689
655 if (prop.slant != rxvt_fontprop::unset) 690 if (prop.slant != rxvt_fontprop::unset)
656 { 691 {
657 replace_field (fname, name, 3, 0, 692 replace_field (&fname, name, 3, 0,
658 prop.slant < rxvt_fontprop::italic 693 prop.slant < rxvt_fontprop::italic
659 ? "r" : "i"); // TODO: handle "o"blique, too 694 ? "r" : "i"); // TODO: handle "o"blique, too
660 set_name (strdup (fname)); 695 set_name (fname);
661 } 696 }
697 }
698
699 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
700 ? 0 : prop.height);
701
702 struct font_weight {
703 char *name;
704 int diff;
705
706 void clear ()
662 } 707 {
708 name = 0;
709 diff = 0x7fffffff;
710 }
711
712 font_weight () { clear (); }
713 ~font_weight () { free (name); }
714 };
663 715
664 char **list; 716 char **list;
665 int count; 717 int count;
666 list = XListFonts (DISPLAY, name, 1024, &count); 718 list = XListFonts (disp, name, 4000, &count);
667 719
668 set_name (0); 720 set_name (0);
669 721
670 if (!list) 722 if (!list)
671 return false; 723 return false;
672 724
673 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 725 font_weight *fonts = new font_weight[count];
674 ? 0 : prop.height);
675 726
676 int bestdiff = 0x7fffffff;
677 for (int i = 0; i < count; i++) 727 for (int i = 0; i < count; i++)
678 { 728 {
679 rxvt_fontprop p; 729 rxvt_fontprop p;
680 char fname[1024]; 730 char *fname;
681 731
682 int diff = 0; 732 int diff = 0;
683 733
684 if (replace_field (fname, list[i], 6, '0', field_str)) 734 if (replace_field (&fname, list[i], 6, '0', field_str))
685 diff += 10; // slightly penalize scalable fonts 735 diff += 10; // slightly penalize scalable fonts
736 else
737 {
738 free (fname);
739 if (replace_field (&fname, list[i], 11, '0', "0"))
740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 }
686 742
687 if (!set_properties (p, fname)) 743 if (!set_properties (p, fname))
688 continue; 744 continue;
689 745
690 if (prop.height != rxvt_fontprop::unset 746 if (prop.height != rxvt_fontprop::unset
… …
694 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 750 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); 751 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); 752 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); 753 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
698 754
699 if (!name // compare against best found so far 755 fonts[i].name = fname;
700 || diff < bestdiff) 756 fonts[i].diff = diff;
701 {
702 set_name (strdup (fname));
703 bestdiff = diff;
704 }
705 } 757 }
706 758
707 XFreeFontNames (list); 759 XFreeFontNames (list);
708 760
709 if (!name) 761 // this loop only iterates when the guessed font-size is too small
710 return false; 762 for (;;)
763 {
764 font_weight *best = fonts + count - 1;
711 765
712 f = XLoadQueryFont (DISPLAY, name); 766 for (font_weight *w = best; w-- > fonts; )
767 if (w->diff <= best->diff)
768 best = w;
769
770 if (!best->name
771 || !(f = XLoadQueryFont (disp, best->name)))
772 break;
773
774 set_name (best->name);
775 best->clear ();
776
777 ascent = f->ascent;
778 descent = f->descent;
779 height = ascent + descent;
780
781 if (prop.height == rxvt_fontprop::unset
782 || height <= prop.height)
783 break; // font is ready for use
784
785 // PIXEL_SIZE small enough, but real height too large
786 clear ();
787 }
788
789 delete [] fonts;
713 790
714 if (!f) 791 if (!f)
715 return false; 792 return false;
716 793
717 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
718 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
719 796
720 if (registry && encoding) 797 if (registry && encoding)
721 { 798 {
722 char charset[64]; 799 char charset[64];
723 snprintf (charset, 64, "%s-%s", registry, encoding); 800 snprintf (charset, 64, "%s-%s", registry, encoding);
724 801
725 cs = codeset_from_name (charset); 802 cs = codeset_from_name (charset);
726 } 803 }
727 else 804 else
728 { 805 {
729 const char *charset = get_property (f, "FONT", 0); 806 const char *charset = get_property (f, XA_FONT, 0);
730 807
731 if (!charset) 808 if (!charset)
732 charset = name; 809 charset = name;
733 810
734 int count = 13; 811 int count = 13;
… …
746 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 823 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
747 824
748 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 825 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
749 enc2b = encm || f->max_char_or_byte2 > 255; 826 enc2b = encm || f->max_char_or_byte2 > 255;
750 827
751 ascent = f->ascent;
752 descent = f->descent;
753 height = ascent + descent;
754
755 slow = false; 828 slow = false;
756 829
757#if 1 // only used for slow detection, TODO optimize 830#if 1 // only used for slow detection, TODO optimize
758 if (f->min_bounds.width == f->max_bounds.width) 831 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; 832 width = f->max_bounds.width;
762 else 833 else
763 { 834 {
764 slow = true; 835 slow = true;
765 836
766 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 837 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
767 838
768 if (encm) 839 if (encm)
769 N += (f->max_byte1 - f->min_byte1) 840 N += (f->max_byte1 - f->min_byte1)
770 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 841 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
771 842
772 while (N) 843 while (N)
773 { 844 {
774 if (f->per_char[N].width > width) 845 if (f->per_char[N].width > width)
775 width = f->per_char[N].width; 846 width = f->per_char[N].width;
776 847
… …
781 852
782 width = 1; 853 width = 1;
783 854
784 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 855 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
785 { 856 {
786 if (cs != CS_UNICODE
787 && *t > 0x100
788 && FROM_UNICODE (cs, *t) == NOCHAR) 857 if (FROM_UNICODE (cs, *t) == NOCHAR)
789 continue; 858 continue;
790 859
791 // ignore characters we wouldn't use anyways 860 // ignore characters we wouldn't use anyways
792 bool careful; 861 bool careful;
793 if (!has_char (*t, &prop, careful)) 862 if (!has_char (*t, &prop, careful))
… …
797 866
798 XCharStruct g; 867 XCharStruct g;
799 int dir_ret, asc_ret, des_ret; 868 int dir_ret, asc_ret, des_ret;
800 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 869 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
801 870
802 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 871 int wcw = WCWIDTH (*t);
872 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
803 873
804 if (width < g.width) width = g.width; 874 if (width < g.width) width = g.width;
805 } 875 }
806 876
807 if (cs == CS_UNKNOWN) 877 if (cs == CS_UNKNOWN)
808 { 878 {
809 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 879 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
826void 896void
827rxvt_font_x11::clear () 897rxvt_font_x11::clear ()
828{ 898{
829 if (f) 899 if (f)
830 { 900 {
831 XFreeFont (DISPLAY, f); 901 XFreeFont (term->dpy, f);
832 f = 0; 902 f = 0;
833 } 903 }
834} 904}
835 905
836bool 906bool
837rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 907rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
838{ 908{
839 uint32_t ch = FROM_UNICODE (cs, unicode); 909 uint32_t ch = FROM_UNICODE (cs, unicode);
840 910
841 if (ch == NOCHAR) 911 if (ch == NOCHAR)
842 return false; 912 return false;
… …
879 return false; 949 return false;
880 950
881 if (!prop || prop->width == rxvt_fontprop::unset) 951 if (!prop || prop->width == rxvt_fontprop::unset)
882 return true; 952 return true;
883 953
884 // check character against base font bounding box 954 // check wether character overlaps previous/next character
885 int w = xcs->width; 955 int w = xcs->rbearing - xcs->lbearing;
886 int wcw = wcwidth (unicode); 956 int wcw = max (WCWIDTH (unicode), 1);
887 if (wcw > 0) w /= wcw;
888 957
889 careful = w > prop->width; 958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
890 if (careful && w > prop->width * MAX_OVERLAP >> 2) 959
960 if (careful && !OVERLAP_OK (w, wcw, prop))
891 return false; 961 return false;
892 962
893 return true; 963 return true;
894} 964}
895 965
… …
901 // this looks like a mess /. 971 // this looks like a mess /.
902 // and it is a mess /. 972 // and it is a mess /.
903 // yet we are trying to be perfect /. 973 // yet we are trying to be perfect /.
904 // but the result still isn't perfect /. 974 // but the result still isn't perfect /.
905 975
976 dTermDisplay;
977 dTermGC;
978
906 bool slow = this->slow 979 bool slow = this->slow
907 || width != r->TermWin.fwidth 980 || width != term->fwidth
908 || height != r->TermWin.fheight; 981 || height != term->fheight;
909 982
910 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 983 int base = ascent; // sorry, incorrect: term->fbase;
911 984
912 XGCValues v; 985 XGCValues v;
913 v.foreground = r->pix_colors[fg]; 986 v.foreground = term->pix_colors[fg];
914 v.font = f->fid; 987 v.font = f->fid;
915 988
916 if (enc2b) 989 if (enc2b)
917 { 990 {
918 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 991 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
919 992
920 if (bg == Color_bg && !slow) 993 if (bg == Color_bg && !slow)
921 { 994 {
922 v.background = r->pix_colors[bg]; 995 v.background = term->pix_colors[bg];
923 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 996 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
924 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 997 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
925 } 998 }
926 else 999 else
927 { 1000 {
928 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1001 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
929 1002
930 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1003 XChangeGC (disp, gc, GCForeground | GCFont, &v);
931 1004
932 if (slow) 1005 if (slow)
933 { 1006 {
934 do 1007 do
935 { 1008 {
936 if (xc->byte1 || xc->byte2) 1009 if (xc->byte1 || xc->byte2)
937 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1010 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
938 1011
939 x += r->TermWin.fwidth; 1012 x += term->fwidth;
940 xc++; len--; 1013 xc++; len--;
941 } 1014 }
942 while (len); 1015 while (len);
943 } 1016 }
944 else 1017 else
945 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1018 XDrawString16 (disp, d, gc, x, y + base, xc, len);
946 } 1019 }
947 } 1020 }
948 else 1021 else
949 { 1022 {
950 const char *xc = enc_char (text, len, cs, slow); 1023 const char *xc = enc_char (text, len, cs, slow);
951 1024
952 if (bg == Color_bg && !slow) 1025 if (bg == Color_bg && !slow)
953 { 1026 {
954 v.background = r->pix_colors[bg]; 1027 v.background = term->pix_colors[bg];
955 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1028 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
956 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1029 XDrawImageString (disp, d, gc, x, y + base, xc, len);
957 } 1030 }
958 else 1031 else
959 { 1032 {
960 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1033 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
961 1034
962 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1035 XChangeGC (disp, gc, GCForeground | GCFont, &v);
963 1036
964 if (slow) 1037 if (slow)
965 { 1038 {
966 do 1039 do
967 { 1040 {
968 if (*xc) 1041 if (*xc)
969 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1042 XDrawString (disp, d, gc, x, y + base, xc, 1);
970 1043
971 x += r->TermWin.fwidth; 1044 x += term->fwidth;
972 xc++; len--; 1045 xc++; len--;
973 } 1046 }
974 while (len); 1047 while (len);
975 } 1048 }
976 else 1049 else
977 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1050 XDrawString (disp, d, gc, x, y + base, xc, len);
978 } 1051 }
979 } 1052 }
980} 1053}
981 1054
982///////////////////////////////////////////////////////////////////////////// 1055/////////////////////////////////////////////////////////////////////////////
… …
988 1061
989 void clear (); 1062 void clear ();
990 1063
991 rxvt_fontprop properties (); 1064 rxvt_fontprop properties ();
992 1065
993 bool load (const rxvt_fontprop &prop); 1066 bool load (const rxvt_fontprop &prop, bool force_prop);
994 1067
995 void draw (rxvt_drawable &d, int x, int y, 1068 void draw (rxvt_drawable &d, int x, int y,
996 const text_t *text, int len, 1069 const text_t *text, int len,
997 int fg, int bg); 1070 int fg, int bg);
998 1071
999 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1072 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1000 1073
1001protected: 1074protected:
1002 XftFont *f; 1075 XftFont *f;
1003}; 1076};
1004 1077
1005void 1078void
1006rxvt_font_xft::clear () 1079rxvt_font_xft::clear ()
1007{ 1080{
1008 if (f) 1081 if (f)
1009 { 1082 {
1010 XftFontClose (DISPLAY, f); 1083 XftFontClose (term->dpy, f);
1011 f = 0; 1084 f = 0;
1012 } 1085 }
1013} 1086}
1014 1087
1015rxvt_fontprop 1088rxvt_fontprop
… …
1019 1092
1020 FT_Face face = XftLockFace (f); 1093 FT_Face face = XftLockFace (f);
1021 1094
1022 p.width = width; 1095 p.width = width;
1023 p.height = height; 1096 p.height = height;
1097 p.ascent = ascent;
1024 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1098 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1025 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1099 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1026 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1100 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1027 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1101 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1028 1102
… …
1030 1104
1031 return p; 1105 return p;
1032} 1106}
1033 1107
1034bool 1108bool
1035rxvt_font_xft::load (const rxvt_fontprop &prop) 1109rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1036{ 1110{
1111 dTermDisplay;
1112
1037 clear (); 1113 clear ();
1038 1114
1039 FcPattern *p = FcNameParse ((FcChar8 *) name); 1115 FcPattern *p = FcNameParse ((FcChar8 *) name);
1040 1116
1041 if (!p) 1117 if (!p)
1042 return false; 1118 return false;
1043 1119
1044 FcValue v; 1120 FcValue v;
1045 1121
1046 if (prop.height != rxvt_fontprop::unset 1122 if (prop.height != rxvt_fontprop::unset
1047 && FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch) 1123 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1124 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1048 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1125 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1049 1126
1050 if (prop.weight != rxvt_fontprop::unset 1127 if (prop.weight != rxvt_fontprop::unset
1051 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1128 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1052 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1129 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1053 1130
1054 if (prop.slant != rxvt_fontprop::unset 1131 if (prop.slant != rxvt_fontprop::unset
1055 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1132 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1056 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1133 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1057 1134
1058#if 0 // clipping unfortunately destroys our precious double-width-characters 1135#if 0 // clipping unfortunately destroys our precious double-width-characters
1059 // clip width, we can't do better, or can we? 1136 // clip width, we can't do better, or can we?
1060 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1066 1143
1067 // store generated name so iso14755 view gives better results 1144 // store generated name so iso14755 view gives better results
1068 set_name ((char *)FcNameUnparse (p)); 1145 set_name ((char *)FcNameUnparse (p));
1069 1146
1070 XftResult result; 1147 XftResult result;
1071 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1148 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1072 1149
1073 FcPatternDestroy (p); 1150 FcPatternDestroy (p);
1074 1151
1075 if (!match) 1152 if (!match)
1076 return false; 1153 return false;
… …
1078 int ftheight = 0; 1155 int ftheight = 0;
1079 bool success = true; 1156 bool success = true;
1080 1157
1081 for (;;) 1158 for (;;)
1082 { 1159 {
1083 f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); 1160 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
1084 1161
1085 if (!f) 1162 if (!f)
1086 { 1163 {
1087 success = false; 1164 success = false;
1088 break; 1165 break;
… …
1097 1174
1098 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1175 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1099 1176
1100 XftUnlockFace (f); 1177 XftUnlockFace (f);
1101 1178
1179 int glheight = height;
1180
1102 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1181 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1103 { 1182 {
1104 FcChar16 ch = *t; 1183 FcChar16 ch = *t;
1105 1184
1106 if (cs != CS_UNICODE 1185 if (cs != CS_UNICODE
… …
1112 bool careful; 1191 bool careful;
1113 if (!has_char (*t, &prop, careful)) 1192 if (!has_char (*t, &prop, careful))
1114 continue; 1193 continue;
1115 1194
1116 XGlyphInfo g; 1195 XGlyphInfo g;
1117 XftTextExtents16 (DISPLAY, f, &ch, 1, &g); 1196 XftTextExtents16 (disp, f, &ch, 1, &g);
1118 1197
1198 g.width -= g.x;
1199
1119 int wcw = wcwidth (ch); 1200 int wcw = WCWIDTH (ch);
1120 if (wcw > 0) g.width = g.width / wcw; 1201 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1121 1202
1122 if (width < g.width) width = g.width; 1203 if (width < g.width ) width = g.width;
1123 if (height < g.height) height = g.height; 1204 if (height < g.height ) height = g.height;
1205 if (glheight < g.height - g.y) glheight = g.height - g.y;
1206 }
1207
1208 if (!width)
1209 {
1210 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1211
1212 XftFontClose (disp, f);
1213 f = 0;
1214
1215 success = false;
1216 break;
1124 } 1217 }
1125 1218
1126 if (prop.height == rxvt_fontprop::unset 1219 if (prop.height == rxvt_fontprop::unset
1127 || height <= prop.height 1220 || (height <= prop.height && glheight <= prop.height)
1128 || height <= 2 1221 || height <= 2
1129 || !scalable) 1222 || !scalable)
1130 break; 1223 break;
1131 1224
1132 if (ftheight) 1225 if (ftheight)
… …
1139 ftheight -= height - prop.height; 1232 ftheight -= height - prop.height;
1140 } 1233 }
1141 else 1234 else
1142 ftheight = prop.height - 1; 1235 ftheight = prop.height - 1;
1143 1236
1144 XftFontClose (DISPLAY, f); 1237 XftFontClose (disp, f);
1145 FcPatternDel (match, FC_PIXEL_SIZE); 1238 FcPatternDel (match, FC_PIXEL_SIZE);
1146 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1239 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1147 } 1240 }
1148 1241
1149 FcPatternDestroy (match); 1242 FcPatternDestroy (match);
1150 1243
1151#if 0 // do it per-character 1244#if 0 // do it per-character
… …
1158 1251
1159 return success; 1252 return success;
1160} 1253}
1161 1254
1162bool 1255bool
1163rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1256rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1164{ 1257{
1165 careful = false; 1258 careful = false;
1166 1259
1167 if (!XftCharExists (DISPLAY, f, unicode)) 1260 if (!XftCharExists (term->dpy, f, unicode))
1168 return false; 1261 return false;
1169 1262
1170 if (!prop || prop->width == rxvt_fontprop::unset) 1263 if (!prop || prop->width == rxvt_fontprop::unset)
1171 return true; 1264 return true;
1172 1265
1173 // check character against base font bounding box 1266 // check character against base font bounding box
1174 FcChar32 ch = unicode; 1267 FcChar32 ch = unicode;
1175 XGlyphInfo g; 1268 XGlyphInfo g;
1176 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1269 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1177 1270
1178 int w = g.width; 1271 int w = g.width - g.x;
1179 int wcw = wcwidth (unicode); 1272 int wcw = max (WCWIDTH (unicode), 1);
1180 if (wcw > 0) w /= wcw;
1181 1273
1182 careful = w > prop->width; 1274 careful = g.x > 0 || w > prop->width * wcw;
1183 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1275
1276 if (careful && !OVERLAP_OK (w, wcw, prop))
1277 return false;
1278
1279 // this weeds out _totally_ broken fonts, or glyphs
1280 if (!OVERLAP_OK (g.xOff, wcw, prop))
1184 return false; 1281 return false;
1185 1282
1186 return true; 1283 return true;
1187} 1284}
1188 1285
1189void 1286void
1190rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1191 const text_t *text, int len, 1288 const text_t *text, int len,
1192 int fg, int bg) 1289 int fg, int bg)
1193{ 1290{
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; 1291 XGlyphInfo extents;
1199 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1200 FcChar32 *ep = enc; 1293 XftGlyphSpec *ep = enc;
1201 int ewidth = 0; 1294
1202 int xoff = 0; 1295 dTermDisplay;
1296 dTermGC;
1297
1298 int w = term->fwidth * len;
1299 int h = term->fheight;
1300
1301 /*
1302 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1303 * good idea from the perspective of packaging for wide variety of user configs.
1304 */
1305 bool buffered = bg >= Color_transparent;
1306#ifdef FORCE_UNBUFFERED_XFT
1307 buffered = false;
1308#endif
1309
1310 // cut trailing spaces
1311 while (len && text [len - 1] == ' ')
1312 len--;
1313
1314 int x_ = buffered ? 0 : x;
1315 int y_ = buffered ? 0 : y;
1203 1316
1204 while (len) 1317 while (len)
1205 { 1318 {
1206 int cwidth = r->TermWin.fwidth; 1319 int cwidth = term->fwidth;
1207 FcChar32 fc = *text++; len--; 1320 FcChar32 fc = *text++; len--;
1208 FT_UInt gl;
1209 1321
1210 while (len && *text == NOCHAR) 1322 while (len && *text == NOCHAR)
1211 text++, len--, cwidth += r->TermWin.fwidth; 1323 text++, len--, cwidth += term->fwidth;
1212
1213 gl = XftCharIndex (d.display->display, f, fc);
1214 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1215 1324
1216 if (extents.xOff != cwidth && ep != enc) 1325 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 } 1326 {
1327 FT_UInt glyph = XftCharIndex (disp, f, fc);
1328 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1228 1329
1229 if (fc == ' ' && ep == enc) // skip leading spaces 1330 ep->glyph = glyph;
1331 ep->x = x_ + (cwidth - extents.xOff >> 1);
1332 ep->y = y_ + ascent;
1333
1334 if (extents.xOff == 0)
1335 ep->x = x_ + cwidth;
1336
1337 ep++;
1230 { 1338 }
1339
1231 x += cwidth; 1340 x_ += cwidth;
1232 continue; 1341 }
1342
1343 if (buffered)
1344 {
1345 if (ep != enc)
1233 } 1346 {
1347 bool back_rendered = false;
1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1234 1349
1350#ifdef HAVE_BG_PIXMAP
1351 if (term->bgPixmap.pixmap)
1352 {
1353 Picture dst = 0;
1354
1355 if (bg >= 0 && term->pix_colors[bg].is_opaque ())
1356 dst = XftDrawPicture (d2);
1357
1358 if (dst)
1359 {
1360 int src_x = x, src_y = y;
1361
1362 if (term->bgPixmap.is_parentOrigin ())
1363 {
1364 src_x += term->window_vt_x;
1365 src_y += term->window_vt_y;
1366 }
1367
1368 if (term->bgPixmap.pmap_width >= src_x+w
1369 && term->bgPixmap.pmap_height >= src_y+h)
1370 {
1371 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1372 src_x, src_y, w, h, 0, 0);
1373 }
1374 else
1375 {
1376 XGCValues gcv;
1377
1378 gcv.fill_style = FillTiled;
1379 gcv.tile = term->bgPixmap.pixmap;
1380 gcv.ts_x_origin = -src_x;
1381 gcv.ts_y_origin = -src_y;
1382
1383 XChangeGC (disp, gc,
1384 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1385 &gcv);
1386
1387 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1388
1389 gcv.fill_style = FillSolid;
1390 XChangeGC (disp, gc, GCFillStyle, &gcv);
1391 }
1392
1393 if (bg >= 0)
1394 {
1395 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1396 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1397 }
1398
1399 back_rendered = true;
1400 }
1401 }
1402#endif
1403
1404 if (!back_rendered)
1405 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h);
1406
1407 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1408 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1409 }
1235 else 1410 else
1236 { 1411 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 { 1412 }
1245 if (xoff > ewidth) xoff = ewidth; 1413 else
1246 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1247 x + (ewidth - xoff >> 1),
1248 y + base, enc, ep - enc);
1249 } 1414 {
1415 clear_rect (d, x, y, w, h, bg);
1416 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1417 }
1250} 1418}
1419
1251#endif 1420#endif
1252 1421
1253///////////////////////////////////////////////////////////////////////////// 1422/////////////////////////////////////////////////////////////////////////////
1254 1423
1255rxvt_fontset::rxvt_fontset (rxvt_t r) 1424rxvt_fontset::rxvt_fontset (rxvt_term *term)
1256: r (r), fontdesc (0) 1425: fontdesc (0), term (term)
1257{ 1426{
1258 clear (); 1427 clear ();
1259} 1428}
1260 1429
1261rxvt_fontset::~rxvt_fontset () 1430rxvt_fontset::~rxvt_fontset ()
… …
1264} 1433}
1265 1434
1266void 1435void
1267rxvt_fontset::clear () 1436rxvt_fontset::clear ()
1268{ 1437{
1438 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1439 = rxvt_fontprop::unset;
1440 force_prop = false;
1441
1269 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1442 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1270 FONT_UNREF (*i); 1443 FONT_UNREF (*i);
1271 1444
1272 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1445 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1273 delete *p; 1446 delete *p;
… …
1281 1454
1282rxvt_font * 1455rxvt_font *
1283rxvt_fontset::new_font (const char *name, codeset cs) 1456rxvt_fontset::new_font (const char *name, codeset cs)
1284{ 1457{
1285 rxvt_font *f; 1458 rxvt_font *f;
1286 1459
1287 if (!name || !*name) 1460 if (!name || !*name)
1288 { 1461 {
1289 name = ""; 1462 name = "";
1290 f = new rxvt_font_default (this); 1463 f = new rxvt_font_default (this);
1291 } 1464 }
… …
1302 f = new rxvt_font_x11; 1475 f = new rxvt_font_x11;
1303 } 1476 }
1304 else 1477 else
1305 f = new rxvt_font_x11; 1478 f = new rxvt_font_x11;
1306 1479
1307 f->set_term (r); 1480 f->set_term (term);
1308 f->set_name (strdup (name)); 1481 f->set_name (strdup (name));
1309 1482
1310 f->cs = cs; 1483 f->cs = cs;
1311 f->loaded = false; 1484 f->loaded = false;
1312 1485
… …
1323 char buf[512]; 1496 char buf[512];
1324 const char *end; 1497 const char *end;
1325 1498
1326 do 1499 do
1327 { 1500 {
1328 while (*desc <= ' ') desc++; 1501 while (*desc && *desc <= ' ')
1502 desc++;
1329 1503
1330 codeset cs = CS_UNICODE; 1504 codeset cs = CS_UNICODE;
1331 1505
1332 if (*desc == '[') 1506 if (*desc == '[')
1333 { 1507 {
… …
1358 if (!end) 1532 if (!end)
1359 end = desc + strlen (desc); 1533 end = desc + strlen (desc);
1360 1534
1361 if (end - desc < 511) 1535 if (end - desc < 511)
1362 { 1536 {
1363 strncpy (buf, desc, end - desc); 1537 memcpy (buf, desc, end - desc);
1364 buf[end - desc] = 0; 1538 buf[end - desc] = 0;
1365 1539
1366 fonts.push_back (new_font (buf, cs)); 1540 fonts.push_back (new_font (buf, cs));
1367 } 1541 }
1368 else 1542 else
… …
1383 if (fonts[i]->loaded) 1557 if (fonts[i]->loaded)
1384 return true; 1558 return true;
1385 1559
1386 fonts[i]->loaded = true; 1560 fonts[i]->loaded = true;
1387 1561
1388 if (!fonts[i]->load (prop)) 1562 if (!fonts[i]->load (prop, force_prop))
1389 { 1563 {
1390 fonts[i]->cs = CS_UNKNOWN; 1564 fonts[i]->cs = CS_UNKNOWN;
1391 return false; 1565 return false;
1392 } 1566 }
1393 1567
1394 return true; 1568 return true;
1395} 1569}
1396 1570
1397bool 1571bool
1398rxvt_fontset::populate (const char *desc, const rxvt_fontprop &prop) 1572rxvt_fontset::populate (const char *desc)
1399{ 1573{
1400 clear (); 1574 clear ();
1401 1575
1402 fontdesc = strdup (desc); 1576 fontdesc = strdup (desc);
1403 1577
1404 fonts.push_back (new_font (0, CS_UNICODE)); 1578 fonts.push_back (new_font (0, CS_UNICODE));
1405 realize_font (0); 1579 realize_font (0);
1406
1407 this->prop = prop;
1408 1580
1409 add_fonts (desc); 1581 add_fonts (desc);
1410 1582
1411 return true; 1583 return true;
1412} 1584}
… …
1445 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1617 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1446 goto next_font; 1618 goto next_font;
1447 1619
1448 if (!realize_font (i)) 1620 if (!realize_font (i))
1449 goto next_font; 1621 goto next_font;
1622
1623 if (prop.ascent != rxvt_fontprop::unset)
1624 max_it (f->ascent, prop.ascent);
1450 } 1625 }
1451 1626
1452 if (f->cs == CS_UNKNOWN) 1627 if (f->cs == CS_UNKNOWN)
1453 goto next_font; 1628 goto next_font;
1454 1629
… …
1493 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1668 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1494 FcPatternAddBool (p, FC_MINSPACE, 1); 1669 FcPatternAddBool (p, FC_MINSPACE, 1);
1495 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1670 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1496 1671
1497 XftResult result; 1672 XftResult result;
1498 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1673 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1499 1674
1500 FcPatternDestroy (p); 1675 FcPatternDestroy (p);
1501 1676
1502 if (match) 1677 if (match)
1503 { 1678 {
… …
1508 if (find_font (font) < 0) 1683 if (find_font (font) < 0)
1509 { 1684 {
1510 char fontname[4096]; 1685 char fontname[4096];
1511 sprintf (fontname, "xft:%-.4090s", font); 1686 sprintf (fontname, "xft:%-.4090s", font);
1512 1687
1513 fonts.push_back (new_font (fontname, CS_UNICODE)); 1688 fonts.push_back (new_font (fontname, CS_UNICODE));
1514 } 1689 }
1515 1690
1516 free (font); 1691 free (font);
1517 } 1692 }
1518#endif 1693#endif

Diff Legend

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