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.85 by root, Wed Jan 25 00:42:21 2006 UTC vs.
Revision 1.133 by root, Wed Jan 23 06:49:30 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-2006 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
… …
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
158/////////////////////////////////////////////////////////////////////////////
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 164
176///////////////////////////////////////////////////////////////////////////// 165/////////////////////////////////////////////////////////////////////////////
177 166
178static const char * 167static const char *
179enc_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)
… …
221 return res; 210 return res;
222} 211}
223 212
224///////////////////////////////////////////////////////////////////////////// 213/////////////////////////////////////////////////////////////////////////////
225 214
215rxvt_font::rxvt_font ()
216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217{
218}
219
226void 220void
227rxvt_font::set_name (char *name) 221rxvt_font::set_name (char *name)
228{ 222{
229 if (this->name == name) 223 if (this->name == name)
230 return; 224 return;
… …
236void 230void
237rxvt_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
238{ 232{
239 dTermDisplay; 233 dTermDisplay;
240 dTermGC; 234 dTermGC;
241 235
242 if (color == Color_bg) 236 if (color == Color_bg || color == Color_transparent)
243 XClearArea (disp, d, x, y, w, h, FALSE); 237 XClearArea (disp, d, x, y, w, h, false);
244 else if (color >= 0) 238 else if (color >= 0)
245 { 239 {
246#if XFT 240#if XFT
241 bool done = false;
242
243# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && !term->pix_colors[color].is_opaque ())
245 {
246 Picture dst = XftDrawPicture (d);
247
248 if (dst != 0)
249 {
250 XClearArea (disp, d, x, y, w, h, false);
251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
252 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
253 done = true;
254 }
255 }
256# endif
257 if (!done)
247 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 258 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
259
248#else 260#else
249 XSetForeground (disp, gc, term->pix_colors[color]); 261 XSetForeground (disp, gc, term->pix_colors[color]);
250 XFillRectangle (disp, d, gc, x, y, w, h); 262 XFillRectangle (disp, d, gc, x, y, w, h);
251#endif 263#endif
252 } 264 }
253} 265}
254 266
255#include "table/linedraw.h" 267/////////////////////////////////////////////////////////////////////////////
256 268
257struct rxvt_font_default : rxvt_font { 269struct rxvt_font_default : rxvt_font {
258 struct rxvt_fontset *fs; 270 struct rxvt_fontset *fs;
259 271
260 rxvt_font_default (rxvt_fontset *fs) 272 rxvt_font_default (rxvt_fontset *fs)
… …
273 p.slant = rxvt_fontprop::roman; 285 p.slant = rxvt_fontprop::roman;
274 286
275 return p; 287 return p;
276 } 288 }
277 289
278 bool load (const rxvt_fontprop &prop) 290 bool load (const rxvt_fontprop &prop, bool force_prop)
279 { 291 {
280 width = 1; height = 1; 292 width = 1; height = 1;
281 ascent = 1; descent = 0; 293 ascent = 1; descent = 0;
282 294
283 set_name (strdup ("built-in support font")); 295 set_name (strdup ("built-in support font"));
… …
296 return false; 308 return false;
297 309
298 if (unicode <= 0x009f) 310 if (unicode <= 0x009f)
299 return true; 311 return true;
300 312
313#ifdef BUILTIN_GLYPHS
301 if (unicode >= 0x2500 && unicode <= 0x259f && 314 if (unicode >= 0x2500 && unicode <= 0x259f &&
302 !term->option (Opt_skipBuiltinGlyphs)) 315 !term->option (Opt_skipBuiltinGlyphs))
303 return true; 316 return true;
317#endif
304 318
305 if (IS_COMPOSE (unicode)) 319 if (IS_COMPOSE (unicode))
306 return true; 320 return true;
307 321
308 switch (unicode) 322 switch (unicode)
… …
344 ; 358 ;
345 359
346 int width = text - tp; 360 int width = text - tp;
347 int fwidth = term->fwidth * width; 361 int fwidth = term->fwidth * width;
348 362
363#ifdef BUILTIN_GLYPHS
349 if (0x2500 <= t && t <= 0x259f) 364 if (0x2500 <= t && t <= 0x259f)
350 { 365 {
366# include "table/linedraw.h"
351 uint16_t offs = linedraw_offs[t - 0x2500]; 367 uint16_t offs = linedraw_offs[t - 0x2500];
352 uint32_t *a = linedraw_command + (offs >> 4); 368 uint32_t *a = linedraw_command + (offs >> 4);
353 uint32_t *b = a + (offs & 15); 369 uint32_t *b = a + (offs & 15);
354 370
355 int W = fwidth; 371 int W = fwidth;
… …
393 409
394 case 1: // rectangle, possibly stippled 410 case 1: // rectangle, possibly stippled
395 if (a) 411 if (a)
396 { 412 {
397 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 413 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
398 414
399 gcv.fill_style = FillStippled; 415 gcv.fill_style = FillStippled;
400 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 416 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
401 gcv.ts_x_origin = x; 417 gcv.ts_x_origin = x;
402 gcv.ts_y_origin = y; 418 gcv.ts_y_origin = y;
403 419
… …
422 (a - 1) * 90*64, (b - 1) * 90*64); 438 (a - 1) * 90*64, (b - 1) * 90*64);
423 break; 439 break;
424 } 440 }
425 } 441 }
426 } 442 }
443#else
444 if (0)
445 ;
446#endif
427#if ENABLE_COMBINING 447#if ENABLE_COMBINING
428 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 448 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
429 { 449 {
450 min_it (width, 2); // we only support wcwidth up to 2
451
430 text_t chrs[2]; 452 text_t chrs[2];
431 width = min (2, width);
432 chrs [1] = NOCHAR; 453 chrs [1] = NOCHAR;
433 454
434 *chrs = cc->c1; 455 *chrs = cc->c1;
435 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 456 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
436 f1->draw (d, x, y, chrs, width, fg, bg); 457 f1->draw (d, x, y, chrs, width, fg, bg);
… …
443 *chrs = cc->c2; 464 *chrs = cc->c2;
444 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 465 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
445 ? f1 466 ? f1
446 : (*fs)[fs->find_font (cc->c2)]; 467 : (*fs)[fs->find_font (cc->c2)];
447 468
448 f2->draw (d, x, y, chrs, width, fg, -1); 469 f2->draw (d, x, y, chrs, width, fg, Color_none);
449 } 470 }
450 } 471 }
451#endif 472#endif
452 else 473 else
453 switch (t) 474 switch (t)
… …
473 494
474 void clear (); 495 void clear ();
475 496
476 rxvt_fontprop properties (); 497 rxvt_fontprop properties ();
477 498
478 bool load (const rxvt_fontprop &prop); 499 bool load (const rxvt_fontprop &prop, bool force_prop);
479 500
480 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; 501 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
481 502
482 void draw (rxvt_drawable &d, int x, int y, 503 void draw (rxvt_drawable &d, int x, int y,
483 const text_t *text, int len, 504 const text_t *text, int len,
484 int fg, int bg); 505 int fg, int bg);
485 506
486 bool slow; // wether this is a proportional font or has other funny characteristics 507 bool slow; // wether this is a proportional font or has other funny characteristics
487 XFontStruct *f; 508 XFontStruct *f;
488 codeset cs;
489 bool enc2b, encm; 509 bool enc2b, encm;
490 510
491 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 511 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
492 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 512 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
493 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 513 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
494 bool set_properties (rxvt_fontprop &p, const char *name); 514 bool set_properties (rxvt_fontprop &p, const char *name);
495}; 515};
496 516
497char * 517char *
498rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 518rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
499{ 519{
500 unsigned long value; 520 unsigned long value;
501 521
502 if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value)) 522 if (XGetFontProperty (f, property, &value))
503 return XGetAtomName (term->display->display, value); 523 return XGetAtomName (term->dpy, value);
504 else 524 else
505 return rxvt_strdup (repl); 525 return repl ? strdup (repl) : 0;
506} 526}
507 527
508rxvt_fontprop 528rxvt_fontprop
509rxvt_font_x11::properties () 529rxvt_font_x11::properties ()
510{ 530{
… …
514} 534}
515 535
516bool 536bool
517rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 537rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
518{ 538{
519 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 539 p.width = width != rxvt_fontprop::unset ? width
540 : avgwidth ? (avgwidth + 1) / 10
541 : (height + 1) / 2;
520 p.height = height; 542 p.height = height;
521 p.ascent = rxvt_fontprop::unset; 543 p.ascent = rxvt_fontprop::unset;
522 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 544 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
523 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 545 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
524 546
… …
529rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 551rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
530{ 552{
531 unsigned long height; 553 unsigned long height;
532 554
533#if 0 555#if 0
534 if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height)) 556 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
535 return false; 557 return false;
536#else 558#else
537 height = f->ascent + f->descent; 559 height = f->ascent + f->descent;
538#endif 560#endif
539 561
540 unsigned long avgwidth; 562 unsigned long avgwidth;
541 if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth)) 563 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
542 avgwidth = 0; 564 avgwidth = 0;
543 565
544 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 566 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
545 char *slant = get_property (f, "SLANT", "r"); 567 char *slant = get_property (f, term->xa [XA_SLANT], "r");
546 568
547 set_properties (p, height, weight, slant, avgwidth); 569 set_properties (p, height, weight, slant, avgwidth);
548 570
549 free (weight); 571 free (weight);
550 free (slant); 572 free (slant);
… …
590 return false; 612 return false;
591} 613}
592 614
593// fix the size of scalable fonts 615// fix the size of scalable fonts
594static bool 616static bool
595replace_field (char *buf, const char *name, int index, const char old, const char *replace) 617replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
596{ 618{
597 int slashes = 0; 619 int slashes = 0;
598 const char *field, *end; 620 const char *field, *end;
599 621
600 for (const char *c = name; *c; c++) 622 for (const char *c = name; *c; c++)
… …
610 break; 632 break;
611 } 633 }
612 634
613 if (slashes >= 13 && (!old || *field == old)) 635 if (slashes >= 13 && (!old || *field == old))
614 { 636 {
615 // TODO: check for overflow in font-name 637 size_t len = field - name;
616 strncpy (buf, name, field - name); 638 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
617 buf += field - name; 639 memcpy (*ptr, name, len);
618 strcpy (buf, replace); 640 strcpy (*ptr + len, replace);
619 strcat (buf, end); 641 strcat (*ptr, end);
620 642
621 return true; 643 return true;
622 } 644 }
623 else 645 else
624 { 646 {
625 strcpy (buf, name); 647 *ptr = strdup (name);
626 648
627 return false; 649 return false;
628 } 650 }
629} 651}
630 652
631bool 653bool
632rxvt_font_x11::load (const rxvt_fontprop &prop) 654rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
633{ 655{
634 dTermDisplay; 656 dTermDisplay;
635 657
636 clear (); 658 clear ();
637 659
638 char field_str[64]; // enough for 128 bits 660 char field_str[64]; // enough for 128 bits
639 661
640 // first morph the font if required 662 // first morph the font if required
641 if (prop.weight != rxvt_fontprop::unset 663 if (force_prop)
642 || prop.slant != rxvt_fontprop::unset)
643 { 664 {
644 char fname[1024]; 665 char *fname;
645 666
646 if (name[0] != '-') 667 if (name[0] != '-')
647 { 668 {
648 f = XLoadQueryFont (disp, name); 669 f = XLoadQueryFont (disp, name);
649 670
650 if (!f) 671 if (!f)
651 return false; 672 return false;
652 673
653 char *new_name = get_property (f, "FONT", name); 674 char *new_name = get_property (f, XA_FONT, name);
654 675
655 if (new_name) 676 if (new_name)
656 set_name (new_name); 677 set_name (new_name);
657 else 678 else
658 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 679 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
661 f = 0; 682 f = 0;
662 } 683 }
663 684
664 if (prop.weight != rxvt_fontprop::unset) 685 if (prop.weight != rxvt_fontprop::unset)
665 { 686 {
666 replace_field (fname, name, 2, 0, 687 replace_field (&fname, name, 2, 0,
667 prop.weight < rxvt_fontprop::bold 688 prop.weight < rxvt_fontprop::bold
668 ? "medium" : "bold"); 689 ? "medium" : "bold");
669 set_name (strdup (fname)); 690 set_name (fname);
670 } 691 }
671 692
672 if (prop.slant != rxvt_fontprop::unset) 693 if (prop.slant != rxvt_fontprop::unset)
673 { 694 {
674 replace_field (fname, name, 3, 0, 695 replace_field (&fname, name, 3, 0,
675 prop.slant < rxvt_fontprop::italic 696 prop.slant < rxvt_fontprop::italic
676 ? "r" : "i"); // TODO: handle "o"blique, too 697 ? "r" : "i"); // TODO: handle "o"blique, too
677 set_name (strdup (fname)); 698 set_name (fname);
678 } 699 }
679 } 700 }
680 701
681 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 702 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
682 ? 0 : prop.height); 703 ? 0 : prop.height);
… …
707 font_weight *fonts = new font_weight[count]; 728 font_weight *fonts = new font_weight[count];
708 729
709 for (int i = 0; i < count; i++) 730 for (int i = 0; i < count; i++)
710 { 731 {
711 rxvt_fontprop p; 732 rxvt_fontprop p;
712 char fname[1024]; 733 char *fname;
713 734
714 int diff = 0; 735 int diff = 0;
715 736
716 if (replace_field (fname, list[i], 6, '0', field_str)) 737 if (replace_field (&fname, list[i], 6, '0', field_str))
717 diff += 10; // slightly penalize scalable fonts 738 diff += 10; // slightly penalize scalable fonts
739 else
740 {
741 free (fname);
718 else if (replace_field (fname, list[i], 11, '0', "0")) 742 if (replace_field (&fname, list[i], 11, '0', "0"))
719 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 743 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
744 }
720 745
721 if (!set_properties (p, fname)) 746 if (!set_properties (p, fname))
722 continue; 747 continue;
723 748
724 if (prop.height != rxvt_fontprop::unset 749 if (prop.height != rxvt_fontprop::unset
… …
728 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 753 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
729 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 754 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
730 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 755 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
731 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 756 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
732 757
733 fonts[i].name = strdup (fname); 758 fonts[i].name = fname;
734 fonts[i].diff = diff; 759 fonts[i].diff = diff;
735 } 760 }
736 761
737 XFreeFontNames (list); 762 XFreeFontNames (list);
738 763
… …
767 delete [] fonts; 792 delete [] fonts;
768 793
769 if (!f) 794 if (!f)
770 return false; 795 return false;
771 796
772 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 797 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
773 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 798 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
774 799
775 if (registry && encoding) 800 if (registry && encoding)
776 { 801 {
777 char charset[64]; 802 char charset[64];
778 snprintf (charset, 64, "%s-%s", registry, encoding); 803 snprintf (charset, 64, "%s-%s", registry, encoding);
779 804
780 cs = codeset_from_name (charset); 805 cs = codeset_from_name (charset);
781 } 806 }
782 else 807 else
783 { 808 {
784 const char *charset = get_property (f, "FONT", 0); 809 const char *charset = get_property (f, XA_FONT, 0);
785 810
786 if (!charset) 811 if (!charset)
787 charset = name; 812 charset = name;
788 813
789 int count = 13; 814 int count = 13;
… …
804 enc2b = encm || f->max_char_or_byte2 > 255; 829 enc2b = encm || f->max_char_or_byte2 > 255;
805 830
806 slow = false; 831 slow = false;
807 832
808#if 1 // only used for slow detection, TODO optimize 833#if 1 // only used for slow detection, TODO optimize
809 if (f->min_bounds.width == f->max_bounds.width) 834 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
810 width = f->min_bounds.width;
811 else if (f->per_char == NULL)
812 width = f->max_bounds.width; 835 width = f->max_bounds.width;
813 else 836 else
814 { 837 {
815 slow = true; 838 slow = true;
816 839
817 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 840 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
818 841
819 if (encm) 842 if (encm)
820 N += (f->max_byte1 - f->min_byte1) 843 N += (f->max_byte1 - f->min_byte1)
821 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 844 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
822 845
823 while (N) 846 while (N)
824 { 847 {
825 if (f->per_char[N].width > width) 848 if (f->per_char[N].width > width)
826 width = f->per_char[N].width; 849 width = f->per_char[N].width;
827 850
… …
832 855
833 width = 1; 856 width = 1;
834 857
835 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 858 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
836 { 859 {
837 if (cs != CS_UNICODE
838 && *t > 0x100
839 && FROM_UNICODE (cs, *t) == NOCHAR) 860 if (FROM_UNICODE (cs, *t) == NOCHAR)
840 continue; 861 continue;
841 862
842 // ignore characters we wouldn't use anyways 863 // ignore characters we wouldn't use anyways
843 bool careful; 864 bool careful;
844 if (!has_char (*t, &prop, careful)) 865 if (!has_char (*t, &prop, careful))
… …
848 869
849 XCharStruct g; 870 XCharStruct g;
850 int dir_ret, asc_ret, des_ret; 871 int dir_ret, asc_ret, des_ret;
851 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 872 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
852 873
874 int wcw = WCWIDTH (*t);
853 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 875 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
854 876
855 if (width < g.width) width = g.width; 877 if (width < g.width) width = g.width;
856 } 878 }
857 879
858 if (cs == CS_UNKNOWN) 880 if (cs == CS_UNKNOWN)
859 { 881 {
860 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 882 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
877void 899void
878rxvt_font_x11::clear () 900rxvt_font_x11::clear ()
879{ 901{
880 if (f) 902 if (f)
881 { 903 {
882 XFreeFont (term->display->display, f); 904 XFreeFont (term->dpy, f);
883 f = 0; 905 f = 0;
884 } 906 }
885} 907}
886 908
887bool 909bool
… …
930 return false; 952 return false;
931 953
932 if (!prop || prop->width == rxvt_fontprop::unset) 954 if (!prop || prop->width == rxvt_fontprop::unset)
933 return true; 955 return true;
934 956
935 // check character against base font bounding box 957 // check wether character overlaps previous/next character
936 int w = xcs->width; 958 int w = xcs->rbearing - xcs->lbearing;
937 int wcw = wcwidth (unicode); 959 int wcw = max (WCWIDTH (unicode), 1);
938 if (wcw > 0) w = (w + wcw - 1) / wcw;
939 960
940 careful = w > prop->width; 961 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
941 if (careful && w > prop->width * MAX_OVERLAP >> 2) 962
963 if (careful && !OVERLAP_OK (w, wcw, prop))
942 return false; 964 return false;
943 965
944 return true; 966 return true;
945} 967}
946 968
… …
980 else 1002 else
981 { 1003 {
982 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1004 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
983 1005
984 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1006 XChangeGC (disp, gc, GCForeground | GCFont, &v);
985 1007
986 if (slow) 1008 if (slow)
987 { 1009 {
988 do 1010 do
989 { 1011 {
990 if (xc->byte1 || xc->byte2) 1012 if (xc->byte1 || xc->byte2)
… …
1012 else 1034 else
1013 { 1035 {
1014 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1036 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1015 1037
1016 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1038 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1017 1039
1018 if (slow) 1040 if (slow)
1019 { 1041 {
1020 do 1042 do
1021 { 1043 {
1022 if (*xc) 1044 if (*xc)
… …
1042 1064
1043 void clear (); 1065 void clear ();
1044 1066
1045 rxvt_fontprop properties (); 1067 rxvt_fontprop properties ();
1046 1068
1047 bool load (const rxvt_fontprop &prop); 1069 bool load (const rxvt_fontprop &prop, bool force_prop);
1048 1070
1049 void draw (rxvt_drawable &d, int x, int y, 1071 void draw (rxvt_drawable &d, int x, int y,
1050 const text_t *text, int len, 1072 const text_t *text, int len,
1051 int fg, int bg); 1073 int fg, int bg);
1052 1074
1053 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1075 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1054 1076
1055protected: 1077protected:
1056 XftFont *f; 1078 XftFont *f;
1057}; 1079};
1058 1080
1059void 1081void
1060rxvt_font_xft::clear () 1082rxvt_font_xft::clear ()
1061{ 1083{
1062 if (f) 1084 if (f)
1063 { 1085 {
1064 XftFontClose (term->display->display, f); 1086 XftFontClose (term->dpy, f);
1065 f = 0; 1087 f = 0;
1066 } 1088 }
1067} 1089}
1068 1090
1069rxvt_fontprop 1091rxvt_fontprop
… …
1085 1107
1086 return p; 1108 return p;
1087} 1109}
1088 1110
1089bool 1111bool
1090rxvt_font_xft::load (const rxvt_fontprop &prop) 1112rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1091{ 1113{
1092 dTermDisplay; 1114 dTermDisplay;
1093 1115
1094 clear (); 1116 clear ();
1095 1117
… …
1104 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1126 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1105 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1127 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1106 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1128 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1107 1129
1108 if (prop.weight != rxvt_fontprop::unset 1130 if (prop.weight != rxvt_fontprop::unset
1109 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1131 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1110 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1132 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1111 1133
1112 if (prop.slant != rxvt_fontprop::unset 1134 if (prop.slant != rxvt_fontprop::unset
1113 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1135 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1114 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1136 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1115 1137
1116#if 0 // clipping unfortunately destroys our precious double-width-characters 1138#if 0 // clipping unfortunately destroys our precious double-width-characters
1117 // clip width, we can't do better, or can we? 1139 // clip width, we can't do better, or can we?
1118 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1140 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1176 XGlyphInfo g; 1198 XGlyphInfo g;
1177 XftTextExtents16 (disp, f, &ch, 1, &g); 1199 XftTextExtents16 (disp, f, &ch, 1, &g);
1178 1200
1179 g.width -= g.x; 1201 g.width -= g.x;
1180 1202
1181 int wcw = wcwidth (ch); 1203 int wcw = WCWIDTH (ch);
1182 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1204 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1183 1205
1184 if (width < g.width ) width = g.width; 1206 if (width < g.width ) width = g.width;
1185 if (height < g.height ) height = g.height; 1207 if (height < g.height ) height = g.height;
1186 if (glheight < g.height - g.y) glheight = g.height - g.y; 1208 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1236bool 1258bool
1237rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1259rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1238{ 1260{
1239 careful = false; 1261 careful = false;
1240 1262
1241 if (!XftCharExists (term->display->display, f, unicode)) 1263 if (!XftCharExists (term->dpy, f, unicode))
1242 return false; 1264 return false;
1243 1265
1244 if (!prop || prop->width == rxvt_fontprop::unset) 1266 if (!prop || prop->width == rxvt_fontprop::unset)
1245 return true; 1267 return true;
1246 1268
1247 // check character against base font bounding box 1269 // check character against base font bounding box
1248 FcChar32 ch = unicode; 1270 FcChar32 ch = unicode;
1249 XGlyphInfo g; 1271 XGlyphInfo g;
1250 XftTextExtents32 (term->display->display, f, &ch, 1, &g); 1272 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1251 1273
1252 int w = g.width - g.x; 1274 int w = g.width - g.x;
1253 int wcw = wcwidth (unicode); 1275 int wcw = max (WCWIDTH (unicode), 1);
1254 if (wcw > 0) w = (w + wcw - 1) / wcw;
1255 1276
1256 careful = w > prop->width; 1277 careful = g.x > 0 || w > prop->width * wcw;
1257 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1278
1279 if (careful && !OVERLAP_OK (w, wcw, prop))
1280 return false;
1281
1282 // this weeds out _totally_ broken fonts, or glyphs
1283 if (!OVERLAP_OK (g.xOff, wcw, prop))
1258 return false; 1284 return false;
1259 1285
1260 return true; 1286 return true;
1261} 1287}
1262 1288
1263void 1289void
1264rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1290rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1265 const text_t *text, int len, 1291 const text_t *text, int len,
1266 int fg, int bg) 1292 int fg, int bg)
1267{ 1293{
1268 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1269
1270 XGlyphInfo extents; 1294 XGlyphInfo extents;
1271 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1295 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1272 XftGlyphSpec *ep = enc; 1296 XftGlyphSpec *ep = enc;
1273 1297
1274 dTermDisplay; 1298 dTermDisplay;
1275 dTermGC; 1299 dTermGC;
1276 1300
1301 int w = term->fwidth * len;
1302 int h = term->fheight;
1303
1304 /*
1305 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1306 * good idea from the perspective of packaging for wide variety of user configs.
1307 */
1308 bool buffered = bg >= Color_transparent;
1309#ifdef FORCE_UNBUFFERED_XFT
1310 buffered = false;
1311#endif
1312
1277 // cut trailing spaces 1313 // cut trailing spaces
1278 while (len && text [len - 1] == ' ') 1314 while (len && text [len - 1] == ' ')
1279 len--; 1315 len--;
1280 1316
1317 int x_ = buffered ? 0 : x;
1318 int y_ = buffered ? 0 : y;
1319
1281 while (len) 1320 while (len)
1282 { 1321 {
1283 int cwidth = term->fwidth; 1322 int cwidth = term->fwidth;
1284 FcChar32 fc = *text++; len--; 1323 FcChar32 fc = *text++; len--;
1285 1324
1286 while (len && *text == NOCHAR) 1325 while (len && *text == NOCHAR)
1287 text++, len--, cwidth += term->fwidth; 1326 text++, len--, cwidth += term->fwidth;
1288 1327
1289 if (fc != ' ') // skip spaces 1328 if (fc != ' ') // skip spaces
1290 { 1329 {
1291 FT_UInt glyph = XftCharIndex (disp, f, fc); 1330 FT_UInt glyph = XftCharIndex (disp, f, fc);
1292 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1331 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1293 1332
1294 ep->glyph = glyph; 1333 ep->glyph = glyph;
1295 ep->x = x + (cwidth - extents.xOff >> 1); 1334 ep->x = x_ + (cwidth - extents.xOff >> 1);
1296 ep->y = y + ascent; 1335 ep->y = y_ + ascent;
1336
1337 if (extents.xOff == 0)
1338 ep->x = x_ + cwidth;
1339
1297 ep++; 1340 ep++;
1298 } 1341 }
1299 1342
1300 x += cwidth; 1343 x_ += cwidth;
1344 }
1345
1346 if (buffered)
1301 } 1347 {
1302
1303 if (ep != enc) 1348 if (ep != enc)
1349 {
1350 bool back_rendered = false;
1351 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1352
1353#ifdef HAVE_BG_PIXMAP
1354 if (term->bgPixmap.pixmap)
1355 {
1356 Picture dst = 0;
1357
1358 if (bg >= 0 && term->pix_colors[bg].is_opaque ())
1359 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1360 else
1361 dst = XftDrawPicture (d2);
1362
1363 if (dst)
1364 {
1365 int src_x = x, src_y = y;
1366
1367 if (term->bgPixmap.is_parentOrigin ())
1368 {
1369 src_x += term->window_vt_x;
1370 src_y += term->window_vt_y;
1371 }
1372
1373 if (term->bgPixmap.pmap_width >= src_x+w
1374 && term->bgPixmap.pmap_height >= src_y+h)
1375 {
1376 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1377 src_x, src_y, w, h, 0, 0);
1378 }
1379 else
1380 {
1381 XGCValues gcv;
1382
1383 gcv.fill_style = FillTiled;
1384 gcv.tile = term->bgPixmap.pixmap;
1385 gcv.ts_x_origin = -src_x;
1386 gcv.ts_y_origin = -src_y;
1387
1388 XChangeGC (disp, gc,
1389 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1390 &gcv);
1391
1392 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1393
1394 gcv.fill_style = FillSolid;
1395 XChangeGC (disp, gc, GCFillStyle, &gcv);
1396 }
1397
1398 if (bg >= 0)
1399 {
1400 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1401 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1402 }
1403
1404 back_rendered = true;
1405 }
1406 }
1407#endif
1408
1409 if (!back_rendered)
1410 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h);
1411
1412 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1413 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1414 }
1415 else
1416 clear_rect (d, x, y, w, h, bg);
1417 }
1418 else
1419 {
1420 clear_rect (d, x, y, w, h, bg);
1304 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1421 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1422 }
1305} 1423}
1424
1306#endif 1425#endif
1307 1426
1308///////////////////////////////////////////////////////////////////////////// 1427/////////////////////////////////////////////////////////////////////////////
1309 1428
1310rxvt_fontset::rxvt_fontset (rxvt_term *term) 1429rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1321void 1440void
1322rxvt_fontset::clear () 1441rxvt_fontset::clear ()
1323{ 1442{
1324 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1443 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1325 = rxvt_fontprop::unset; 1444 = rxvt_fontprop::unset;
1445 force_prop = false;
1326 1446
1327 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1447 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1328 FONT_UNREF (*i); 1448 FONT_UNREF (*i);
1329 1449
1330 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1450 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1339 1459
1340rxvt_font * 1460rxvt_font *
1341rxvt_fontset::new_font (const char *name, codeset cs) 1461rxvt_fontset::new_font (const char *name, codeset cs)
1342{ 1462{
1343 rxvt_font *f; 1463 rxvt_font *f;
1344 1464
1345 if (!name || !*name) 1465 if (!name || !*name)
1346 { 1466 {
1347 name = ""; 1467 name = "";
1348 f = new rxvt_font_default (this); 1468 f = new rxvt_font_default (this);
1349 } 1469 }
… …
1417 if (!end) 1537 if (!end)
1418 end = desc + strlen (desc); 1538 end = desc + strlen (desc);
1419 1539
1420 if (end - desc < 511) 1540 if (end - desc < 511)
1421 { 1541 {
1422 strncpy (buf, desc, end - desc); 1542 memcpy (buf, desc, end - desc);
1423 buf[end - desc] = 0; 1543 buf[end - desc] = 0;
1424 1544
1425 fonts.push_back (new_font (buf, cs)); 1545 fonts.push_back (new_font (buf, cs));
1426 } 1546 }
1427 else 1547 else
… …
1442 if (fonts[i]->loaded) 1562 if (fonts[i]->loaded)
1443 return true; 1563 return true;
1444 1564
1445 fonts[i]->loaded = true; 1565 fonts[i]->loaded = true;
1446 1566
1447 if (!fonts[i]->load (prop)) 1567 if (!fonts[i]->load (prop, force_prop))
1448 { 1568 {
1449 fonts[i]->cs = CS_UNKNOWN; 1569 fonts[i]->cs = CS_UNKNOWN;
1450 return false; 1570 return false;
1451 } 1571 }
1452 1572
… …
1553 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1673 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1554 FcPatternAddBool (p, FC_MINSPACE, 1); 1674 FcPatternAddBool (p, FC_MINSPACE, 1);
1555 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1675 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1556 1676
1557 XftResult result; 1677 XftResult result;
1558 FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result); 1678 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1559 1679
1560 FcPatternDestroy (p); 1680 FcPatternDestroy (p);
1561 1681
1562 if (match) 1682 if (match)
1563 { 1683 {
… …
1568 if (find_font (font) < 0) 1688 if (find_font (font) < 0)
1569 { 1689 {
1570 char fontname[4096]; 1690 char fontname[4096];
1571 sprintf (fontname, "xft:%-.4090s", font); 1691 sprintf (fontname, "xft:%-.4090s", font);
1572 1692
1573 fonts.push_back (new_font (fontname, CS_UNICODE)); 1693 fonts.push_back (new_font (fontname, CS_UNICODE));
1574 } 1694 }
1575 1695
1576 free (font); 1696 free (font);
1577 } 1697 }
1578#endif 1698#endif

Diff Legend

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