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.52 by root, Sat Dec 4 02:56:06 2004 UTC vs.
Revision 1.94 by root, Thu Feb 2 18:04:46 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" },
… …
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_ZH || ENCODING_ZH_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:autohint=true"}, 137 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
131 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 138 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
132 { CS_UNICODE, "xft:Andale Mono:antialias=false" }, 139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
133 { CS_UNICODE, "xft:Arial Unicode MS:antialias=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:autohint=true" }, 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->dpy
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->dpy, 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
351 // support double-width (but not more) graphics chars
352 // TODO: do this outside the if/elsif.. statement for all cases
353 if (len && *text == NOCHAR)
354 W += r->TermWin.fwidth;
355 372
356 int x_[16]; 373 int x_[16];
357 int y_[16]; 374 int y_[16];
358 375
359 for (int i = 0; i <= 8; i++) 376 for (int i = 0; i <= 8; i++)
… …
367 384
368 XGCValues gcv; 385 XGCValues gcv;
369 386
370 gcv.cap_style = CapButt; 387 gcv.cap_style = CapButt;
371 gcv.line_width = 0; 388 gcv.line_width = 0;
372 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 389 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
373 390
374 while (a < b) 391 while (a < b)
375 { 392 {
376 uint32_t command = *a++; 393 uint32_t command = *a++;
377 394
… …
384 int y2 = y_[(command >> 0) & 15]; 401 int y2 = y_[(command >> 0) & 15];
385 402
386 switch (op) 403 switch (op)
387 { 404 {
388 case 0: // line 405 case 0: // line
389 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 406 XDrawLine (disp, d, gc, x1, y1, x2, y2);
390 break; 407 break;
391 408
392 case 1: // rectangle, possibly stippled 409 case 1: // rectangle, possibly stippled
393 if (a) 410 if (a)
394 { 411 {
395 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
396 413
397 gcv.fill_style = FillStippled; 414 gcv.fill_style = FillStippled;
398 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
399 gcv.ts_x_origin = x; 416 gcv.ts_x_origin = x;
400 gcv.ts_y_origin = y; 417 gcv.ts_y_origin = y;
401 418
402 XChangeGC (d.display->display, TGC, 419 XChangeGC (disp, gc,
403 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 420 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
404 &gcv); 421 &gcv);
405 } 422 }
406 423
407 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);
408 425
409 if (a) 426 if (a)
410 { 427 {
411 XFreePixmap (d.display->display, gcv.stipple); 428 XFreePixmap (disp, gcv.stipple);
412 gcv.stipple = 0; 429 gcv.stipple = 0;
413 gcv.fill_style = FillSolid; 430 gcv.fill_style = FillSolid;
414 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 431 XChangeGC (disp, gc, GCFillStyle, &gcv);
415 } 432 }
416 break; 433 break;
417 case 2: // arc 434 case 2: // arc
418 XDrawArc (d.display->display, d, TGC, 435 XDrawArc (disp, d, gc,
419 x1 - W/2, y1 - H/2, W-1, H-1, 436 x1 - W/2, y1 - H/2, W-1, H-1,
420 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
421 break; 438 break;
422 } 439 }
423 } 440 }
424 } 441 }
425#if ENABLE_COMBINING 442#if ENABLE_COMBINING
426 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 443 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
427 { 444 {
445 min_it (width, 2); // we only support wcwidth up to 2
446
428 text_t c2[2]; 447 text_t chrs[2];
429 int len2 = 1; 448 chrs [1] = NOCHAR;
430
431 // support double-width (but not more) combining characters
432 if (len && *text == NOCHAR)
433 {
434 c2[1] = *text; // not text++ to get correct x-width
435 len2++;
436 }
437 449
438 c2[0] = cc->c1; 450 *chrs = cc->c1;
439 rxvt_font *f1 = (*fs)[fs->find_font (c2[0])]; 451 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
440 f1->draw (d, x, y, c2, len2, fg, bg); 452 f1->draw (d, x, y, chrs, width, fg, bg);
441 453
442 if (cc->c2 != NOCHAR) 454 if (cc->c2 != NOCHAR)
443 { 455 {
444 bool careful; 456 bool careful;
445 457
446 // prefer font of first character, for no good reasons 458 // prefer font of first character, for no good reasons
447 c2[0] = cc->c2; 459 *chrs = cc->c2;
448 rxvt_font *f2 = (f1->has_char (c2[0], 0, careful) && !careful) 460 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
449 ? f1 461 ? f1
450 : (*fs)[fs->find_font (c2[0])]; 462 : (*fs)[fs->find_font (cc->c2)];
451 463
452 f2->draw (d, x, y, c2, len2, fg, -1); 464 f2->draw (d, x, y, chrs, width, fg, -1);
453 } 465 }
454 } 466 }
455#endif 467#endif
456 else 468 else
457 switch (t) 469 switch (t)
… …
460 case ZERO_WIDTH_CHAR: 472 case ZERO_WIDTH_CHAR:
461 case NOCHAR: 473 case NOCHAR:
462 break; 474 break;
463 475
464 default: 476 default:
465 int w = 0;
466 while (len > 0 && *text == NOCHAR)
467 {
468 ++text;
469 --len;
470 w += r->TermWin.fwidth;
471 }
472
473 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, 477 XDrawRectangle (disp, d, gc, x + 2, y + 2,
474 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); 478 fwidth - 4, term->fheight - 4);
475 x += w;
476 } 479 }
477 480
478 x += r->TermWin.fwidth; 481 x += fwidth;
479 } 482 }
480} 483}
481 484
482///////////////////////////////////////////////////////////////////////////// 485/////////////////////////////////////////////////////////////////////////////
483 486
… …
488 491
489 rxvt_fontprop properties (); 492 rxvt_fontprop properties ();
490 493
491 bool load (const rxvt_fontprop &prop); 494 bool load (const rxvt_fontprop &prop);
492 495
493 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;
494 497
495 void draw (rxvt_drawable &d, int x, int y, 498 void draw (rxvt_drawable &d, int x, int y,
496 const text_t *text, int len, 499 const text_t *text, int len,
497 int fg, int bg); 500 int fg, int bg);
498 501
499 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
500 XFontStruct *f; 503 XFontStruct *f;
501 codeset cs; 504 codeset cs;
502 bool enc2b, encm; 505 bool enc2b, encm;
503 506
504 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 507 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
505 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);
506 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 509 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
507 bool set_properties (rxvt_fontprop &p, const char *name); 510 bool set_properties (rxvt_fontprop &p, const char *name);
508}; 511};
509 512
510char * 513char *
511rxvt_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
512{ 515{
513 unsigned long value; 516 unsigned long value;
514 517
515 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 518 if (XGetFontProperty (f, property, &value))
516 return XGetAtomName (DISPLAY, value); 519 return XGetAtomName (term->dpy, value);
517 else 520 else
518 return rxvt_strdup (repl); 521 return rxvt_strdup (repl);
519} 522}
520 523
521rxvt_fontprop 524rxvt_fontprop
… …
527} 530}
528 531
529bool 532bool
530rxvt_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)
531{ 534{
532 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;
533 p.height = height; 538 p.height = height;
539 p.ascent = rxvt_fontprop::unset;
534 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;
535 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;
536 542
537 return true; 543 return true;
538} 544}
539 545
540bool 546bool
541rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 547rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
542{ 548{
543 unsigned long height; 549 unsigned long height;
550
551#if 0
544 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 552 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
545 return false; 553 return false;
554#else
555 height = f->ascent + f->descent;
556#endif
546 557
547 unsigned long avgwidth; 558 unsigned long avgwidth;
548 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 559 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
549 avgwidth = 0; 560 avgwidth = 0;
550 561
551 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 562 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
552 char *slant = get_property (f, "SLANT", "r"); 563 char *slant = get_property (f, term->xa [XA_SLANT], "r");
553 564
554 set_properties (p, height, weight, slant, avgwidth); 565 set_properties (p, height, weight, slant, avgwidth);
555 566
556 free (weight); 567 free (weight);
557 free (slant); 568 free (slant);
558 569
570 p.ascent = f->ascent;
571
559 return true; 572 return true;
560} 573}
561 574
562bool 575bool
563rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 576rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
564{ 577{
578 dTermDisplay;
565 int slashes = 0; 579 int slashes = 0;
566 const char *comp[13]; 580 const char *comp[13];
567 581
568 for (const char *c = name; *c; c++) 582 for (const char *c = name; *c; c++)
569 if (*c == '-') 583 if (*c == '-')
… …
577 if (slashes >= 13 591 if (slashes >= 13
578 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 592 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
579 && (*comp[11] >= '0' && *comp[11] <= '9')) 593 && (*comp[11] >= '0' && *comp[11] <= '9'))
580 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]));
581 595
582 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 596 XFontStruct *f = XLoadQueryFont (disp, name);
583 597
584 if (f) 598 if (f)
585 { 599 {
586 // 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
587 // (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).
588 // in that case, just return garbage. 602 // in that case, just return garbage.
589 bool ret = set_properties (p, f); 603 bool ret = set_properties (p, f);
590 XFreeFont (DISPLAY, f); 604 XFreeFont (disp, f);
591 return ret; 605 return ret;
592 } 606 }
593 else 607 else
594 return false; 608 return false;
595} 609}
… …
633} 647}
634 648
635bool 649bool
636rxvt_font_x11::load (const rxvt_fontprop &prop) 650rxvt_font_x11::load (const rxvt_fontprop &prop)
637{ 651{
652 dTermDisplay;
653
638 clear (); 654 clear ();
639 655
640 char field_str[64]; // enough for 128 bits 656 char field_str[64]; // enough for 128 bits
641 657
642 // first morph the font if required 658 // first morph the font if required
… …
645 { 661 {
646 char fname[1024]; 662 char fname[1024];
647 663
648 if (name[0] != '-') 664 if (name[0] != '-')
649 { 665 {
650 f = XLoadQueryFont (DISPLAY, name); 666 f = XLoadQueryFont (disp, name);
651 667
652 if (!f) 668 if (!f)
653 return false; 669 return false;
654 670
655 char *new_name = get_property (f, "FONT", name); 671 char *new_name = get_property (f, XA_FONT, name);
656 672
657 if (new_name) 673 if (new_name)
658 set_name (new_name); 674 set_name (new_name);
659 else 675 else
660 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
661 677
662 XFreeFont (DISPLAY, f); 678 XFreeFont (disp, f);
663 f = 0; 679 f = 0;
664 } 680 }
665 681
666 if (prop.weight != rxvt_fontprop::unset) 682 if (prop.weight != rxvt_fontprop::unset)
667 { 683 {
… …
678 ? "r" : "i"); // TODO: handle "o"blique, too 694 ? "r" : "i"); // TODO: handle "o"blique, too
679 set_name (strdup (fname)); 695 set_name (strdup (fname));
680 } 696 }
681 } 697 }
682 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
683 char **list; 716 char **list;
684 int count; 717 int count;
685 list = XListFonts (DISPLAY, name, 1024, &count); 718 list = XListFonts (disp, name, 4000, &count);
686 719
687 set_name (0); 720 set_name (0);
688 721
689 if (!list) 722 if (!list)
690 return false; 723 return false;
691 724
692 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 725 font_weight *fonts = new font_weight[count];
693 ? 0 : prop.height);
694 726
695 int bestdiff = 0x7fffffff;
696 for (int i = 0; i < count; i++) 727 for (int i = 0; i < count; i++)
697 { 728 {
698 rxvt_fontprop p; 729 rxvt_fontprop p;
699 char fname[1024]; 730 char fname[1024];
700 731
701 int diff = 0; 732 int diff = 0;
702 733
703 if (replace_field (fname, list[i], 6, '0', field_str)) 734 if (replace_field (fname, list[i], 6, '0', field_str))
704 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
705 738
706 if (!set_properties (p, fname)) 739 if (!set_properties (p, fname))
707 continue; 740 continue;
708 741
709 if (prop.height != rxvt_fontprop::unset 742 if (prop.height != rxvt_fontprop::unset
… …
713 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;
714 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);
715 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);
716 //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);
717 750
718 if (!name // compare against best found so far 751 fonts[i].name = strdup (fname);
719 || diff < bestdiff) 752 fonts[i].diff = diff;
720 {
721 set_name (strdup (fname));
722 bestdiff = diff;
723 }
724 } 753 }
725 754
726 XFreeFontNames (list); 755 XFreeFontNames (list);
727 756
728 if (!name) 757 // this loop only iterates when the guessed font-size is too small
729 return false; 758 for (;;)
759 {
760 font_weight *best = fonts + count - 1;
730 761
731 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;
732 786
733 if (!f) 787 if (!f)
734 return false; 788 return false;
735 789
736 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 790 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
737 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 791 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
738 792
739 if (registry && encoding) 793 if (registry && encoding)
740 { 794 {
741 char charset[64]; 795 char charset[64];
742 snprintf (charset, 64, "%s-%s", registry, encoding); 796 snprintf (charset, 64, "%s-%s", registry, encoding);
743 797
744 cs = codeset_from_name (charset); 798 cs = codeset_from_name (charset);
745 } 799 }
746 else 800 else
747 { 801 {
748 const char *charset = get_property (f, "FONT", 0); 802 const char *charset = get_property (f, XA_FONT, 0);
749 803
750 if (!charset) 804 if (!charset)
751 charset = name; 805 charset = name;
752 806
753 int count = 13; 807 int count = 13;
… …
765 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
766 820
767 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 821 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
768 enc2b = encm || f->max_char_or_byte2 > 255; 822 enc2b = encm || f->max_char_or_byte2 > 255;
769 823
770 ascent = f->ascent;
771 descent = f->descent;
772 height = ascent + descent;
773
774 slow = false; 824 slow = false;
775 825
776#if 1 // only used for slow detection, TODO optimize 826#if 1 // only used for slow detection, TODO optimize
777 if (f->min_bounds.width == f->max_bounds.width) 827 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
778 width = f->min_bounds.width;
779 else if (f->per_char == NULL)
780 width = f->max_bounds.width; 828 width = f->max_bounds.width;
781 else 829 else
782 { 830 {
783 slow = true; 831 slow = true;
784 832
… …
800 848
801 width = 1; 849 width = 1;
802 850
803 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; )
804 { 852 {
805 if (cs != CS_UNICODE
806 && *t > 0x100
807 && FROM_UNICODE (cs, *t) == NOCHAR) 853 if (FROM_UNICODE (cs, *t) == NOCHAR)
808 continue; 854 continue;
809 855
810 // ignore characters we wouldn't use anyways 856 // ignore characters we wouldn't use anyways
811 bool careful; 857 bool careful;
812 if (!has_char (*t, &prop, careful)) 858 if (!has_char (*t, &prop, careful))
… …
816 862
817 XCharStruct g; 863 XCharStruct g;
818 int dir_ret, asc_ret, des_ret; 864 int dir_ret, asc_ret, des_ret;
819 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 865 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
820 866
821 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;
822 869
823 if (width < g.width) width = g.width; 870 if (width < g.width) width = g.width;
824 } 871 }
825 872
826 if (cs == CS_UNKNOWN) 873 if (cs == CS_UNKNOWN)
827 { 874 {
828 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 875 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
845void 892void
846rxvt_font_x11::clear () 893rxvt_font_x11::clear ()
847{ 894{
848 if (f) 895 if (f)
849 { 896 {
850 XFreeFont (DISPLAY, f); 897 XFreeFont (term->dpy, f);
851 f = 0; 898 f = 0;
852 } 899 }
853} 900}
854 901
855bool 902bool
856rxvt_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
857{ 904{
858 uint32_t ch = FROM_UNICODE (cs, unicode); 905 uint32_t ch = FROM_UNICODE (cs, unicode);
859 906
860 if (ch == NOCHAR) 907 if (ch == NOCHAR)
861 return false; 908 return false;
… …
898 return false; 945 return false;
899 946
900 if (!prop || prop->width == rxvt_fontprop::unset) 947 if (!prop || prop->width == rxvt_fontprop::unset)
901 return true; 948 return true;
902 949
903 // check character against base font bounding box 950 // check wether character overlaps previous/next character
904 int w = xcs->width; 951 int w = xcs->rbearing - xcs->lbearing;
905 int wcw = wcwidth (unicode); 952 int wcw = max (WCWIDTH (unicode), 1);
906 if (wcw > 0) w /= wcw;
907 953
908 careful = w > prop->width; 954 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
909 if (careful && w > prop->width * MAX_OVERLAP >> 2) 955
956 if (careful && !OVERLAP_OK (w, wcw, prop))
910 return false; 957 return false;
911 958
912 return true; 959 return true;
913} 960}
914 961
… …
920 // this looks like a mess /. 967 // this looks like a mess /.
921 // and it is a mess /. 968 // and it is a mess /.
922 // yet we are trying to be perfect /. 969 // yet we are trying to be perfect /.
923 // but the result still isn't perfect /. 970 // but the result still isn't perfect /.
924 971
972 dTermDisplay;
973 dTermGC;
974
925 bool slow = this->slow 975 bool slow = this->slow
926 || width != r->TermWin.fwidth 976 || width != term->fwidth
927 || height != r->TermWin.fheight; 977 || height != term->fheight;
928 978
929 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 979 int base = ascent; // sorry, incorrect: term->fbase;
930 980
931 XGCValues v; 981 XGCValues v;
932 v.foreground = r->pix_colors[fg]; 982 v.foreground = term->pix_colors[fg];
933 v.font = f->fid; 983 v.font = f->fid;
934 984
935 if (enc2b) 985 if (enc2b)
936 { 986 {
937 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 987 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
938 988
939 if (bg == Color_bg && !slow) 989 if (bg == Color_bg && !slow)
940 { 990 {
941 v.background = r->pix_colors[bg]; 991 v.background = term->pix_colors[bg];
942 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 992 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
943 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 993 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
944 } 994 }
945 else 995 else
946 { 996 {
947 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);
948 998
949 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 999 XChangeGC (disp, gc, GCForeground | GCFont, &v);
950 1000
951 if (slow) 1001 if (slow)
952 { 1002 {
953 do 1003 do
954 { 1004 {
955 if (xc->byte1 || xc->byte2) 1005 if (xc->byte1 || xc->byte2)
956 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1006 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
957 1007
958 x += r->TermWin.fwidth; 1008 x += term->fwidth;
959 xc++; len--; 1009 xc++; len--;
960 } 1010 }
961 while (len); 1011 while (len);
962 } 1012 }
963 else 1013 else
964 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1014 XDrawString16 (disp, d, gc, x, y + base, xc, len);
965 } 1015 }
966 } 1016 }
967 else 1017 else
968 { 1018 {
969 const char *xc = enc_char (text, len, cs, slow); 1019 const char *xc = enc_char (text, len, cs, slow);
970 1020
971 if (bg == Color_bg && !slow) 1021 if (bg == Color_bg && !slow)
972 { 1022 {
973 v.background = r->pix_colors[bg]; 1023 v.background = term->pix_colors[bg];
974 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1024 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
975 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1025 XDrawImageString (disp, d, gc, x, y + base, xc, len);
976 } 1026 }
977 else 1027 else
978 { 1028 {
979 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);
980 1030
981 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1031 XChangeGC (disp, gc, GCForeground | GCFont, &v);
982 1032
983 if (slow) 1033 if (slow)
984 { 1034 {
985 do 1035 do
986 { 1036 {
987 if (*xc) 1037 if (*xc)
988 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1038 XDrawString (disp, d, gc, x, y + base, xc, 1);
989 1039
990 x += r->TermWin.fwidth; 1040 x += term->fwidth;
991 xc++; len--; 1041 xc++; len--;
992 } 1042 }
993 while (len); 1043 while (len);
994 } 1044 }
995 else 1045 else
996 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1046 XDrawString (disp, d, gc, x, y + base, xc, len);
997 } 1047 }
998 } 1048 }
999} 1049}
1000 1050
1001///////////////////////////////////////////////////////////////////////////// 1051/////////////////////////////////////////////////////////////////////////////
… …
1013 1063
1014 void draw (rxvt_drawable &d, int x, int y, 1064 void draw (rxvt_drawable &d, int x, int y,
1015 const text_t *text, int len, 1065 const text_t *text, int len,
1016 int fg, int bg); 1066 int fg, int bg);
1017 1067
1018 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;
1019 1069
1020protected: 1070protected:
1021 XftFont *f; 1071 XftFont *f;
1022}; 1072};
1023 1073
1024void 1074void
1025rxvt_font_xft::clear () 1075rxvt_font_xft::clear ()
1026{ 1076{
1027 if (f) 1077 if (f)
1028 { 1078 {
1029 XftFontClose (DISPLAY, f); 1079 XftFontClose (term->dpy, f);
1030 f = 0; 1080 f = 0;
1031 } 1081 }
1032} 1082}
1033 1083
1034rxvt_fontprop 1084rxvt_fontprop
… …
1038 1088
1039 FT_Face face = XftLockFace (f); 1089 FT_Face face = XftLockFace (f);
1040 1090
1041 p.width = width; 1091 p.width = width;
1042 p.height = height; 1092 p.height = height;
1093 p.ascent = ascent;
1043 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1094 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1044 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1095 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1045 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1096 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1046 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1097 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1047 1098
… …
1051} 1102}
1052 1103
1053bool 1104bool
1054rxvt_font_xft::load (const rxvt_fontprop &prop) 1105rxvt_font_xft::load (const rxvt_fontprop &prop)
1055{ 1106{
1107 dTermDisplay;
1108
1056 clear (); 1109 clear ();
1057 1110
1058 FcPattern *p = FcNameParse ((FcChar8 *) name); 1111 FcPattern *p = FcNameParse ((FcChar8 *) name);
1059 1112
1060 if (!p) 1113 if (!p)
1061 return false; 1114 return false;
1062 1115
1063 FcValue v; 1116 FcValue v;
1064 1117
1065 if (prop.height != rxvt_fontprop::unset 1118 if (prop.height != rxvt_fontprop::unset
1066 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1119 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1067 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1120 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1068 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1121 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1069 1122
1070 if (prop.weight != rxvt_fontprop::unset 1123 if (prop.weight != rxvt_fontprop::unset
1071 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1124 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
… …
1086 1139
1087 // store generated name so iso14755 view gives better results 1140 // store generated name so iso14755 view gives better results
1088 set_name ((char *)FcNameUnparse (p)); 1141 set_name ((char *)FcNameUnparse (p));
1089 1142
1090 XftResult result; 1143 XftResult result;
1091 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1144 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1092 1145
1093 FcPatternDestroy (p); 1146 FcPatternDestroy (p);
1094 1147
1095 if (!match) 1148 if (!match)
1096 return false; 1149 return false;
… …
1098 int ftheight = 0; 1151 int ftheight = 0;
1099 bool success = true; 1152 bool success = true;
1100 1153
1101 for (;;) 1154 for (;;)
1102 { 1155 {
1103 f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); 1156 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
1104 1157
1105 if (!f) 1158 if (!f)
1106 { 1159 {
1107 success = false; 1160 success = false;
1108 break; 1161 break;
… …
1117 1170
1118 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1171 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1119 1172
1120 XftUnlockFace (f); 1173 XftUnlockFace (f);
1121 1174
1175 int glheight = height;
1176
1122 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; )
1123 { 1178 {
1124 FcChar16 ch = *t; 1179 FcChar16 ch = *t;
1125 1180
1126 if (cs != CS_UNICODE 1181 if (cs != CS_UNICODE
… …
1132 bool careful; 1187 bool careful;
1133 if (!has_char (*t, &prop, careful)) 1188 if (!has_char (*t, &prop, careful))
1134 continue; 1189 continue;
1135 1190
1136 XGlyphInfo g; 1191 XGlyphInfo g;
1137 XftTextExtents16 (DISPLAY, f, &ch, 1, &g); 1192 XftTextExtents16 (disp, f, &ch, 1, &g);
1138 1193
1194 g.width -= g.x;
1195
1139 int wcw = wcwidth (ch); 1196 int wcw = WCWIDTH (ch);
1140 if (wcw > 0) g.width = g.width / wcw; 1197 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1141 1198
1142 if (width < g.width) width = g.width; 1199 if (width < g.width ) width = g.width;
1143 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;
1144 } 1213 }
1145 1214
1146 if (prop.height == rxvt_fontprop::unset 1215 if (prop.height == rxvt_fontprop::unset
1147 || height <= prop.height 1216 || (height <= prop.height && glheight <= prop.height)
1148 || height <= 2 1217 || height <= 2
1149 || !scalable) 1218 || !scalable)
1150 break; 1219 break;
1151 1220
1152 if (ftheight) 1221 if (ftheight)
… …
1159 ftheight -= height - prop.height; 1228 ftheight -= height - prop.height;
1160 } 1229 }
1161 else 1230 else
1162 ftheight = prop.height - 1; 1231 ftheight = prop.height - 1;
1163 1232
1164 XftFontClose (DISPLAY, f); 1233 XftFontClose (disp, f);
1165 FcPatternDel (match, FC_PIXEL_SIZE); 1234 FcPatternDel (match, FC_PIXEL_SIZE);
1166 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1235 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1167 } 1236 }
1168 1237
1169 FcPatternDestroy (match); 1238 FcPatternDestroy (match);
1170 1239
1171#if 0 // do it per-character 1240#if 0 // do it per-character
… …
1178 1247
1179 return success; 1248 return success;
1180} 1249}
1181 1250
1182bool 1251bool
1183rxvt_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
1184{ 1253{
1185 careful = false; 1254 careful = false;
1186 1255
1187 if (!XftCharExists (DISPLAY, f, unicode)) 1256 if (!XftCharExists (term->dpy, f, unicode))
1188 return false; 1257 return false;
1189 1258
1190 if (!prop || prop->width == rxvt_fontprop::unset) 1259 if (!prop || prop->width == rxvt_fontprop::unset)
1191 return true; 1260 return true;
1192 1261
1193 // check character against base font bounding box 1262 // check character against base font bounding box
1194 FcChar32 ch = unicode; 1263 FcChar32 ch = unicode;
1195 XGlyphInfo g; 1264 XGlyphInfo g;
1196 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1265 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1197 1266
1198 int w = g.width; 1267 int w = g.width - g.x;
1199 int wcw = wcwidth (unicode); 1268 int wcw = max (WCWIDTH (unicode), 1);
1200 if (wcw > 0) w /= wcw;
1201 1269
1202 careful = w > prop->width; 1270 careful = g.x > 0 || w > prop->width * wcw;
1203 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))
1204 return false; 1277 return false;
1205 1278
1206 return true; 1279 return true;
1207} 1280}
1208 1281
1209void 1282void
1210rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1283rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1211 const text_t *text, int len, 1284 const text_t *text, int len,
1212 int fg, int bg) 1285 int fg, int bg)
1213{ 1286{
1214 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);
1215
1216 int base = ascent; // should be fbase, but that is incorrect
1217 1288
1218 XGlyphInfo extents; 1289 XGlyphInfo extents;
1219 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1290 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1220 FcChar32 *ep = enc; 1291 XftGlyphSpec *ep = enc;
1221 int ewidth = 0; 1292
1222 int xoff = 0; 1293 dTermDisplay;
1294 dTermGC;
1295
1296 // cut trailing spaces
1297 while (len && text [len - 1] == ' ')
1298 len--;
1223 1299
1224 while (len) 1300 while (len)
1225 { 1301 {
1226 int cwidth = r->TermWin.fwidth; 1302 int cwidth = term->fwidth;
1227 FcChar32 fc = *text++; len--; 1303 FcChar32 fc = *text++; len--;
1228 FT_UInt gl;
1229 1304
1230 while (len && *text == NOCHAR) 1305 while (len && *text == NOCHAR)
1231 text++, len--, cwidth += r->TermWin.fwidth; 1306 text++, len--, cwidth += term->fwidth;
1232 1307
1233 gl = XftCharIndex (d.display->display, f, fc); 1308 if (fc != ' ') // skip spaces
1234 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1235
1236 if (extents.xOff != cwidth && ep != enc)
1237 {
1238 if (xoff > ewidth) xoff = ewidth;
1239 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1240 x + (ewidth - xoff >> 1),
1241 y + base, enc, ep - enc);
1242 x += ewidth;
1243
1244 ep = enc;
1245 ewidth = 0;
1246 xoff = 0;
1247 } 1309 {
1310 FT_UInt glyph = XftCharIndex (disp, f, fc);
1311 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1248 1312
1249 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++;
1250 { 1321 }
1322
1251 x += cwidth; 1323 x += cwidth;
1252 continue;
1253 }
1254
1255 else
1256 {
1257 *ep++ = gl;
1258 ewidth += cwidth;
1259 xoff += extents.xOff;
1260 }
1261 } 1324 }
1262 1325
1263 if (ep != enc) 1326 if (ep != enc)
1264 {
1265 if (xoff > ewidth) xoff = ewidth;
1266 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1327 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1267 x + (ewidth - xoff >> 1),
1268 y + base, enc, ep - enc);
1269 }
1270} 1328}
1271#endif 1329#endif
1272 1330
1273///////////////////////////////////////////////////////////////////////////// 1331/////////////////////////////////////////////////////////////////////////////
1274 1332
1275rxvt_fontset::rxvt_fontset (rxvt_t r) 1333rxvt_fontset::rxvt_fontset (rxvt_term *term)
1276: r (r), fontdesc (0) 1334: fontdesc (0), term (term)
1277{ 1335{
1278 clear (); 1336 clear ();
1279} 1337}
1280 1338
1281rxvt_fontset::~rxvt_fontset () 1339rxvt_fontset::~rxvt_fontset ()
… …
1284} 1342}
1285 1343
1286void 1344void
1287rxvt_fontset::clear () 1345rxvt_fontset::clear ()
1288{ 1346{
1289 prop.width = prop.height = prop.weight = prop.slant 1347 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1290 = rxvt_fontprop::unset; 1348 = rxvt_fontprop::unset;
1291 1349
1292 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1350 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1293 FONT_UNREF (*i); 1351 FONT_UNREF (*i);
1294 1352
… …
1325 f = new rxvt_font_x11; 1383 f = new rxvt_font_x11;
1326 } 1384 }
1327 else 1385 else
1328 f = new rxvt_font_x11; 1386 f = new rxvt_font_x11;
1329 1387
1330 f->set_term (r); 1388 f->set_term (term);
1331 f->set_name (strdup (name)); 1389 f->set_name (strdup (name));
1332 1390
1333 f->cs = cs; 1391 f->cs = cs;
1334 f->loaded = false; 1392 f->loaded = false;
1335 1393
… …
1346 char buf[512]; 1404 char buf[512];
1347 const char *end; 1405 const char *end;
1348 1406
1349 do 1407 do
1350 { 1408 {
1351 while (*desc <= ' ') desc++; 1409 while (*desc && *desc <= ' ')
1410 desc++;
1352 1411
1353 codeset cs = CS_UNICODE; 1412 codeset cs = CS_UNICODE;
1354 1413
1355 if (*desc == '[') 1414 if (*desc == '[')
1356 { 1415 {
… …
1466 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1525 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1467 goto next_font; 1526 goto next_font;
1468 1527
1469 if (!realize_font (i)) 1528 if (!realize_font (i))
1470 goto next_font; 1529 goto next_font;
1530
1531 if (prop.ascent != rxvt_fontprop::unset)
1532 max_it (f->ascent, prop.ascent);
1471 } 1533 }
1472 1534
1473 if (f->cs == CS_UNKNOWN) 1535 if (f->cs == CS_UNKNOWN)
1474 goto next_font; 1536 goto next_font;
1475 1537
… …
1514 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1576 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1515 FcPatternAddBool (p, FC_MINSPACE, 1); 1577 FcPatternAddBool (p, FC_MINSPACE, 1);
1516 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1578 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1517 1579
1518 XftResult result; 1580 XftResult result;
1519 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1581 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1520 1582
1521 FcPatternDestroy (p); 1583 FcPatternDestroy (p);
1522 1584
1523 if (match) 1585 if (match)
1524 { 1586 {

Diff Legend

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