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.84 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.145 by root, Fri Jan 25 16:04:57 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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"
25#include "rxvtutil.h" 24#include "rxvtutil.h"
26#include "rxvtfont.h" 25#include "rxvtfont.h"
27 26
28#include <cstdlib> 27#include <cstdlib>
29#include <wchar.h> 28
30#include <inttypes.h> 29#include <inttypes.h>
31 30
32#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width 31#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
32#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
33
34#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
35 (prop)->slant >= rxvt_fontprop::italic \
36 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
37 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
38 ))
33 39
34const struct rxvt_fallback_font { 40const struct rxvt_fallback_font {
35 codeset cs; 41 codeset cs;
36 const char *name; 42 const char *name;
37} fallback_fonts[] = { 43} fallback_fonts[] = {
38 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 44 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
39 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 45 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
40 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
41 47
42#if ENCODING_EU 48#if ENCODING_EU
43 // cyrillic 49 // cyrillic
44 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 50 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
45 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 51 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
46 52
47 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 53 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
48 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 54 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
49 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 55 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
50 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 56 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
51 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 57 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
57 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 63 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
58 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 64 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
59 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 65 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
60 66
61# if XFT 67# if XFT
62 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 68 { CS_KOI8_U, "xft::lang=ru" },
63 69
64 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 70 { CS_ISO8859_5, "xft::lang=ru" },
65 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 71 { CS_ISO8859_6, "xft::lang=ar" },
66 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 72 { CS_ISO8859_7, "xft::lang=el" },
67 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 73 { CS_ISO8859_8, "xft::lang=he" },
68 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 74 { CS_ISO8859_9, "xft::lang=tr" },
69 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 75 { CS_ISO8859_10, "xft::lang=se" },
70 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 76 { CS_ISO8859_11, "xft::lang=th" },
71# endif 77# endif
72#endif 78#endif
73 79
74 // japanese 80 // japanese
75#if ENCODING_JP || ENCODING_JP_EXT 81#if ENCODING_JP || ENCODING_JP_EXT
76# if XFT 82# if XFT
77 // prefer xft for complex scripts 83 // prefer xft for complex scripts
78 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 84 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
79 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, 85 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
80 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 86 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
81 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 87 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
82# endif 88# endif
83 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 89 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
84 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 90 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
85 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 91 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
86 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 92 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
… …
90 96
91#if ENCODING_ZH || ENCODING_ZH_EXT 97#if ENCODING_ZH || ENCODING_ZH_EXT
92# if XFT 98# if XFT
93 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 99 { CS_GBK_0, "xft:AR PL KaitiM GB" },
94 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 100 { CS_GBK_0, "xft:AR PL SungtiL GB" },
95 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 101 { CS_GBK_0, "xft::lang=zh" },
96 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 102 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
97 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
98 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 104 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
99 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
100 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 106 { CS_GB2312_1980_0, "xft::lang=zh" },
101# endif 107# endif
102 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 108 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
103 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 109 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
104 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 110 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
105 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 111 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
118#if ENCODING_KR 124#if ENCODING_KR
119 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 125 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
120 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 126 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
121# if XFT 127# if XFT
122 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 128 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
123 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
124# endif 130# endif
125#endif 131#endif
126 132
127 // generic font fallback
128 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 133 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
129 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 134 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
130 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
131 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
132#if XFT 135#if XFT
133 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
134 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 137 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
135 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 138 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
136 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 139 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
137 140
138 // FreeMono is usually uglier than x fonts, so try last only. 141 // FreeMono is usually uglier than x fonts, so try after the others
139 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 142 { CS_UNICODE, "xft:FreeMono:autohint=true" },
140#endif 143#endif
141 144
145 // generic font fallback, put this last, as many iso10646 fonts have extents
146 // specified for all glyphs in the range they cover, but most are simply empty
147 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
148 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
142 { CS_UNKNOWN, 0 } 149 { CS_UNKNOWN, 0 }
143}; 150};
144 151
145// these characters are used to guess the font height and width 152// these characters are used to guess the font height and width
146// pango uses a similar algorithm and doesn't trust the font either. 153// pango uses a similar algorithm and doesn't trust the font either.
… …
150 0x304c, 0x672c, // が本 157 0x304c, 0x672c, // が本
151}; 158};
152 159
153#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
154 161
155#define dTermDisplay Display *disp = term->display->display 162#define dTermDisplay Display *disp = term->dpy
156#define dTermGC GC gc = term->gc 163#define dTermGC GC gc = term->gc
157 164
158///////////////////////////////////////////////////////////////////////////// 165/////////////////////////////////////////////////////////////////////////////
159
160#if XFT
161rxvt_drawable::~rxvt_drawable ()
162{
163 if (xftdrawable)
164 XftDrawDestroy (xftdrawable);
165}
166
167rxvt_drawable::operator XftDraw *()
168{
169 if (!xftdrawable)
170 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
171
172 return xftdrawable;
173}
174#endif
175
176/////////////////////////////////////////////////////////////////////////////
177
178static void *enc_buf;
179static uint32_t enc_len;
180
181static inline void *
182get_enc_buf (uint32_t len)
183{
184 if (len > enc_len)
185 {
186 free (enc_buf);
187 enc_buf = malloc (len);
188 enc_len = len;
189 }
190
191 return enc_buf;
192}
193 166
194static const char * 167static const char *
195enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 168enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
196{ 169{
197 uint8_t *buf = (uint8_t *)get_enc_buf (len); 170 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
171 uint8_t *res = buf;
198 172
199 while (len--) 173 while (len--)
200 { 174 {
201 uint32_t c = FROM_UNICODE (cs, *text++); 175 uint32_t c = FROM_UNICODE (cs, *text++);
202 176
… …
207 } 181 }
208 182
209 *buf++ = c; 183 *buf++ = c;
210 } 184 }
211 185
212 return (const char *)enc_buf; 186 return (const char *)res;
213} 187}
214 188
215static const XChar2b * 189static const XChar2b *
216enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 190enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
217{ 191{
218 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 192 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
193 XChar2b *res = buf;
219 194
220 while (len--) 195 while (len--)
221 { 196 {
222 uint32_t c = FROM_UNICODE (cs, *text++); 197 uint32_t c = FROM_UNICODE (cs, *text++);
223 198
… …
230 buf->byte1 = c >> 8; 205 buf->byte1 = c >> 8;
231 buf->byte2 = c; 206 buf->byte2 = c;
232 buf++; 207 buf++;
233 } 208 }
234 209
235 return (XChar2b *)enc_buf; 210 return res;
236} 211}
237 212
238///////////////////////////////////////////////////////////////////////////// 213/////////////////////////////////////////////////////////////////////////////
214
215rxvt_font::rxvt_font ()
216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217{
218}
239 219
240void 220void
241rxvt_font::set_name (char *name) 221rxvt_font::set_name (char *name)
242{ 222{
243 if (this->name == name) 223 if (this->name == name)
… …
250void 230void
251rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 231rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
252{ 232{
253 dTermDisplay; 233 dTermDisplay;
254 dTermGC; 234 dTermGC;
255 235
256 if (color == Color_bg) 236 if (color == Color_bg || color == Color_transparent)
257 XClearArea (disp, d, x, y, w, h, FALSE); 237 XClearArea (disp, d, x, y, w, h, false);
258 else if (color >= 0) 238 else if (color >= 0)
259 { 239 {
260#if XFT 240#if XFT
241 Picture dst;
242
243# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap
245 && !term->pix_colors[color].is_opaque ()
246 && ((dst = XftDrawPicture (d))))
247 {
248 XClearArea (disp, d, x, y, w, h, false);
249
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
251 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 }
253 else
254# endif
261 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 255 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
256
262#else 257#else
263 XSetForeground (disp, gc, term->pix_colors[color]); 258 XSetForeground (disp, gc, term->pix_colors[color]);
264 XFillRectangle (disp, d, gc, x, y, w, h); 259 XFillRectangle (disp, d, gc, x, y, w, h);
265#endif 260#endif
266 } 261 }
267} 262}
268 263
269#include "table/linedraw.h" 264/////////////////////////////////////////////////////////////////////////////
270 265
271struct rxvt_font_default : rxvt_font { 266struct rxvt_font_default : rxvt_font {
272 struct rxvt_fontset *fs; 267 struct rxvt_fontset *fs;
273 268
274 rxvt_font_default (rxvt_fontset *fs) 269 rxvt_font_default (rxvt_fontset *fs)
… …
287 p.slant = rxvt_fontprop::roman; 282 p.slant = rxvt_fontprop::roman;
288 283
289 return p; 284 return p;
290 } 285 }
291 286
292 bool load (const rxvt_fontprop &prop) 287 bool load (const rxvt_fontprop &prop, bool force_prop)
293 { 288 {
294 width = 1; height = 1; 289 width = 1; height = 1;
295 ascent = 1; descent = 0; 290 ascent = 1; descent = 0;
296 291
297 set_name (strdup ("built-in support font")); 292 set_name (strdup ("built-in support font"));
… …
310 return false; 305 return false;
311 306
312 if (unicode <= 0x009f) 307 if (unicode <= 0x009f)
313 return true; 308 return true;
314 309
310#ifdef BUILTIN_GLYPHS
315 if (unicode >= 0x2500 && unicode <= 0x259f && 311 if (unicode >= 0x2500 && unicode <= 0x259f &&
316 !term->option (Opt_skipBuiltinGlyphs)) 312 !term->option (Opt_skipBuiltinGlyphs))
317 return true; 313 return true;
314#endif
318 315
319 if (IS_COMPOSE (unicode)) 316 if (IS_COMPOSE (unicode))
320 return true; 317 return true;
321 318
322 switch (unicode) 319 switch (unicode)
… …
358 ; 355 ;
359 356
360 int width = text - tp; 357 int width = text - tp;
361 int fwidth = term->fwidth * width; 358 int fwidth = term->fwidth * width;
362 359
360#ifdef BUILTIN_GLYPHS
363 if (0x2500 <= t && t <= 0x259f) 361 if (0x2500 <= t && t <= 0x259f)
364 { 362 {
363# include "table/linedraw.h"
365 uint16_t offs = linedraw_offs[t - 0x2500]; 364 uint16_t offs = linedraw_offs[t - 0x2500];
366 uint32_t *a = linedraw_command + (offs >> 4); 365 uint32_t *a = linedraw_command + (offs >> 4);
367 uint32_t *b = a + (offs & 15); 366 uint32_t *b = a + (offs & 15);
368 367
369 int W = fwidth; 368 int W = fwidth;
… …
407 406
408 case 1: // rectangle, possibly stippled 407 case 1: // rectangle, possibly stippled
409 if (a) 408 if (a)
410 { 409 {
411 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 410 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
412 411
413 gcv.fill_style = FillStippled; 412 gcv.fill_style = FillStippled;
414 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 413 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
415 gcv.ts_x_origin = x; 414 gcv.ts_x_origin = x;
416 gcv.ts_y_origin = y; 415 gcv.ts_y_origin = y;
417 416
… …
436 (a - 1) * 90*64, (b - 1) * 90*64); 435 (a - 1) * 90*64, (b - 1) * 90*64);
437 break; 436 break;
438 } 437 }
439 } 438 }
440 } 439 }
440#else
441 if (0)
442 ;
443#endif
441#if ENABLE_COMBINING 444#if ENABLE_COMBINING
442 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
443 { 446 {
447 min_it (width, 2); // we only support wcwidth up to 2
448
444 text_t chrs[2]; 449 text_t chrs[2];
445 width = min (2, width);
446 chrs [1] = NOCHAR; 450 chrs [1] = NOCHAR;
447 451
448 *chrs = cc->c1; 452 *chrs = cc->c1;
449 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 453 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
450 f1->draw (d, x, y, chrs, width, fg, bg); 454 f1->draw (d, x, y, chrs, width, fg, bg);
… …
457 *chrs = cc->c2; 461 *chrs = cc->c2;
458 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
459 ? f1 463 ? f1
460 : (*fs)[fs->find_font (cc->c2)]; 464 : (*fs)[fs->find_font (cc->c2)];
461 465
462 f2->draw (d, x, y, chrs, width, fg, -1); 466 f2->draw (d, x, y, chrs, width, fg, Color_none);
463 } 467 }
464 } 468 }
465#endif 469#endif
466 else 470 else
467 switch (t) 471 switch (t)
… …
487 491
488 void clear (); 492 void clear ();
489 493
490 rxvt_fontprop properties (); 494 rxvt_fontprop properties ();
491 495
492 bool load (const rxvt_fontprop &prop); 496 bool load (const rxvt_fontprop &prop, bool force_prop);
493 497
494 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; 498 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
495 499
496 void draw (rxvt_drawable &d, int x, int y, 500 void draw (rxvt_drawable &d, int x, int y,
497 const text_t *text, int len, 501 const text_t *text, int len,
498 int fg, int bg); 502 int fg, int bg);
499 503
500 bool slow; // wether this is a proportional font or has other funny characteristics 504 bool slow; // wether this is a proportional font or has other funny characteristics
501 XFontStruct *f; 505 XFontStruct *f;
502 codeset cs;
503 bool enc2b, encm; 506 bool enc2b, encm;
504 507
505 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 508 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
506 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 509 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
507 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 510 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
508 bool set_properties (rxvt_fontprop &p, const char *name); 511 bool set_properties (rxvt_fontprop &p, const char *name);
509}; 512};
510 513
511char * 514char *
512rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 515rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
513{ 516{
514 unsigned long value; 517 unsigned long value;
515 518
516 if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value)) 519 if (XGetFontProperty (f, property, &value))
517 return XGetAtomName (term->display->display, value); 520 return XGetAtomName (term->dpy, value);
518 else 521 else
519 return rxvt_strdup (repl); 522 return repl ? strdup (repl) : 0;
520} 523}
521 524
522rxvt_fontprop 525rxvt_fontprop
523rxvt_font_x11::properties () 526rxvt_font_x11::properties ()
524{ 527{
… …
528} 531}
529 532
530bool 533bool
531rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 534rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
532{ 535{
533 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 536 p.width = width != rxvt_fontprop::unset ? width
537 : avgwidth ? (avgwidth + 1) / 10
538 : (height + 1) / 2;
534 p.height = height; 539 p.height = height;
535 p.ascent = rxvt_fontprop::unset; 540 p.ascent = rxvt_fontprop::unset;
536 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 541 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
537 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 542 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
538 543
… …
543rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 548rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
544{ 549{
545 unsigned long height; 550 unsigned long height;
546 551
547#if 0 552#if 0
548 if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height)) 553 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
549 return false; 554 return false;
550#else 555#else
551 height = f->ascent + f->descent; 556 height = f->ascent + f->descent;
552#endif 557#endif
553 558
554 unsigned long avgwidth; 559 unsigned long avgwidth;
555 if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth)) 560 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
556 avgwidth = 0; 561 avgwidth = 0;
557 562
558 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 563 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
559 char *slant = get_property (f, "SLANT", "r"); 564 char *slant = get_property (f, term->xa [XA_SLANT], "r");
560 565
561 set_properties (p, height, weight, slant, avgwidth); 566 set_properties (p, height, weight, slant, avgwidth);
562 567
563 free (weight); 568 free (weight);
564 free (slant); 569 free (slant);
… …
604 return false; 609 return false;
605} 610}
606 611
607// fix the size of scalable fonts 612// fix the size of scalable fonts
608static bool 613static bool
609replace_field (char *buf, const char *name, int index, const char old, const char *replace) 614replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
610{ 615{
611 int slashes = 0; 616 int slashes = 0;
612 const char *field, *end; 617 const char *field, *end;
613 618
614 for (const char *c = name; *c; c++) 619 for (const char *c = name; *c; c++)
… …
624 break; 629 break;
625 } 630 }
626 631
627 if (slashes >= 13 && (!old || *field == old)) 632 if (slashes >= 13 && (!old || *field == old))
628 { 633 {
629 // TODO: check for overflow in font-name 634 size_t len = field - name;
630 strncpy (buf, name, field - name); 635 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
631 buf += field - name; 636 memcpy (*ptr, name, len);
632 strcpy (buf, replace); 637 strcpy (*ptr + len, replace);
633 strcat (buf, end); 638 strcat (*ptr, end);
634 639
635 return true; 640 return true;
636 } 641 }
637 else 642 else
638 { 643 {
639 strcpy (buf, name); 644 *ptr = strdup (name);
640 645
641 return false; 646 return false;
642 } 647 }
643} 648}
644 649
645bool 650bool
646rxvt_font_x11::load (const rxvt_fontprop &prop) 651rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
647{ 652{
648 dTermDisplay; 653 dTermDisplay;
649 654
650 clear (); 655 clear ();
651 656
652 char field_str[64]; // enough for 128 bits 657 char field_str[64]; // enough for 128 bits
653 658
654 // first morph the font if required 659 // first morph the font if required
655 if (prop.weight != rxvt_fontprop::unset 660 if (force_prop)
656 || prop.slant != rxvt_fontprop::unset)
657 { 661 {
658 char fname[1024]; 662 char *fname;
659 663
660 if (name[0] != '-') 664 if (name[0] != '-')
661 { 665 {
662 f = XLoadQueryFont (disp, name); 666 f = XLoadQueryFont (disp, name);
663 667
664 if (!f) 668 if (!f)
665 return false; 669 return false;
666 670
667 char *new_name = get_property (f, "FONT", name); 671 char *new_name = get_property (f, XA_FONT, name);
668 672
669 if (new_name) 673 if (new_name)
670 set_name (new_name); 674 set_name (new_name);
671 else 675 else
672 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
675 f = 0; 679 f = 0;
676 } 680 }
677 681
678 if (prop.weight != rxvt_fontprop::unset) 682 if (prop.weight != rxvt_fontprop::unset)
679 { 683 {
680 replace_field (fname, name, 2, 0, 684 replace_field (&fname, name, 2, 0,
681 prop.weight < rxvt_fontprop::bold 685 prop.weight < rxvt_fontprop::bold
682 ? "medium" : "bold"); 686 ? "medium" : "bold");
683 set_name (strdup (fname)); 687 set_name (fname);
684 } 688 }
685 689
686 if (prop.slant != rxvt_fontprop::unset) 690 if (prop.slant != rxvt_fontprop::unset)
687 { 691 {
688 replace_field (fname, name, 3, 0, 692 replace_field (&fname, name, 3, 0,
689 prop.slant < rxvt_fontprop::italic 693 prop.slant < rxvt_fontprop::italic
690 ? "r" : "i"); // TODO: handle "o"blique, too 694 ? "r" : "i"); // TODO: handle "o"blique, too
691 set_name (strdup (fname)); 695 set_name (fname);
692 } 696 }
693 } 697 }
694 698
695 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 699 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
696 ? 0 : prop.height); 700 ? 0 : prop.height);
… …
721 font_weight *fonts = new font_weight[count]; 725 font_weight *fonts = new font_weight[count];
722 726
723 for (int i = 0; i < count; i++) 727 for (int i = 0; i < count; i++)
724 { 728 {
725 rxvt_fontprop p; 729 rxvt_fontprop p;
726 char fname[1024]; 730 char *fname;
727 731
728 int diff = 0; 732 int diff = 0;
729 733
730 if (replace_field (fname, list[i], 6, '0', field_str)) 734 if (replace_field (&fname, list[i], 6, '0', field_str))
731 diff += 10; // slightly penalize scalable fonts 735 diff += 10; // slightly penalize scalable fonts
736 else
737 {
738 free (fname);
732 else if (replace_field (fname, list[i], 11, '0', "0")) 739 if (replace_field (&fname, list[i], 11, '0', "0"))
733 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 }
734 742
735 if (!set_properties (p, fname)) 743 if (!set_properties (p, fname))
736 continue; 744 continue;
737 745
738 if (prop.height != rxvt_fontprop::unset 746 if (prop.height != rxvt_fontprop::unset
… …
742 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 750 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
743 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 751 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
744 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 752 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
745 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 753 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
746 754
747 fonts[i].name = strdup (fname); 755 fonts[i].name = fname;
748 fonts[i].diff = diff; 756 fonts[i].diff = diff;
749 } 757 }
750 758
751 XFreeFontNames (list); 759 XFreeFontNames (list);
752 760
… …
781 delete [] fonts; 789 delete [] fonts;
782 790
783 if (!f) 791 if (!f)
784 return false; 792 return false;
785 793
786 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
787 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
788 796
789 if (registry && encoding) 797 if (registry && encoding)
790 { 798 {
791 char charset[64]; 799 char charset[64];
792 snprintf (charset, 64, "%s-%s", registry, encoding); 800 snprintf (charset, 64, "%s-%s", registry, encoding);
793 801
794 cs = codeset_from_name (charset); 802 cs = codeset_from_name (charset);
795 } 803 }
796 else 804 else
797 { 805 {
798 const char *charset = get_property (f, "FONT", 0); 806 const char *charset = get_property (f, XA_FONT, 0);
799 807
800 if (!charset) 808 if (!charset)
801 charset = name; 809 charset = name;
802 810
803 int count = 13; 811 int count = 13;
… …
818 enc2b = encm || f->max_char_or_byte2 > 255; 826 enc2b = encm || f->max_char_or_byte2 > 255;
819 827
820 slow = false; 828 slow = false;
821 829
822#if 1 // only used for slow detection, TODO optimize 830#if 1 // only used for slow detection, TODO optimize
823 if (f->min_bounds.width == f->max_bounds.width) 831 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
824 width = f->min_bounds.width;
825 else if (f->per_char == NULL)
826 width = f->max_bounds.width; 832 width = f->max_bounds.width;
827 else 833 else
828 { 834 {
829 slow = true; 835 slow = true;
830 836
831 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 837 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
832 838
833 if (encm) 839 if (encm)
834 N += (f->max_byte1 - f->min_byte1) 840 N += (f->max_byte1 - f->min_byte1)
835 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 841 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
836 842
837 while (N) 843 while (N)
838 { 844 {
839 if (f->per_char[N].width > width) 845 if (f->per_char[N].width > width)
840 width = f->per_char[N].width; 846 width = f->per_char[N].width;
841 847
… …
846 852
847 width = 1; 853 width = 1;
848 854
849 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 855 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
850 { 856 {
851 if (cs != CS_UNICODE
852 && *t > 0x100
853 && FROM_UNICODE (cs, *t) == NOCHAR) 857 if (FROM_UNICODE (cs, *t) == NOCHAR)
854 continue; 858 continue;
855 859
856 // ignore characters we wouldn't use anyways 860 // ignore characters we wouldn't use anyways
857 bool careful; 861 bool careful;
858 if (!has_char (*t, &prop, careful)) 862 if (!has_char (*t, &prop, careful))
… …
862 866
863 XCharStruct g; 867 XCharStruct g;
864 int dir_ret, asc_ret, des_ret; 868 int dir_ret, asc_ret, des_ret;
865 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 869 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
866 870
871 int wcw = WCWIDTH (*t);
867 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 872 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
868 873
869 if (width < g.width) width = g.width; 874 if (width < g.width) width = g.width;
870 } 875 }
871 876
872 if (cs == CS_UNKNOWN) 877 if (cs == CS_UNKNOWN)
873 { 878 {
874 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 879 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
891void 896void
892rxvt_font_x11::clear () 897rxvt_font_x11::clear ()
893{ 898{
894 if (f) 899 if (f)
895 { 900 {
896 XFreeFont (term->display->display, f); 901 XFreeFont (term->dpy, f);
897 f = 0; 902 f = 0;
898 } 903 }
899} 904}
900 905
901bool 906bool
… …
944 return false; 949 return false;
945 950
946 if (!prop || prop->width == rxvt_fontprop::unset) 951 if (!prop || prop->width == rxvt_fontprop::unset)
947 return true; 952 return true;
948 953
949 // check character against base font bounding box 954 // check wether character overlaps previous/next character
950 int w = xcs->width; 955 int w = xcs->rbearing - xcs->lbearing;
951 int wcw = wcwidth (unicode); 956 int wcw = max (WCWIDTH (unicode), 1);
952 if (wcw > 0) w = (w + wcw - 1) / wcw;
953 957
954 careful = w > prop->width; 958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
955 if (careful && w > prop->width * MAX_OVERLAP >> 2) 959
960 if (careful && !OVERLAP_OK (w, wcw, prop))
956 return false; 961 return false;
957 962
958 return true; 963 return true;
959} 964}
960 965
… …
994 else 999 else
995 { 1000 {
996 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1001 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
997 1002
998 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1003 XChangeGC (disp, gc, GCForeground | GCFont, &v);
999 1004
1000 if (slow) 1005 if (slow)
1001 { 1006 {
1002 do 1007 do
1003 { 1008 {
1004 if (xc->byte1 || xc->byte2) 1009 if (xc->byte1 || xc->byte2)
… …
1026 else 1031 else
1027 { 1032 {
1028 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1033 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1029 1034
1030 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1035 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1031 1036
1032 if (slow) 1037 if (slow)
1033 { 1038 {
1034 do 1039 do
1035 { 1040 {
1036 if (*xc) 1041 if (*xc)
… …
1056 1061
1057 void clear (); 1062 void clear ();
1058 1063
1059 rxvt_fontprop properties (); 1064 rxvt_fontprop properties ();
1060 1065
1061 bool load (const rxvt_fontprop &prop); 1066 bool load (const rxvt_fontprop &prop, bool force_prop);
1062 1067
1063 void draw (rxvt_drawable &d, int x, int y, 1068 void draw (rxvt_drawable &d, int x, int y,
1064 const text_t *text, int len, 1069 const text_t *text, int len,
1065 int fg, int bg); 1070 int fg, int bg);
1066 1071
1067 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1072 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1068 1073
1069protected: 1074protected:
1070 XftFont *f; 1075 XftFont *f;
1071}; 1076};
1072 1077
1073void 1078void
1074rxvt_font_xft::clear () 1079rxvt_font_xft::clear ()
1075{ 1080{
1076 if (f) 1081 if (f)
1077 { 1082 {
1078 XftFontClose (term->display->display, f); 1083 XftFontClose (term->dpy, f);
1079 f = 0; 1084 f = 0;
1080 } 1085 }
1081} 1086}
1082 1087
1083rxvt_fontprop 1088rxvt_fontprop
… …
1099 1104
1100 return p; 1105 return p;
1101} 1106}
1102 1107
1103bool 1108bool
1104rxvt_font_xft::load (const rxvt_fontprop &prop) 1109rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1105{ 1110{
1106 dTermDisplay; 1111 dTermDisplay;
1107 1112
1108 clear (); 1113 clear ();
1109 1114
… …
1118 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1123 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1119 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1124 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1120 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1125 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1121 1126
1122 if (prop.weight != rxvt_fontprop::unset 1127 if (prop.weight != rxvt_fontprop::unset
1123 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1128 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1124 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1129 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1125 1130
1126 if (prop.slant != rxvt_fontprop::unset 1131 if (prop.slant != rxvt_fontprop::unset
1127 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1132 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1128 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1133 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1129 1134
1130#if 0 // clipping unfortunately destroys our precious double-width-characters 1135#if 0 // clipping unfortunately destroys our precious double-width-characters
1131 // clip width, we can't do better, or can we? 1136 // clip width, we can't do better, or can we?
1132 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1190 XGlyphInfo g; 1195 XGlyphInfo g;
1191 XftTextExtents16 (disp, f, &ch, 1, &g); 1196 XftTextExtents16 (disp, f, &ch, 1, &g);
1192 1197
1193 g.width -= g.x; 1198 g.width -= g.x;
1194 1199
1195 int wcw = wcwidth (ch); 1200 int wcw = WCWIDTH (ch);
1196 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1201 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1197 1202
1198 if (width < g.width ) width = g.width; 1203 if (width < g.width ) width = g.width;
1199 if (height < g.height ) height = g.height; 1204 if (height < g.height ) height = g.height;
1200 if (glheight < g.height - g.y) glheight = g.height - g.y; 1205 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1250bool 1255bool
1251rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1256rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1252{ 1257{
1253 careful = false; 1258 careful = false;
1254 1259
1255 if (!XftCharExists (term->display->display, f, unicode)) 1260 if (!XftCharExists (term->dpy, f, unicode))
1256 return false; 1261 return false;
1257 1262
1258 if (!prop || prop->width == rxvt_fontprop::unset) 1263 if (!prop || prop->width == rxvt_fontprop::unset)
1259 return true; 1264 return true;
1260 1265
1261 // check character against base font bounding box 1266 // check character against base font bounding box
1262 FcChar32 ch = unicode; 1267 FcChar32 ch = unicode;
1263 XGlyphInfo g; 1268 XGlyphInfo g;
1264 XftTextExtents32 (term->display->display, f, &ch, 1, &g); 1269 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1265 1270
1266 int w = g.width - g.x; 1271 int w = g.width - g.x;
1267 int wcw = wcwidth (unicode); 1272 int wcw = max (WCWIDTH (unicode), 1);
1268 if (wcw > 0) w = (w + wcw - 1) / wcw;
1269 1273
1270 careful = w > prop->width; 1274 careful = g.x > 0 || w > prop->width * wcw;
1271 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1275
1276 if (careful && !OVERLAP_OK (w, wcw, prop))
1277 return false;
1278
1279 // this weeds out _totally_ broken fonts, or glyphs
1280 if (!OVERLAP_OK (g.xOff, wcw, prop))
1272 return false; 1281 return false;
1273 1282
1274 return true; 1283 return true;
1275} 1284}
1276 1285
1277void 1286void
1278rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1279 const text_t *text, int len, 1288 const text_t *text, int len,
1280 int fg, int bg) 1289 int fg, int bg)
1281{ 1290{
1282 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1283
1284 XGlyphInfo extents; 1291 XGlyphInfo extents;
1285 XftGlyphSpec *enc = (XftGlyphSpec *)get_enc_buf (len * sizeof (XftGlyphSpec)); 1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1286 XftGlyphSpec *ep = enc; 1293 XftGlyphSpec *ep = enc;
1287 1294
1288 dTermDisplay; 1295 dTermDisplay;
1289 dTermGC; 1296 dTermGC;
1297
1298 int w = term->fwidth * len;
1299 int h = term->fheight;
1300
1301 /*
1302 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1303 * good idea from the perspective of packaging for wide variety of user configs.
1304 */
1305 bool buffered = bg >= Color_transparent;
1306#ifdef FORCE_UNBUFFERED_XFT
1307 buffered = false;
1308#endif
1290 1309
1291 // cut trailing spaces 1310 // cut trailing spaces
1292 while (len && text [len - 1] == ' ') 1311 while (len && text [len - 1] == ' ')
1293 len--; 1312 len--;
1294 1313
1314 int x_ = buffered ? 0 : x;
1315 int y_ = buffered ? 0 : y;
1316
1295 while (len) 1317 while (len)
1296 { 1318 {
1297 int cwidth = term->fwidth; 1319 int cwidth = term->fwidth;
1298 FcChar32 fc = *text++; len--; 1320 FcChar32 fc = *text++; len--;
1299 1321
1300 while (len && *text == NOCHAR) 1322 while (len && *text == NOCHAR)
1301 text++, len--, cwidth += term->fwidth; 1323 text++, len--, cwidth += term->fwidth;
1302 1324
1303 if (fc != ' ') // skip spaces 1325 if (fc != ' ') // skip spaces
1304 { 1326 {
1305 FT_UInt glyph = XftCharIndex (disp, f, fc); 1327 FT_UInt glyph = XftCharIndex (disp, f, fc);
1306 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1328 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1307 1329
1308 ep->glyph = glyph; 1330 ep->glyph = glyph;
1309 ep->x = x + (cwidth - extents.xOff >> 1); 1331 ep->x = x_ + (cwidth - extents.xOff >> 1);
1310 ep->y = y + ascent; 1332 ep->y = y_ + ascent;
1333
1334 if (extents.xOff == 0)
1335 ep->x = x_ + cwidth;
1336
1311 ep++; 1337 ep++;
1312 } 1338 }
1313 1339
1314 x += cwidth; 1340 x_ += cwidth;
1341 }
1342
1343 if (buffered)
1315 } 1344 {
1316
1317 if (ep != enc) 1345 if (ep != enc)
1346 {
1347 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1348
1349#ifdef HAVE_BG_PIXMAP
1350 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1351
1352 if (term->bgPixmap.pixmap
1353 && (bg == Color_transparent || bg == Color_bg
1354 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1355 {
1356 int src_x = x, src_y = y;
1357
1358 if (term->bgPixmap.is_parentOrigin ())
1359 {
1360 src_x += term->window_vt_x;
1361 src_y += term->window_vt_y;
1362 }
1363
1364 if (term->bgPixmap.pmap_width >= src_x + w
1365 && term->bgPixmap.pmap_height >= src_y + h)
1366 {
1367 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1368 src_x, src_y, w, h, 0, 0);
1369 }
1370 else
1371 {
1372 XGCValues gcv;
1373
1374 gcv.fill_style = FillTiled;
1375 gcv.tile = term->bgPixmap.pixmap;
1376 gcv.ts_x_origin = -src_x;
1377 gcv.ts_y_origin = -src_y;
1378
1379 XChangeGC (disp, gc,
1380 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1381 &gcv);
1382
1383 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1384
1385 gcv.fill_style = FillSolid;
1386 XChangeGC (disp, gc, GCFillStyle, &gcv);
1387 }
1388
1389 if (dst)
1390 {
1391 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1392
1393 // dst can only be set when bg >= 0
1394 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1395 }
1396 }
1397 else
1398#endif
1399 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1400
1401 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1402 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1403 }
1404 else
1405 clear_rect (d, x, y, w, h, bg);
1406 }
1407 else
1408 {
1409 clear_rect (d, x, y, w, h, bg);
1318 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1410 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1411 }
1319} 1412}
1413
1320#endif 1414#endif
1321 1415
1322///////////////////////////////////////////////////////////////////////////// 1416/////////////////////////////////////////////////////////////////////////////
1323 1417
1324rxvt_fontset::rxvt_fontset (rxvt_term *term) 1418rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1335void 1429void
1336rxvt_fontset::clear () 1430rxvt_fontset::clear ()
1337{ 1431{
1338 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1432 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1339 = rxvt_fontprop::unset; 1433 = rxvt_fontprop::unset;
1434 force_prop = false;
1340 1435
1341 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1436 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1342 FONT_UNREF (*i); 1437 FONT_UNREF (*i);
1343 1438
1344 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1439 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1353 1448
1354rxvt_font * 1449rxvt_font *
1355rxvt_fontset::new_font (const char *name, codeset cs) 1450rxvt_fontset::new_font (const char *name, codeset cs)
1356{ 1451{
1357 rxvt_font *f; 1452 rxvt_font *f;
1358 1453
1359 if (!name || !*name) 1454 if (!name || !*name)
1360 { 1455 {
1361 name = ""; 1456 name = "";
1362 f = new rxvt_font_default (this); 1457 f = new rxvt_font_default (this);
1363 } 1458 }
… …
1431 if (!end) 1526 if (!end)
1432 end = desc + strlen (desc); 1527 end = desc + strlen (desc);
1433 1528
1434 if (end - desc < 511) 1529 if (end - desc < 511)
1435 { 1530 {
1436 strncpy (buf, desc, end - desc); 1531 memcpy (buf, desc, end - desc);
1437 buf[end - desc] = 0; 1532 buf[end - desc] = 0;
1438 1533
1439 fonts.push_back (new_font (buf, cs)); 1534 fonts.push_back (new_font (buf, cs));
1440 } 1535 }
1441 else 1536 else
… …
1456 if (fonts[i]->loaded) 1551 if (fonts[i]->loaded)
1457 return true; 1552 return true;
1458 1553
1459 fonts[i]->loaded = true; 1554 fonts[i]->loaded = true;
1460 1555
1461 if (!fonts[i]->load (prop)) 1556 if (!fonts[i]->load (prop, force_prop))
1462 { 1557 {
1463 fonts[i]->cs = CS_UNKNOWN; 1558 fonts[i]->cs = CS_UNKNOWN;
1464 return false; 1559 return false;
1465 } 1560 }
1466 1561
… …
1567 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1662 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1568 FcPatternAddBool (p, FC_MINSPACE, 1); 1663 FcPatternAddBool (p, FC_MINSPACE, 1);
1569 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1664 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1570 1665
1571 XftResult result; 1666 XftResult result;
1572 FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result); 1667 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1573 1668
1574 FcPatternDestroy (p); 1669 FcPatternDestroy (p);
1575 1670
1576 if (match) 1671 if (match)
1577 { 1672 {
… …
1582 if (find_font (font) < 0) 1677 if (find_font (font) < 0)
1583 { 1678 {
1584 char fontname[4096]; 1679 char fontname[4096];
1585 sprintf (fontname, "xft:%-.4090s", font); 1680 sprintf (fontname, "xft:%-.4090s", font);
1586 1681
1587 fonts.push_back (new_font (fontname, CS_UNICODE)); 1682 fonts.push_back (new_font (fontname, CS_UNICODE));
1588 } 1683 }
1589 1684
1590 free (font); 1685 free (font);
1591 } 1686 }
1592#endif 1687#endif

Diff Legend

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