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.93 by root, Tue Jan 31 00:25:16 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
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 "rxvtlib.h"
24#include "rxvtutil.h" 25#include "rxvtutil.h"
25#include "rxvtfont.h" 26#include "rxvtfont.h"
26 27
27#include <cstdlib> 28#include <cstdlib>
28#include <wchar.h> 29
29#include <inttypes.h> 30#include <inttypes.h>
30 31
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 32#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
33#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34
35#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36 (prop)->slant >= rxvt_fontprop::italic \
37 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 ))
35 40
36const struct rxvt_fallback_font { 41const struct rxvt_fallback_font {
37 codeset cs; 42 codeset cs;
38 const char *name; 43 const char *name;
39} fallback_fonts[] = { 44} fallback_fonts[] = {
… …
59 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 64 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
60 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
61 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
62 67
63# if XFT 68# if XFT
64 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 69 { CS_KOI8_U, "xft::lang=ru" },
65 70
66 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 71 { CS_ISO8859_5, "xft::lang=ru" },
67 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 72 { CS_ISO8859_6, "xft::lang=ar" },
68 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 73 { CS_ISO8859_7, "xft::lang=el" },
69 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 74 { CS_ISO8859_8, "xft::lang=he" },
70 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 75 { CS_ISO8859_9, "xft::lang=tr" },
71 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 76 { CS_ISO8859_10, "xft::lang=se" },
72 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 77 { CS_ISO8859_11, "xft::lang=th" },
73# endif 78# endif
74#endif 79#endif
75 80
76 // japanese 81 // japanese
77#if ENCODING_JP || ENCODING_JP_EXT 82#if ENCODING_JP || ENCODING_JP_EXT
78# if XFT 83# if XFT
79 // prefer xft for complex scripts 84 // prefer xft for complex scripts
80 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
81 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, 86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
82 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
83 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
84# endif 89# endif
85 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
86 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
87 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 92 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
88 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
89 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
90 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 95 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
91#endif 96#endif
92 97
93#if ENCODING_CN || ENCODING_CN_EXT 98#if ENCODING_ZH || ENCODING_ZH_EXT
94# if XFT 99# if XFT
100 { CS_GBK_0, "xft:AR PL KaitiM GB" },
101 { CS_GBK_0, "xft:AR PL SungtiL GB" },
102 { CS_GBK_0, "xft::lang=zh" },
95 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
96 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 104 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
97 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
98 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 106 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
99 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 107 { CS_GB2312_1980_0, "xft::lang=zh" },
100# endif 108# endif
109 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
101 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 110 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
102 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 111 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
103 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 112 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
113 { CS_GB2312_1980_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
104 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, 114 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
105 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, 115 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
106 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, 116 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
107 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, 117 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
108 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, 118 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
… …
115#if ENCODING_KR 125#if ENCODING_KR
116 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 126 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
117 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 127 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
118# if XFT 128# if XFT
119 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
120 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
121# endif 131# endif
122#endif 132#endif
123 133
124 // generic font fallback
125 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 134 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
126 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 135 //{ 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 136#if XFT
130 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false"}, 137 { 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" }, 138 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
140 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
134 141
135 // FreeMono is usually uglier than x fonts, so try last only. 142 // FreeMono is usually uglier than x fonts, so try after the others
136 { CS_UNICODE, "xft:FreeMono" }, 143 { CS_UNICODE, "xft:FreeMono:autohint=true" },
137#endif 144#endif
138 145
146 // generic font fallback, put this last, as many iso10646 fonts have extents
147 // specified for all glyphs in the range they cover, but most are simply empty
148 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
149 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
139 { CS_UNKNOWN, 0 } 150 { CS_UNKNOWN, 0 }
140}; 151};
141 152
142// these characters are used to guess the font height and width 153// these characters are used to guess the font height and width
143// pango uses a similar algorithm and eosn't trust the font either. 154// pango uses a similar algorithm and doesn't trust the font either.
144static uint16_t extent_test_chars[] = { 155static uint16_t extent_test_chars[] = {
145 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 156 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
146 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 157 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
147 0x304c, 0x672c, // が本 158 0x304c, 0x672c, // が本
148}; 159};
149 160
150#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 161#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
151 162
163#define dTermDisplay Display *disp = term->xdisp
164#define dTermGC GC gc = term->gc
165
152///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
153 167
154#if XFT 168#if XFT
155rxvt_drawable::~rxvt_drawable () 169rxvt_drawable::~rxvt_drawable ()
156{ 170{
… …
159} 173}
160 174
161rxvt_drawable::operator XftDraw *() 175rxvt_drawable::operator XftDraw *()
162{ 176{
163 if (!xftdrawable) 177 if (!xftdrawable)
164 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); 178 xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
165 179
166 return xftdrawable; 180 return xftdrawable;
167} 181}
168#endif 182#endif
169 183
170///////////////////////////////////////////////////////////////////////////// 184/////////////////////////////////////////////////////////////////////////////
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 185
188static const char * 186static const char *
189enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 187enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
190{ 188{
191 uint8_t *buf = (uint8_t *)get_enc_buf (len); 189 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
190 uint8_t *res = buf;
192 191
193 while (len--) 192 while (len--)
194 { 193 {
195 uint32_t c = FROM_UNICODE (cs, *text++); 194 uint32_t c = FROM_UNICODE (cs, *text++);
196 195
… …
201 } 200 }
202 201
203 *buf++ = c; 202 *buf++ = c;
204 } 203 }
205 204
206 return (const char *)enc_buf; 205 return (const char *)res;
207} 206}
208 207
209static const XChar2b * 208static const XChar2b *
210enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 209enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
211{ 210{
212 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 211 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
212 XChar2b *res = buf;
213 213
214 while (len--) 214 while (len--)
215 { 215 {
216 uint32_t c = FROM_UNICODE (cs, *text++); 216 uint32_t c = FROM_UNICODE (cs, *text++);
217 217
… …
224 buf->byte1 = c >> 8; 224 buf->byte1 = c >> 8;
225 buf->byte2 = c; 225 buf->byte2 = c;
226 buf++; 226 buf++;
227 } 227 }
228 228
229 return (XChar2b *)enc_buf; 229 return res;
230} 230}
231 231
232///////////////////////////////////////////////////////////////////////////// 232/////////////////////////////////////////////////////////////////////////////
233
234rxvt_font::rxvt_font ()
235: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
236{
237}
233 238
234void 239void
235rxvt_font::set_name (char *name) 240rxvt_font::set_name (char *name)
236{ 241{
237 if (this->name == name) 242 if (this->name == name)
… …
240 if (this->name) free (this->name); // let the compiler optimize 245 if (this->name) free (this->name); // let the compiler optimize
241 this->name = name; 246 this->name = name;
242} 247}
243 248
244void 249void
245rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) 250rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
246{ 251{
252 dTermDisplay;
253 dTermGC;
254
247 if (color == Color_bg) 255 if (color == Color_bg)
248 XClearArea (d.display->display, d, x, y, w, h, FALSE); 256 XClearArea (disp, d, x, y, w, h, false);
249 else if (color >= 0) 257 else if (color >= 0)
250 { 258 {
251#if XFT 259#if XFT
252 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 260 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
253#else 261#else
254 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 262 XSetForeground (disp, gc, term->pix_colors[color]);
255 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 263 XFillRectangle (disp, d, gc, x, y, w, h);
256#endif 264#endif
257 } 265 }
258} 266}
267
268/////////////////////////////////////////////////////////////////////////////
259 269
260#include "table/linedraw.h" 270#include "table/linedraw.h"
261 271
262struct rxvt_font_default : rxvt_font { 272struct rxvt_font_default : rxvt_font {
263 struct rxvt_fontset *fs; 273 struct rxvt_fontset *fs;
… …
271 rxvt_fontprop properties () 281 rxvt_fontprop properties ()
272 { 282 {
273 rxvt_fontprop p; 283 rxvt_fontprop p;
274 284
275 p.width = p.height = 1; 285 p.width = p.height = 1;
286 p.ascent = rxvt_fontprop::unset;
276 p.weight = rxvt_fontprop::medium; 287 p.weight = rxvt_fontprop::medium;
277 p.slant = rxvt_fontprop::roman; 288 p.slant = rxvt_fontprop::roman;
278 289
279 return p; 290 return p;
280 } 291 }
… …
287 set_name (strdup ("built-in support font")); 298 set_name (strdup ("built-in support font"));
288 299
289 return true; 300 return true;
290 } 301 }
291 302
292 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 303 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
293 { 304 {
294 careful = false; 305 careful = false;
295 306
296 if (unicode <= 0x001f) 307 if (unicode <= 0x001f)
297 return true; 308 return true;
… …
300 return false; 311 return false;
301 312
302 if (unicode <= 0x009f) 313 if (unicode <= 0x009f)
303 return true; 314 return true;
304 315
305 if (unicode >= 0x2500 && unicode <= 0x259f) 316 if (unicode >= 0x2500 && unicode <= 0x259f &&
317 !term->option (Opt_skipBuiltinGlyphs))
306 return true; 318 return true;
307 319
308 if (IS_COMPOSE (unicode)) 320 if (IS_COMPOSE (unicode))
309 return true; 321 return true;
310 322
… …
326void 338void
327rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 339rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
328 const text_t *text, int len, 340 const text_t *text, int len,
329 int fg, int bg) 341 int fg, int bg)
330{ 342{
343 dTermDisplay;
344 dTermGC;
345
331 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 346 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
332 347
333 XSetForeground (d.display->display, TGC, r->pix_colors[fg]); 348 XSetForeground (disp, gc, term->pix_colors[fg]);
334 349
335 while (len--) 350 while (len)
336 { 351 {
337#if ENABLE_COMBINING 352#if ENABLE_COMBINING
338 compose_char *cc; 353 compose_char *cc;
339#endif 354#endif
355 const text_t *tp = text;
340 text_t t = *text++; 356 text_t t = *tp;
357
358 while (++text, --len && *text == NOCHAR)
359 ;
360
361 int width = text - tp;
362 int fwidth = term->fwidth * width;
341 363
342 if (0x2500 <= t && t <= 0x259f) 364 if (0x2500 <= t && t <= 0x259f)
343 { 365 {
344 uint16_t offs = linedraw_offs[t - 0x2500]; 366 uint16_t offs = linedraw_offs[t - 0x2500];
345 uint32_t *a = linedraw_command + (offs >> 4); 367 uint32_t *a = linedraw_command + (offs >> 4);
346 uint32_t *b = a + (offs & 15); 368 uint32_t *b = a + (offs & 15);
347 369
348 int W = r->TermWin.fwidth; 370 int W = fwidth;
349 int H = r->TermWin.fheight; 371 int H = term->fheight;
350 372
351 int x_[16]; 373 int x_[16];
352 int y_[16]; 374 int y_[16];
353 375
354 for (int i = 0; i <= 8; i++) 376 for (int i = 0; i <= 8; i++)
… …
362 384
363 XGCValues gcv; 385 XGCValues gcv;
364 386
365 gcv.cap_style = CapButt; 387 gcv.cap_style = CapButt;
366 gcv.line_width = 0; 388 gcv.line_width = 0;
367 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 389 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
368 390
369 while (a < b) 391 while (a < b)
370 { 392 {
371 uint32_t command = *a++; 393 uint32_t command = *a++;
372 394
… …
379 int y2 = y_[(command >> 0) & 15]; 401 int y2 = y_[(command >> 0) & 15];
380 402
381 switch (op) 403 switch (op)
382 { 404 {
383 case 0: // line 405 case 0: // line
384 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 406 XDrawLine (disp, d, gc, x1, y1, x2, y2);
385 break; 407 break;
386 408
387 case 1: // rectangle, possibly stippled 409 case 1: // rectangle, possibly stippled
388 if (a) 410 if (a)
389 { 411 {
390 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
391 413
392 gcv.fill_style = FillStippled; 414 gcv.fill_style = FillStippled;
393 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
394 gcv.ts_x_origin = x; 416 gcv.ts_x_origin = x;
395 gcv.ts_y_origin = y; 417 gcv.ts_y_origin = y;
396 418
397 XChangeGC (d.display->display, TGC, 419 XChangeGC (disp, gc,
398 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 420 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
399 &gcv); 421 &gcv);
400 } 422 }
401 423
402 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 424 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
403 425
404 if (a) 426 if (a)
405 { 427 {
406 XFreePixmap (d.display->display, gcv.stipple); 428 XFreePixmap (disp, gcv.stipple);
407 gcv.stipple = 0; 429 gcv.stipple = 0;
408 gcv.fill_style = FillSolid; 430 gcv.fill_style = FillSolid;
409 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 431 XChangeGC (disp, gc, GCFillStyle, &gcv);
410 } 432 }
411 break; 433 break;
412 case 2: // arc 434 case 2: // arc
413 XDrawArc (d.display->display, d, TGC, 435 XDrawArc (disp, d, gc,
414 x1 - W/2, y1 - H/2, W-1, H-1, 436 x1 - W/2, y1 - H/2, W-1, H-1,
415 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
416 break; 438 break;
417 } 439 }
418 } 440 }
419 } 441 }
420#if ENABLE_COMBINING 442#if ENABLE_COMBINING
421 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 443 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
422 { 444 {
445 min_it (width, 2); // we only support wcwidth up to 2
446
447 text_t chrs[2];
448 chrs [1] = NOCHAR;
449
450 *chrs = cc->c1;
423 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 451 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
424 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); 452 f1->draw (d, x, y, chrs, width, fg, bg);
453
425 if (cc->c2 != NOCHAR) 454 if (cc->c2 != NOCHAR)
426 { 455 {
456 bool careful;
457
427 // prefer font of first character, for no good reasons 458 // prefer font of first character, for no good reasons
428 bool careful; 459 *chrs = cc->c2;
429 rxvt_font *f2 = f1->has_char (cc->c2, 0, careful) 460 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
430 ? f1 461 ? f1
431 : (*fs)[fs->find_font (cc->c2)]; 462 : (*fs)[fs->find_font (cc->c2)];
432 463
433 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); 464 f2->draw (d, x, y, chrs, width, fg, -1);
434 } 465 }
435 } 466 }
436#endif 467#endif
437 else 468 else
438 switch (t) 469 switch (t)
… …
441 case ZERO_WIDTH_CHAR: 472 case ZERO_WIDTH_CHAR:
442 case NOCHAR: 473 case NOCHAR:
443 break; 474 break;
444 475
445 default: 476 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, 477 XDrawRectangle (disp, d, gc, x + 2, y + 2,
455 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); 478 fwidth - 4, term->fheight - 4);
456 x += w;
457 } 479 }
458 480
459 x += r->TermWin.fwidth; 481 x += fwidth;
460 } 482 }
461} 483}
462 484
463///////////////////////////////////////////////////////////////////////////// 485/////////////////////////////////////////////////////////////////////////////
464 486
… …
469 491
470 rxvt_fontprop properties (); 492 rxvt_fontprop properties ();
471 493
472 bool load (const rxvt_fontprop &prop); 494 bool load (const rxvt_fontprop &prop);
473 495
474 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 496 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
475 497
476 void draw (rxvt_drawable &d, int x, int y, 498 void draw (rxvt_drawable &d, int x, int y,
477 const text_t *text, int len, 499 const text_t *text, int len,
478 int fg, int bg); 500 int fg, int bg);
479 501
480 bool slow; // wether this is a proportional font or has other funny characteristics 502 bool slow; // wether this is a proportional font or has other funny characteristics
481 XFontStruct *f; 503 XFontStruct *f;
482 codeset cs; 504 codeset cs;
483 bool enc2b, encm; 505 bool enc2b, encm;
484 506
485 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 507 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); 508 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); 509 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
488 bool set_properties (rxvt_fontprop &p, const char *name); 510 bool set_properties (rxvt_fontprop &p, const char *name);
489}; 511};
490 512
491char * 513char *
492rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 514rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
493{ 515{
494 unsigned long value; 516 unsigned long value;
495 517
496 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 518 if (XGetFontProperty (f, property, &value))
497 return XGetAtomName (DISPLAY, value); 519 return XGetAtomName (term->xdisp, value);
498 else 520 else
499 return rxvt_strdup (repl); 521 return rxvt_strdup (repl);
500} 522}
501 523
502rxvt_fontprop 524rxvt_fontprop
… …
508} 530}
509 531
510bool 532bool
511rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 533rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
512{ 534{
513 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 535 p.width = width != rxvt_fontprop::unset ? width
536 : avgwidth ? (avgwidth + 1) / 10
537 : (height + 1) / 2;
514 p.height = height; 538 p.height = height;
539 p.ascent = rxvt_fontprop::unset;
515 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 540 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; 541 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
517 542
518 return true; 543 return true;
519} 544}
520 545
521bool 546bool
522rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 547rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
523{ 548{
524 unsigned long height; 549 unsigned long height;
550
551#if 0
525 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 552 if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))
526 return false; 553 return false;
554#else
555 height = f->ascent + f->descent;
556#endif
527 557
528 unsigned long avgwidth; 558 unsigned long avgwidth;
529 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 559 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
530 avgwidth = 0; 560 avgwidth = 0;
531 561
532 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 562 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
533 char *slant = get_property (f, "SLANT", "r"); 563 char *slant = get_property (f, term->xa [XA_SLANT], "r");
534 564
535 set_properties (p, height, weight, slant, avgwidth); 565 set_properties (p, height, weight, slant, avgwidth);
536 566
537 free (weight); 567 free (weight);
538 free (slant); 568 free (slant);
539 569
570 p.ascent = f->ascent;
571
540 return true; 572 return true;
541} 573}
542 574
543bool 575bool
544rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 576rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
545{ 577{
578 dTermDisplay;
546 int slashes = 0; 579 int slashes = 0;
547 const char *comp[13]; 580 const char *comp[13];
548 581
549 for (const char *c = name; *c; c++) 582 for (const char *c = name; *c; c++)
550 if (*c == '-') 583 if (*c == '-')
… …
558 if (slashes >= 13 591 if (slashes >= 13
559 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 592 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
560 && (*comp[11] >= '0' && *comp[11] <= '9')) 593 && (*comp[11] >= '0' && *comp[11] <= '9'))
561 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 594 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
562 595
563 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 596 XFontStruct *f = XLoadQueryFont (disp, name);
564 597
565 if (f) 598 if (f)
566 { 599 {
567 // the font should really exist now. if not, we have a problem 600 // 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). 601 // (e.g. if the user did xset fp rehash just when we were searching fonts).
569 // in that case, just return garbage. 602 // in that case, just return garbage.
570 bool ret = set_properties (p, f); 603 bool ret = set_properties (p, f);
571 XFreeFont (DISPLAY, f); 604 XFreeFont (disp, f);
572 return ret; 605 return ret;
573 } 606 }
574 else 607 else
575 return false; 608 return false;
576} 609}
… …
614} 647}
615 648
616bool 649bool
617rxvt_font_x11::load (const rxvt_fontprop &prop) 650rxvt_font_x11::load (const rxvt_fontprop &prop)
618{ 651{
652 dTermDisplay;
653
619 clear (); 654 clear ();
620 655
621 char field_str[64]; // enough for 128 bits 656 char field_str[64]; // enough for 128 bits
622 657
623 // first morph the font if required 658 // first morph the font if required
… …
626 { 661 {
627 char fname[1024]; 662 char fname[1024];
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 {
… …
659 ? "r" : "i"); // TODO: handle "o"blique, too 694 ? "r" : "i"); // TODO: handle "o"blique, too
660 set_name (strdup (fname)); 695 set_name (strdup (fname));
661 } 696 }
662 } 697 }
663 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 ()
707 {
708 name = 0;
709 diff = 0x7fffffff;
710 }
711
712 font_weight () { clear (); }
713 ~font_weight () { free (name); }
714 };
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[1024];
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 if (replace_field (fname, list[i], 11, '0', "0"))
737 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
686 738
687 if (!set_properties (p, fname)) 739 if (!set_properties (p, fname))
688 continue; 740 continue;
689 741
690 if (prop.height != rxvt_fontprop::unset 742 if (prop.height != rxvt_fontprop::unset
… …
694 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 746 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); 747 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); 748 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); 749 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
698 750
699 if (!name // compare against best found so far 751 fonts[i].name = strdup (fname);
700 || diff < bestdiff) 752 fonts[i].diff = diff;
701 {
702 set_name (strdup (fname));
703 bestdiff = diff;
704 }
705 } 753 }
706 754
707 XFreeFontNames (list); 755 XFreeFontNames (list);
708 756
709 if (!name) 757 // this loop only iterates when the guessed font-size is too small
710 return false; 758 for (;;)
759 {
760 font_weight *best = fonts + count - 1;
711 761
712 f = XLoadQueryFont (DISPLAY, name); 762 for (font_weight *w = best; w-- > fonts; )
763 if (w->diff <= best->diff)
764 best = w;
765
766 if (!best->name
767 || !(f = XLoadQueryFont (disp, best->name)))
768 break;
769
770 set_name (best->name);
771 best->clear ();
772
773 ascent = f->ascent;
774 descent = f->descent;
775 height = ascent + descent;
776
777 if (prop.height == rxvt_fontprop::unset
778 || height <= prop.height)
779 break; // font is ready for use
780
781 // PIXEL_SIZE small enough, but real height too large
782 clear ();
783 }
784
785 delete [] fonts;
713 786
714 if (!f) 787 if (!f)
715 return false; 788 return false;
716 789
717 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 790 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
718 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 791 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
719 792
720 if (registry && encoding) 793 if (registry && encoding)
721 { 794 {
722 char charset[64]; 795 char charset[64];
723 snprintf (charset, 64, "%s-%s", registry, encoding); 796 snprintf (charset, 64, "%s-%s", registry, encoding);
724 797
725 cs = codeset_from_name (charset); 798 cs = codeset_from_name (charset);
726 } 799 }
727 else 800 else
728 { 801 {
729 const char *charset = get_property (f, "FONT", 0); 802 const char *charset = get_property (f, XA_FONT, 0);
730 803
731 if (!charset) 804 if (!charset)
732 charset = name; 805 charset = name;
733 806
734 int count = 13; 807 int count = 13;
… …
746 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 819 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
747 820
748 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 821 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
749 enc2b = encm || f->max_char_or_byte2 > 255; 822 enc2b = encm || f->max_char_or_byte2 > 255;
750 823
751 ascent = f->ascent;
752 descent = f->descent;
753 height = ascent + descent;
754
755 slow = false; 824 slow = false;
756 825
757#if 1 // only used for slow detection, TODO optimize 826#if 1 // only used for slow detection, TODO optimize
758 if (f->min_bounds.width == f->max_bounds.width) 827 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; 828 width = f->max_bounds.width;
762 else 829 else
763 { 830 {
764 slow = true; 831 slow = true;
765 832
… …
781 848
782 width = 1; 849 width = 1;
783 850
784 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 851 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
785 { 852 {
786 if (cs != CS_UNICODE
787 && *t > 0x100
788 && FROM_UNICODE (cs, *t) == NOCHAR) 853 if (FROM_UNICODE (cs, *t) == NOCHAR)
789 continue; 854 continue;
790 855
791 // ignore characters we wouldn't use anyways 856 // ignore characters we wouldn't use anyways
792 bool careful; 857 bool careful;
793 if (!has_char (*t, &prop, careful)) 858 if (!has_char (*t, &prop, careful))
… …
797 862
798 XCharStruct g; 863 XCharStruct g;
799 int dir_ret, asc_ret, des_ret; 864 int dir_ret, asc_ret, des_ret;
800 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 865 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
801 866
802 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 867 int wcw = WCWIDTH (*t);
868 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
803 869
804 if (width < g.width) width = g.width; 870 if (width < g.width) width = g.width;
805 } 871 }
806 872
807 if (cs == CS_UNKNOWN) 873 if (cs == CS_UNKNOWN)
808 { 874 {
809 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 875 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
826void 892void
827rxvt_font_x11::clear () 893rxvt_font_x11::clear ()
828{ 894{
829 if (f) 895 if (f)
830 { 896 {
831 XFreeFont (DISPLAY, f); 897 XFreeFont (term->xdisp, f);
832 f = 0; 898 f = 0;
833 } 899 }
834} 900}
835 901
836bool 902bool
837rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 903rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
838{ 904{
839 uint32_t ch = FROM_UNICODE (cs, unicode); 905 uint32_t ch = FROM_UNICODE (cs, unicode);
840 906
841 if (ch == NOCHAR) 907 if (ch == NOCHAR)
842 return false; 908 return false;
… …
879 return false; 945 return false;
880 946
881 if (!prop || prop->width == rxvt_fontprop::unset) 947 if (!prop || prop->width == rxvt_fontprop::unset)
882 return true; 948 return true;
883 949
884 // check character against base font bounding box 950 // check wether character overlaps previous/next character
885 int w = xcs->width; 951 int w = xcs->rbearing - xcs->lbearing;
886 int wcw = wcwidth (unicode); 952 int wcw = max (WCWIDTH (unicode), 1);
887 if (wcw > 0) w /= wcw;
888 953
889 careful = w > prop->width; 954 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
890 if (careful && w > prop->width * MAX_OVERLAP >> 2) 955
956 if (careful && !OVERLAP_OK (w, wcw, prop))
891 return false; 957 return false;
892 958
893 return true; 959 return true;
894} 960}
895 961
… …
901 // this looks like a mess /. 967 // this looks like a mess /.
902 // and it is a mess /. 968 // and it is a mess /.
903 // yet we are trying to be perfect /. 969 // yet we are trying to be perfect /.
904 // but the result still isn't perfect /. 970 // but the result still isn't perfect /.
905 971
972 dTermDisplay;
973 dTermGC;
974
906 bool slow = this->slow 975 bool slow = this->slow
907 || width != r->TermWin.fwidth 976 || width != term->fwidth
908 || height != r->TermWin.fheight; 977 || height != term->fheight;
909 978
910 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 979 int base = ascent; // sorry, incorrect: term->fbase;
911 980
912 XGCValues v; 981 XGCValues v;
913 v.foreground = r->pix_colors[fg]; 982 v.foreground = term->pix_colors[fg];
914 v.font = f->fid; 983 v.font = f->fid;
915 984
916 if (enc2b) 985 if (enc2b)
917 { 986 {
918 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 987 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
919 988
920 if (bg == Color_bg && !slow) 989 if (bg == Color_bg && !slow)
921 { 990 {
922 v.background = r->pix_colors[bg]; 991 v.background = term->pix_colors[bg];
923 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 992 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
924 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 993 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
925 } 994 }
926 else 995 else
927 { 996 {
928 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 997 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
929 998
930 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 999 XChangeGC (disp, gc, GCForeground | GCFont, &v);
931 1000
932 if (slow) 1001 if (slow)
933 { 1002 {
934 do 1003 do
935 { 1004 {
936 if (xc->byte1 || xc->byte2) 1005 if (xc->byte1 || xc->byte2)
937 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1006 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
938 1007
939 x += r->TermWin.fwidth; 1008 x += term->fwidth;
940 xc++; len--; 1009 xc++; len--;
941 } 1010 }
942 while (len); 1011 while (len);
943 } 1012 }
944 else 1013 else
945 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1014 XDrawString16 (disp, d, gc, x, y + base, xc, len);
946 } 1015 }
947 } 1016 }
948 else 1017 else
949 { 1018 {
950 const char *xc = enc_char (text, len, cs, slow); 1019 const char *xc = enc_char (text, len, cs, slow);
951 1020
952 if (bg == Color_bg && !slow) 1021 if (bg == Color_bg && !slow)
953 { 1022 {
954 v.background = r->pix_colors[bg]; 1023 v.background = term->pix_colors[bg];
955 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1024 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
956 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1025 XDrawImageString (disp, d, gc, x, y + base, xc, len);
957 } 1026 }
958 else 1027 else
959 { 1028 {
960 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1029 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
961 1030
962 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1031 XChangeGC (disp, gc, GCForeground | GCFont, &v);
963 1032
964 if (slow) 1033 if (slow)
965 { 1034 {
966 do 1035 do
967 { 1036 {
968 if (*xc) 1037 if (*xc)
969 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1038 XDrawString (disp, d, gc, x, y + base, xc, 1);
970 1039
971 x += r->TermWin.fwidth; 1040 x += term->fwidth;
972 xc++; len--; 1041 xc++; len--;
973 } 1042 }
974 while (len); 1043 while (len);
975 } 1044 }
976 else 1045 else
977 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1046 XDrawString (disp, d, gc, x, y + base, xc, len);
978 } 1047 }
979 } 1048 }
980} 1049}
981 1050
982///////////////////////////////////////////////////////////////////////////// 1051/////////////////////////////////////////////////////////////////////////////
… …
994 1063
995 void draw (rxvt_drawable &d, int x, int y, 1064 void draw (rxvt_drawable &d, int x, int y,
996 const text_t *text, int len, 1065 const text_t *text, int len,
997 int fg, int bg); 1066 int fg, int bg);
998 1067
999 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1068 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
1000 1069
1001protected: 1070protected:
1002 XftFont *f; 1071 XftFont *f;
1003}; 1072};
1004 1073
1005void 1074void
1006rxvt_font_xft::clear () 1075rxvt_font_xft::clear ()
1007{ 1076{
1008 if (f) 1077 if (f)
1009 { 1078 {
1010 XftFontClose (DISPLAY, f); 1079 XftFontClose (term->xdisp, f);
1011 f = 0; 1080 f = 0;
1012 } 1081 }
1013} 1082}
1014 1083
1015rxvt_fontprop 1084rxvt_fontprop
… …
1019 1088
1020 FT_Face face = XftLockFace (f); 1089 FT_Face face = XftLockFace (f);
1021 1090
1022 p.width = width; 1091 p.width = width;
1023 p.height = height; 1092 p.height = height;
1093 p.ascent = ascent;
1024 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1094 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1025 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1095 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1026 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1096 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1027 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1097 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1028 1098
… …
1032} 1102}
1033 1103
1034bool 1104bool
1035rxvt_font_xft::load (const rxvt_fontprop &prop) 1105rxvt_font_xft::load (const rxvt_fontprop &prop)
1036{ 1106{
1107 dTermDisplay;
1108
1037 clear (); 1109 clear ();
1038 1110
1039 FcPattern *p = FcNameParse ((FcChar8 *) name); 1111 FcPattern *p = FcNameParse ((FcChar8 *) name);
1040 1112
1041 if (!p) 1113 if (!p)
1042 return false; 1114 return false;
1043 1115
1044 FcValue v; 1116 FcValue v;
1045 1117
1046 if (prop.height != rxvt_fontprop::unset 1118 if (prop.height != rxvt_fontprop::unset
1047 && FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch) 1119 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1120 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1048 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1121 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1049 1122
1050 if (prop.weight != rxvt_fontprop::unset 1123 if (prop.weight != rxvt_fontprop::unset
1051 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1124 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
1052 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1125 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
… …
1066 1139
1067 // store generated name so iso14755 view gives better results 1140 // store generated name so iso14755 view gives better results
1068 set_name ((char *)FcNameUnparse (p)); 1141 set_name ((char *)FcNameUnparse (p));
1069 1142
1070 XftResult result; 1143 XftResult result;
1071 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1144 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1072 1145
1073 FcPatternDestroy (p); 1146 FcPatternDestroy (p);
1074 1147
1075 if (!match) 1148 if (!match)
1076 return false; 1149 return false;
… …
1078 int ftheight = 0; 1151 int ftheight = 0;
1079 bool success = true; 1152 bool success = true;
1080 1153
1081 for (;;) 1154 for (;;)
1082 { 1155 {
1083 f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); 1156 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
1084 1157
1085 if (!f) 1158 if (!f)
1086 { 1159 {
1087 success = false; 1160 success = false;
1088 break; 1161 break;
… …
1097 1170
1098 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1171 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1099 1172
1100 XftUnlockFace (f); 1173 XftUnlockFace (f);
1101 1174
1175 int glheight = height;
1176
1102 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1177 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1103 { 1178 {
1104 FcChar16 ch = *t; 1179 FcChar16 ch = *t;
1105 1180
1106 if (cs != CS_UNICODE 1181 if (cs != CS_UNICODE
… …
1112 bool careful; 1187 bool careful;
1113 if (!has_char (*t, &prop, careful)) 1188 if (!has_char (*t, &prop, careful))
1114 continue; 1189 continue;
1115 1190
1116 XGlyphInfo g; 1191 XGlyphInfo g;
1117 XftTextExtents16 (DISPLAY, f, &ch, 1, &g); 1192 XftTextExtents16 (disp, f, &ch, 1, &g);
1118 1193
1194 g.width -= g.x;
1195
1119 int wcw = wcwidth (ch); 1196 int wcw = WCWIDTH (ch);
1120 if (wcw > 0) g.width = g.width / wcw; 1197 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1121 1198
1122 if (width < g.width) width = g.width; 1199 if (width < g.width ) width = g.width;
1123 if (height < g.height) height = g.height; 1200 if (height < g.height ) height = g.height;
1201 if (glheight < g.height - g.y) glheight = g.height - g.y;
1202 }
1203
1204 if (!width)
1205 {
1206 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1207
1208 XftFontClose (disp, f);
1209 f = 0;
1210
1211 success = false;
1212 break;
1124 } 1213 }
1125 1214
1126 if (prop.height == rxvt_fontprop::unset 1215 if (prop.height == rxvt_fontprop::unset
1127 || height <= prop.height 1216 || (height <= prop.height && glheight <= prop.height)
1128 || height <= 2 1217 || height <= 2
1129 || !scalable) 1218 || !scalable)
1130 break; 1219 break;
1131 1220
1132 if (ftheight) 1221 if (ftheight)
… …
1139 ftheight -= height - prop.height; 1228 ftheight -= height - prop.height;
1140 } 1229 }
1141 else 1230 else
1142 ftheight = prop.height - 1; 1231 ftheight = prop.height - 1;
1143 1232
1144 XftFontClose (DISPLAY, f); 1233 XftFontClose (disp, f);
1145 FcPatternDel (match, FC_PIXEL_SIZE); 1234 FcPatternDel (match, FC_PIXEL_SIZE);
1146 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1235 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1147 } 1236 }
1148 1237
1149 FcPatternDestroy (match); 1238 FcPatternDestroy (match);
1150 1239
1151#if 0 // do it per-character 1240#if 0 // do it per-character
… …
1158 1247
1159 return success; 1248 return success;
1160} 1249}
1161 1250
1162bool 1251bool
1163rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1252rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1164{ 1253{
1165 careful = false; 1254 careful = false;
1166 1255
1167 if (!XftCharExists (DISPLAY, f, unicode)) 1256 if (!XftCharExists (term->xdisp, f, unicode))
1168 return false; 1257 return false;
1169 1258
1170 if (!prop || prop->width == rxvt_fontprop::unset) 1259 if (!prop || prop->width == rxvt_fontprop::unset)
1171 return true; 1260 return true;
1172 1261
1173 // check character against base font bounding box 1262 // check character against base font bounding box
1174 FcChar32 ch = unicode; 1263 FcChar32 ch = unicode;
1175 XGlyphInfo g; 1264 XGlyphInfo g;
1176 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1265 XftTextExtents32 (term->xdisp, f, &ch, 1, &g);
1177 1266
1178 int w = g.width; 1267 int w = g.width - g.x;
1179 int wcw = wcwidth (unicode); 1268 int wcw = max (WCWIDTH (unicode), 1);
1180 if (wcw > 0) w /= wcw;
1181 1269
1182 careful = w > prop->width; 1270 careful = g.x > 0 || w > prop->width * wcw;
1183 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1271
1272 if (careful && !OVERLAP_OK (w, wcw, prop))
1273 return false;
1274
1275 // this weeds out _totally_ broken fonts, or glyphs
1276 if (!OVERLAP_OK (g.xOff, wcw, prop))
1184 return false; 1277 return false;
1185 1278
1186 return true; 1279 return true;
1187} 1280}
1188 1281
1189void 1282void
1190rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1283rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1191 const text_t *text, int len, 1284 const text_t *text, int len,
1192 int fg, int bg) 1285 int fg, int bg)
1193{ 1286{
1194 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1287 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1195
1196 int base = ascent; // should be fbase, but that is incorrect
1197 1288
1198 XGlyphInfo extents; 1289 XGlyphInfo extents;
1199 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1290 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1200 FcChar32 *ep = enc; 1291 XftGlyphSpec *ep = enc;
1201 int ewidth = 0; 1292
1202 int xoff = 0; 1293 dTermDisplay;
1294 dTermGC;
1295
1296 // cut trailing spaces
1297 while (len && text [len - 1] == ' ')
1298 len--;
1203 1299
1204 while (len) 1300 while (len)
1205 { 1301 {
1206 int cwidth = r->TermWin.fwidth; 1302 int cwidth = term->fwidth;
1207 FcChar32 fc = *text++; len--; 1303 FcChar32 fc = *text++; len--;
1208 FT_UInt gl;
1209 1304
1210 while (len && *text == NOCHAR) 1305 while (len && *text == NOCHAR)
1211 text++, len--, cwidth += r->TermWin.fwidth; 1306 text++, len--, cwidth += term->fwidth;
1212 1307
1213 gl = XftCharIndex (d.display->display, f, fc); 1308 if (fc != ' ') // skip spaces
1214 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1215
1216 if (extents.xOff != cwidth && ep != enc)
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 } 1309 {
1310 FT_UInt glyph = XftCharIndex (disp, f, fc);
1311 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1228 1312
1229 if (fc == ' ' && ep == enc) // skip leading spaces 1313 ep->glyph = glyph;
1314 ep->x = x + (cwidth - extents.xOff >> 1);
1315 ep->y = y + ascent;
1316
1317 if (extents.xOff == 0)
1318 ep->x = x + cwidth;
1319
1320 ep++;
1230 { 1321 }
1322
1231 x += cwidth; 1323 x += cwidth;
1232 continue;
1233 }
1234
1235 else
1236 {
1237 *ep++ = gl;
1238 ewidth += cwidth;
1239 xoff += extents.xOff;
1240 }
1241 } 1324 }
1242 1325
1243 if (ep != enc) 1326 if (ep != enc)
1244 {
1245 if (xoff > ewidth) xoff = ewidth;
1246 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1327 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1247 x + (ewidth - xoff >> 1),
1248 y + base, enc, ep - enc);
1249 }
1250} 1328}
1251#endif 1329#endif
1252 1330
1253///////////////////////////////////////////////////////////////////////////// 1331/////////////////////////////////////////////////////////////////////////////
1254 1332
1255rxvt_fontset::rxvt_fontset (rxvt_t r) 1333rxvt_fontset::rxvt_fontset (rxvt_term *term)
1256: r (r), fontdesc (0) 1334: fontdesc (0), term (term)
1257{ 1335{
1258 clear (); 1336 clear ();
1259} 1337}
1260 1338
1261rxvt_fontset::~rxvt_fontset () 1339rxvt_fontset::~rxvt_fontset ()
… …
1264} 1342}
1265 1343
1266void 1344void
1267rxvt_fontset::clear () 1345rxvt_fontset::clear ()
1268{ 1346{
1347 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1348 = rxvt_fontprop::unset;
1349
1269 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1350 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1270 FONT_UNREF (*i); 1351 FONT_UNREF (*i);
1271 1352
1272 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1353 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1273 delete *p; 1354 delete *p;
… …
1302 f = new rxvt_font_x11; 1383 f = new rxvt_font_x11;
1303 } 1384 }
1304 else 1385 else
1305 f = new rxvt_font_x11; 1386 f = new rxvt_font_x11;
1306 1387
1307 f->set_term (r); 1388 f->set_term (term);
1308 f->set_name (strdup (name)); 1389 f->set_name (strdup (name));
1309 1390
1310 f->cs = cs; 1391 f->cs = cs;
1311 f->loaded = false; 1392 f->loaded = false;
1312 1393
… …
1323 char buf[512]; 1404 char buf[512];
1324 const char *end; 1405 const char *end;
1325 1406
1326 do 1407 do
1327 { 1408 {
1328 while (*desc <= ' ') desc++; 1409 while (*desc && *desc <= ' ')
1410 desc++;
1329 1411
1330 codeset cs = CS_UNICODE; 1412 codeset cs = CS_UNICODE;
1331 1413
1332 if (*desc == '[') 1414 if (*desc == '[')
1333 { 1415 {
… …
1393 1475
1394 return true; 1476 return true;
1395} 1477}
1396 1478
1397bool 1479bool
1398rxvt_fontset::populate (const char *desc, const rxvt_fontprop &prop) 1480rxvt_fontset::populate (const char *desc)
1399{ 1481{
1400 clear (); 1482 clear ();
1401 1483
1402 fontdesc = strdup (desc); 1484 fontdesc = strdup (desc);
1403 1485
1404 fonts.push_back (new_font (0, CS_UNICODE)); 1486 fonts.push_back (new_font (0, CS_UNICODE));
1405 realize_font (0); 1487 realize_font (0);
1406
1407 this->prop = prop;
1408 1488
1409 add_fonts (desc); 1489 add_fonts (desc);
1410 1490
1411 return true; 1491 return true;
1412} 1492}
… …
1445 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1525 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1446 goto next_font; 1526 goto next_font;
1447 1527
1448 if (!realize_font (i)) 1528 if (!realize_font (i))
1449 goto next_font; 1529 goto next_font;
1530
1531 if (prop.ascent != rxvt_fontprop::unset)
1532 max_it (f->ascent, prop.ascent);
1450 } 1533 }
1451 1534
1452 if (f->cs == CS_UNKNOWN) 1535 if (f->cs == CS_UNKNOWN)
1453 goto next_font; 1536 goto next_font;
1454 1537
… …
1493 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1576 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1494 FcPatternAddBool (p, FC_MINSPACE, 1); 1577 FcPatternAddBool (p, FC_MINSPACE, 1);
1495 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1578 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1496 1579
1497 XftResult result; 1580 XftResult result;
1498 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1581 FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);
1499 1582
1500 FcPatternDestroy (p); 1583 FcPatternDestroy (p);
1501 1584
1502 if (match) 1585 if (match)
1503 { 1586 {

Diff Legend

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