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.125 by ayin, Sun Nov 25 11:23:18 2007 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 *
… …
24#include "rxvtlib.h" 24#include "rxvtlib.h"
25#include "rxvtutil.h" 25#include "rxvtutil.h"
26#include "rxvtfont.h" 26#include "rxvtfont.h"
27 27
28#include <cstdlib> 28#include <cstdlib>
29#include <wchar.h> 29
30#include <inttypes.h> 30#include <inttypes.h>
31 31
32#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 ))
33 40
34const struct rxvt_fallback_font { 41const struct rxvt_fallback_font {
35 codeset cs; 42 codeset cs;
36 const char *name; 43 const char *name;
37} fallback_fonts[] = { 44} fallback_fonts[] = {
38 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
39 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
40 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 47 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
41 48
42#if ENCODING_EU 49#if ENCODING_EU
43 // cyrillic 50 // cyrillic
44 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 51 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
45 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 52 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
46 53
47 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 54 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
48 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 55 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
49 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 56 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
50 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 57 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
51 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 58 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
57 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 64 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
58 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
59 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
60 67
61# if XFT 68# if XFT
62 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 69 { CS_KOI8_U, "xft::lang=ru" },
63 70
64 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 71 { CS_ISO8859_5, "xft::lang=ru" },
65 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 72 { CS_ISO8859_6, "xft::lang=ar" },
66 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 73 { CS_ISO8859_7, "xft::lang=el" },
67 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 74 { CS_ISO8859_8, "xft::lang=he" },
68 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 75 { CS_ISO8859_9, "xft::lang=tr" },
69 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 76 { CS_ISO8859_10, "xft::lang=se" },
70 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 77 { CS_ISO8859_11, "xft::lang=th" },
71# endif 78# endif
72#endif 79#endif
73 80
74 // japanese 81 // japanese
75#if ENCODING_JP || ENCODING_JP_EXT 82#if ENCODING_JP || ENCODING_JP_EXT
76# if XFT 83# if XFT
77 // prefer xft for complex scripts 84 // prefer xft for complex scripts
78 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
79 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, 86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
80 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
81 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
82# endif 89# endif
83 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
84 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
85 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 92 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
86 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
… …
90 97
91#if ENCODING_ZH || ENCODING_ZH_EXT 98#if ENCODING_ZH || ENCODING_ZH_EXT
92# if XFT 99# if XFT
93 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 100 { CS_GBK_0, "xft:AR PL KaitiM GB" },
94 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 101 { CS_GBK_0, "xft:AR PL SungtiL GB" },
95 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 102 { CS_GBK_0, "xft::lang=zh" },
96 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
97 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 104 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
98 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
99 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 106 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
100 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 107 { CS_GB2312_1980_0, "xft::lang=zh" },
101# endif 108# endif
102 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 109 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
103 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 110 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
104 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 111 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
105 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 112 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
118#if ENCODING_KR 125#if ENCODING_KR
119 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 126 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
120 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 127 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
121# if XFT 128# if XFT
122 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
123 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
124# endif 131# endif
125#endif 132#endif
126 133
127 // generic font fallback
128 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 134 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
129 { 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.
130 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
131 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
132#if XFT 136#if XFT
133 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 137 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
134 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 138 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
135 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
136 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 140 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
137 141
138 // FreeMono is usually uglier than x fonts, so try last only. 142 // FreeMono is usually uglier than x fonts, so try after the others
139 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 143 { CS_UNICODE, "xft:FreeMono:autohint=true" },
140#endif 144#endif
141 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" },
142 { CS_UNKNOWN, 0 } 150 { CS_UNKNOWN, 0 }
143}; 151};
144 152
145// these characters are used to guess the font height and width 153// these characters are used to guess the font height and width
146// pango uses a similar algorithm and doesn't trust the font either. 154// pango uses a similar algorithm and doesn't trust the font either.
… …
150 0x304c, 0x672c, // が本 158 0x304c, 0x672c, // が本
151}; 159};
152 160
153#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]))
154 162
155#define dTermDisplay Display *disp = term->display->display 163#define dTermDisplay Display *disp = term->dpy
156#define dTermGC GC gc = term->gc 164#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 165
176///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
177 167
178static const char * 168static const char *
179enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 169enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
… …
221 return res; 211 return res;
222} 212}
223 213
224///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
225 215
216rxvt_font::rxvt_font ()
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{
219}
220
226void 221void
227rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name)
228{ 223{
229 if (this->name == name) 224 if (this->name == name)
230 return; 225 return;
… …
236void 231void
237rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
238{ 233{
239 dTermDisplay; 234 dTermDisplay;
240 dTermGC; 235 dTermGC;
241 236
242 if (color == Color_bg) 237 if (color == Color_bg || color == Color_transparent)
243 XClearArea (disp, d, x, y, w, h, FALSE); 238 XClearArea (disp, d, x, y, w, h, false);
244 else if (color >= 0) 239 else if (color >= 0)
245 { 240 {
246#if XFT 241#if XFT
242 bool done = false;
243#ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00)
245 {
246 Picture dst = XftDrawPicture (d);
247 if (dst != 0)
248 {
249 XClearArea (disp, d, x, y, w, h, false);
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 done = true;
253 }
254 }
255#endif
256 if (!done)
247 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
248#else 258#else
249 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
250 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
251#endif 261#endif
252 } 262 }
253} 263}
254 264
255#include "table/linedraw.h" 265/////////////////////////////////////////////////////////////////////////////
256 266
257struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font {
258 struct rxvt_fontset *fs; 268 struct rxvt_fontset *fs;
259 269
260 rxvt_font_default (rxvt_fontset *fs) 270 rxvt_font_default (rxvt_fontset *fs)
… …
273 p.slant = rxvt_fontprop::roman; 283 p.slant = rxvt_fontprop::roman;
274 284
275 return p; 285 return p;
276 } 286 }
277 287
278 bool load (const rxvt_fontprop &prop) 288 bool load (const rxvt_fontprop &prop, bool force_prop)
279 { 289 {
280 width = 1; height = 1; 290 width = 1; height = 1;
281 ascent = 1; descent = 0; 291 ascent = 1; descent = 0;
282 292
283 set_name (strdup ("built-in support font")); 293 set_name (strdup ("built-in support font"));
… …
296 return false; 306 return false;
297 307
298 if (unicode <= 0x009f) 308 if (unicode <= 0x009f)
299 return true; 309 return true;
300 310
311#ifdef BUILTIN_GLYPHS
301 if (unicode >= 0x2500 && unicode <= 0x259f && 312 if (unicode >= 0x2500 && unicode <= 0x259f &&
302 !term->option (Opt_skipBuiltinGlyphs)) 313 !term->option (Opt_skipBuiltinGlyphs))
303 return true; 314 return true;
315#endif
304 316
305 if (IS_COMPOSE (unicode)) 317 if (IS_COMPOSE (unicode))
306 return true; 318 return true;
307 319
308 switch (unicode) 320 switch (unicode)
… …
344 ; 356 ;
345 357
346 int width = text - tp; 358 int width = text - tp;
347 int fwidth = term->fwidth * width; 359 int fwidth = term->fwidth * width;
348 360
361#ifdef BUILTIN_GLYPHS
349 if (0x2500 <= t && t <= 0x259f) 362 if (0x2500 <= t && t <= 0x259f)
350 { 363 {
364# include "table/linedraw.h"
351 uint16_t offs = linedraw_offs[t - 0x2500]; 365 uint16_t offs = linedraw_offs[t - 0x2500];
352 uint32_t *a = linedraw_command + (offs >> 4); 366 uint32_t *a = linedraw_command + (offs >> 4);
353 uint32_t *b = a + (offs & 15); 367 uint32_t *b = a + (offs & 15);
354 368
355 int W = fwidth; 369 int W = fwidth;
… …
393 407
394 case 1: // rectangle, possibly stippled 408 case 1: // rectangle, possibly stippled
395 if (a) 409 if (a)
396 { 410 {
397 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 411 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
398 412
399 gcv.fill_style = FillStippled; 413 gcv.fill_style = FillStippled;
400 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 414 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
401 gcv.ts_x_origin = x; 415 gcv.ts_x_origin = x;
402 gcv.ts_y_origin = y; 416 gcv.ts_y_origin = y;
403 417
… …
422 (a - 1) * 90*64, (b - 1) * 90*64); 436 (a - 1) * 90*64, (b - 1) * 90*64);
423 break; 437 break;
424 } 438 }
425 } 439 }
426 } 440 }
441#else
442 if (0)
443 ;
444#endif
427#if ENABLE_COMBINING 445#if ENABLE_COMBINING
428 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 446 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
429 { 447 {
448 min_it (width, 2); // we only support wcwidth up to 2
449
430 text_t chrs[2]; 450 text_t chrs[2];
431 width = min (2, width);
432 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
433 452
434 *chrs = cc->c1; 453 *chrs = cc->c1;
435 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
436 f1->draw (d, x, y, chrs, width, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
… …
443 *chrs = cc->c2; 462 *chrs = cc->c2;
444 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
445 ? f1 464 ? f1
446 : (*fs)[fs->find_font (cc->c2)]; 465 : (*fs)[fs->find_font (cc->c2)];
447 466
448 f2->draw (d, x, y, chrs, width, fg, -1); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
449 } 468 }
450 } 469 }
451#endif 470#endif
452 else 471 else
453 switch (t) 472 switch (t)
… …
473 492
474 void clear (); 493 void clear ();
475 494
476 rxvt_fontprop properties (); 495 rxvt_fontprop properties ();
477 496
478 bool load (const rxvt_fontprop &prop); 497 bool load (const rxvt_fontprop &prop, bool force_prop);
479 498
480 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; 499 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
481 500
482 void draw (rxvt_drawable &d, int x, int y, 501 void draw (rxvt_drawable &d, int x, int y,
483 const text_t *text, int len, 502 const text_t *text, int len,
484 int fg, int bg); 503 int fg, int bg);
485 504
486 bool slow; // wether this is a proportional font or has other funny characteristics 505 bool slow; // wether this is a proportional font or has other funny characteristics
487 XFontStruct *f; 506 XFontStruct *f;
488 codeset cs;
489 bool enc2b, encm; 507 bool enc2b, encm;
490 508
491 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 509 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); 510 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); 511 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
494 bool set_properties (rxvt_fontprop &p, const char *name); 512 bool set_properties (rxvt_fontprop &p, const char *name);
495}; 513};
496 514
497char * 515char *
498rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 516rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
499{ 517{
500 unsigned long value; 518 unsigned long value;
501 519
502 if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value)) 520 if (XGetFontProperty (f, property, &value))
503 return XGetAtomName (term->display->display, value); 521 return XGetAtomName (term->dpy, value);
504 else 522 else
505 return rxvt_strdup (repl); 523 return repl ? strdup (repl) : 0;
506} 524}
507 525
508rxvt_fontprop 526rxvt_fontprop
509rxvt_font_x11::properties () 527rxvt_font_x11::properties ()
510{ 528{
… …
514} 532}
515 533
516bool 534bool
517rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 535rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
518{ 536{
519 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 537 p.width = width != rxvt_fontprop::unset ? width
538 : avgwidth ? (avgwidth + 1) / 10
539 : (height + 1) / 2;
520 p.height = height; 540 p.height = height;
521 p.ascent = rxvt_fontprop::unset; 541 p.ascent = rxvt_fontprop::unset;
522 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 542 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; 543 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
524 544
… …
529rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 549rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
530{ 550{
531 unsigned long height; 551 unsigned long height;
532 552
533#if 0 553#if 0
534 if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height)) 554 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
535 return false; 555 return false;
536#else 556#else
537 height = f->ascent + f->descent; 557 height = f->ascent + f->descent;
538#endif 558#endif
539 559
540 unsigned long avgwidth; 560 unsigned long avgwidth;
541 if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth)) 561 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
542 avgwidth = 0; 562 avgwidth = 0;
543 563
544 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 564 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
545 char *slant = get_property (f, "SLANT", "r"); 565 char *slant = get_property (f, term->xa [XA_SLANT], "r");
546 566
547 set_properties (p, height, weight, slant, avgwidth); 567 set_properties (p, height, weight, slant, avgwidth);
548 568
549 free (weight); 569 free (weight);
550 free (slant); 570 free (slant);
… …
590 return false; 610 return false;
591} 611}
592 612
593// fix the size of scalable fonts 613// fix the size of scalable fonts
594static bool 614static bool
595replace_field (char *buf, const char *name, int index, const char old, const char *replace) 615replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
596{ 616{
597 int slashes = 0; 617 int slashes = 0;
598 const char *field, *end; 618 const char *field, *end;
599 619
600 for (const char *c = name; *c; c++) 620 for (const char *c = name; *c; c++)
… …
610 break; 630 break;
611 } 631 }
612 632
613 if (slashes >= 13 && (!old || *field == old)) 633 if (slashes >= 13 && (!old || *field == old))
614 { 634 {
615 // TODO: check for overflow in font-name 635 size_t len = field - name;
636 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
616 strncpy (buf, name, field - name); 637 strncpy (*ptr, name, len);
617 buf += field - name;
618 strcpy (buf, replace); 638 strcpy (*ptr + len, replace);
619 strcat (buf, end); 639 strcat (*ptr, end);
620 640
621 return true; 641 return true;
622 } 642 }
623 else 643 else
624 { 644 {
625 strcpy (buf, name); 645 *ptr = strdup (name);
626 646
627 return false; 647 return false;
628 } 648 }
629} 649}
630 650
631bool 651bool
632rxvt_font_x11::load (const rxvt_fontprop &prop) 652rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
633{ 653{
634 dTermDisplay; 654 dTermDisplay;
635 655
636 clear (); 656 clear ();
637 657
638 char field_str[64]; // enough for 128 bits 658 char field_str[64]; // enough for 128 bits
639 659
640 // first morph the font if required 660 // first morph the font if required
641 if (prop.weight != rxvt_fontprop::unset 661 if (force_prop)
642 || prop.slant != rxvt_fontprop::unset)
643 { 662 {
644 char fname[1024]; 663 char *fname;
645 664
646 if (name[0] != '-') 665 if (name[0] != '-')
647 { 666 {
648 f = XLoadQueryFont (disp, name); 667 f = XLoadQueryFont (disp, name);
649 668
650 if (!f) 669 if (!f)
651 return false; 670 return false;
652 671
653 char *new_name = get_property (f, "FONT", name); 672 char *new_name = get_property (f, XA_FONT, name);
654 673
655 if (new_name) 674 if (new_name)
656 set_name (new_name); 675 set_name (new_name);
657 else 676 else
658 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 677 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
661 f = 0; 680 f = 0;
662 } 681 }
663 682
664 if (prop.weight != rxvt_fontprop::unset) 683 if (prop.weight != rxvt_fontprop::unset)
665 { 684 {
666 replace_field (fname, name, 2, 0, 685 replace_field (&fname, name, 2, 0,
667 prop.weight < rxvt_fontprop::bold 686 prop.weight < rxvt_fontprop::bold
668 ? "medium" : "bold"); 687 ? "medium" : "bold");
669 set_name (strdup (fname)); 688 set_name (fname);
670 } 689 }
671 690
672 if (prop.slant != rxvt_fontprop::unset) 691 if (prop.slant != rxvt_fontprop::unset)
673 { 692 {
674 replace_field (fname, name, 3, 0, 693 replace_field (&fname, name, 3, 0,
675 prop.slant < rxvt_fontprop::italic 694 prop.slant < rxvt_fontprop::italic
676 ? "r" : "i"); // TODO: handle "o"blique, too 695 ? "r" : "i"); // TODO: handle "o"blique, too
677 set_name (strdup (fname)); 696 set_name (fname);
678 } 697 }
679 } 698 }
680 699
681 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 700 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
682 ? 0 : prop.height); 701 ? 0 : prop.height);
… …
707 font_weight *fonts = new font_weight[count]; 726 font_weight *fonts = new font_weight[count];
708 727
709 for (int i = 0; i < count; i++) 728 for (int i = 0; i < count; i++)
710 { 729 {
711 rxvt_fontprop p; 730 rxvt_fontprop p;
712 char fname[1024]; 731 char *fname;
713 732
714 int diff = 0; 733 int diff = 0;
715 734
716 if (replace_field (fname, list[i], 6, '0', field_str)) 735 if (replace_field (&fname, list[i], 6, '0', field_str))
717 diff += 10; // slightly penalize scalable fonts 736 diff += 10; // slightly penalize scalable fonts
737 else
738 {
739 free (fname);
718 else if (replace_field (fname, list[i], 11, '0', "0")) 740 if (replace_field (&fname, list[i], 11, '0', "0"))
719 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 741 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
742 }
720 743
721 if (!set_properties (p, fname)) 744 if (!set_properties (p, fname))
722 continue; 745 continue;
723 746
724 if (prop.height != rxvt_fontprop::unset 747 if (prop.height != rxvt_fontprop::unset
… …
728 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 751 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); 752 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); 753 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); 754 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
732 755
733 fonts[i].name = strdup (fname); 756 fonts[i].name = fname;
734 fonts[i].diff = diff; 757 fonts[i].diff = diff;
735 } 758 }
736 759
737 XFreeFontNames (list); 760 XFreeFontNames (list);
738 761
… …
767 delete [] fonts; 790 delete [] fonts;
768 791
769 if (!f) 792 if (!f)
770 return false; 793 return false;
771 794
772 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 795 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
773 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 796 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
774 797
775 if (registry && encoding) 798 if (registry && encoding)
776 { 799 {
777 char charset[64]; 800 char charset[64];
778 snprintf (charset, 64, "%s-%s", registry, encoding); 801 snprintf (charset, 64, "%s-%s", registry, encoding);
779 802
780 cs = codeset_from_name (charset); 803 cs = codeset_from_name (charset);
781 } 804 }
782 else 805 else
783 { 806 {
784 const char *charset = get_property (f, "FONT", 0); 807 const char *charset = get_property (f, XA_FONT, 0);
785 808
786 if (!charset) 809 if (!charset)
787 charset = name; 810 charset = name;
788 811
789 int count = 13; 812 int count = 13;
… …
804 enc2b = encm || f->max_char_or_byte2 > 255; 827 enc2b = encm || f->max_char_or_byte2 > 255;
805 828
806 slow = false; 829 slow = false;
807 830
808#if 1 // only used for slow detection, TODO optimize 831#if 1 // only used for slow detection, TODO optimize
809 if (f->min_bounds.width == f->max_bounds.width) 832 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; 833 width = f->max_bounds.width;
813 else 834 else
814 { 835 {
815 slow = true; 836 slow = true;
816 837
817 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 838 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
818 839
819 if (encm) 840 if (encm)
820 N += (f->max_byte1 - f->min_byte1) 841 N += (f->max_byte1 - f->min_byte1)
821 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 842 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
822 843
823 while (N) 844 while (N)
824 { 845 {
825 if (f->per_char[N].width > width) 846 if (f->per_char[N].width > width)
826 width = f->per_char[N].width; 847 width = f->per_char[N].width;
827 848
… …
832 853
833 width = 1; 854 width = 1;
834 855
835 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 856 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
836 { 857 {
837 if (cs != CS_UNICODE
838 && *t > 0x100
839 && FROM_UNICODE (cs, *t) == NOCHAR) 858 if (FROM_UNICODE (cs, *t) == NOCHAR)
840 continue; 859 continue;
841 860
842 // ignore characters we wouldn't use anyways 861 // ignore characters we wouldn't use anyways
843 bool careful; 862 bool careful;
844 if (!has_char (*t, &prop, careful)) 863 if (!has_char (*t, &prop, careful))
… …
848 867
849 XCharStruct g; 868 XCharStruct g;
850 int dir_ret, asc_ret, des_ret; 869 int dir_ret, asc_ret, des_ret;
851 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 870 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
852 871
872 int wcw = WCWIDTH (*t);
853 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 873 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
854 874
855 if (width < g.width) width = g.width; 875 if (width < g.width) width = g.width;
856 } 876 }
857 877
858 if (cs == CS_UNKNOWN) 878 if (cs == CS_UNKNOWN)
859 { 879 {
860 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 880 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
877void 897void
878rxvt_font_x11::clear () 898rxvt_font_x11::clear ()
879{ 899{
880 if (f) 900 if (f)
881 { 901 {
882 XFreeFont (term->display->display, f); 902 XFreeFont (term->dpy, f);
883 f = 0; 903 f = 0;
884 } 904 }
885} 905}
886 906
887bool 907bool
… …
930 return false; 950 return false;
931 951
932 if (!prop || prop->width == rxvt_fontprop::unset) 952 if (!prop || prop->width == rxvt_fontprop::unset)
933 return true; 953 return true;
934 954
935 // check character against base font bounding box 955 // check wether character overlaps previous/next character
936 int w = xcs->width; 956 int w = xcs->rbearing - xcs->lbearing;
937 int wcw = wcwidth (unicode); 957 int wcw = max (WCWIDTH (unicode), 1);
938 if (wcw > 0) w = (w + wcw - 1) / wcw;
939 958
940 careful = w > prop->width; 959 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
941 if (careful && w > prop->width * MAX_OVERLAP >> 2) 960
961 if (careful && !OVERLAP_OK (w, wcw, prop))
942 return false; 962 return false;
943 963
944 return true; 964 return true;
945} 965}
946 966
… …
980 else 1000 else
981 { 1001 {
982 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1002 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
983 1003
984 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1004 XChangeGC (disp, gc, GCForeground | GCFont, &v);
985 1005
986 if (slow) 1006 if (slow)
987 { 1007 {
988 do 1008 do
989 { 1009 {
990 if (xc->byte1 || xc->byte2) 1010 if (xc->byte1 || xc->byte2)
… …
1012 else 1032 else
1013 { 1033 {
1014 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1034 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1015 1035
1016 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1036 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1017 1037
1018 if (slow) 1038 if (slow)
1019 { 1039 {
1020 do 1040 do
1021 { 1041 {
1022 if (*xc) 1042 if (*xc)
… …
1042 1062
1043 void clear (); 1063 void clear ();
1044 1064
1045 rxvt_fontprop properties (); 1065 rxvt_fontprop properties ();
1046 1066
1047 bool load (const rxvt_fontprop &prop); 1067 bool load (const rxvt_fontprop &prop, bool force_prop);
1048 1068
1049 void draw (rxvt_drawable &d, int x, int y, 1069 void draw (rxvt_drawable &d, int x, int y,
1050 const text_t *text, int len, 1070 const text_t *text, int len,
1051 int fg, int bg); 1071 int fg, int bg);
1052 1072
1053 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1073 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1054 1074
1055protected: 1075protected:
1056 XftFont *f; 1076 XftFont *f;
1057}; 1077};
1058 1078
1059void 1079void
1060rxvt_font_xft::clear () 1080rxvt_font_xft::clear ()
1061{ 1081{
1062 if (f) 1082 if (f)
1063 { 1083 {
1064 XftFontClose (term->display->display, f); 1084 XftFontClose (term->dpy, f);
1065 f = 0; 1085 f = 0;
1066 } 1086 }
1067} 1087}
1068 1088
1069rxvt_fontprop 1089rxvt_fontprop
… …
1085 1105
1086 return p; 1106 return p;
1087} 1107}
1088 1108
1089bool 1109bool
1090rxvt_font_xft::load (const rxvt_fontprop &prop) 1110rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1091{ 1111{
1092 dTermDisplay; 1112 dTermDisplay;
1093 1113
1094 clear (); 1114 clear ();
1095 1115
… …
1104 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1124 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1105 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1125 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1106 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1126 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1107 1127
1108 if (prop.weight != rxvt_fontprop::unset 1128 if (prop.weight != rxvt_fontprop::unset
1109 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1129 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1110 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1130 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1111 1131
1112 if (prop.slant != rxvt_fontprop::unset 1132 if (prop.slant != rxvt_fontprop::unset
1113 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1133 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1114 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1134 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1115 1135
1116#if 0 // clipping unfortunately destroys our precious double-width-characters 1136#if 0 // clipping unfortunately destroys our precious double-width-characters
1117 // clip width, we can't do better, or can we? 1137 // clip width, we can't do better, or can we?
1118 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1138 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1176 XGlyphInfo g; 1196 XGlyphInfo g;
1177 XftTextExtents16 (disp, f, &ch, 1, &g); 1197 XftTextExtents16 (disp, f, &ch, 1, &g);
1178 1198
1179 g.width -= g.x; 1199 g.width -= g.x;
1180 1200
1181 int wcw = wcwidth (ch); 1201 int wcw = WCWIDTH (ch);
1182 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1202 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1183 1203
1184 if (width < g.width ) width = g.width; 1204 if (width < g.width ) width = g.width;
1185 if (height < g.height ) height = g.height; 1205 if (height < g.height ) height = g.height;
1186 if (glheight < g.height - g.y) glheight = g.height - g.y; 1206 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1236bool 1256bool
1237rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1257rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1238{ 1258{
1239 careful = false; 1259 careful = false;
1240 1260
1241 if (!XftCharExists (term->display->display, f, unicode)) 1261 if (!XftCharExists (term->dpy, f, unicode))
1242 return false; 1262 return false;
1243 1263
1244 if (!prop || prop->width == rxvt_fontprop::unset) 1264 if (!prop || prop->width == rxvt_fontprop::unset)
1245 return true; 1265 return true;
1246 1266
1247 // check character against base font bounding box 1267 // check character against base font bounding box
1248 FcChar32 ch = unicode; 1268 FcChar32 ch = unicode;
1249 XGlyphInfo g; 1269 XGlyphInfo g;
1250 XftTextExtents32 (term->display->display, f, &ch, 1, &g); 1270 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1251 1271
1252 int w = g.width - g.x; 1272 int w = g.width - g.x;
1253 int wcw = wcwidth (unicode); 1273 int wcw = max (WCWIDTH (unicode), 1);
1254 if (wcw > 0) w = (w + wcw - 1) / wcw;
1255 1274
1256 careful = w > prop->width; 1275 careful = g.x > 0 || w > prop->width * wcw;
1257 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1276
1277 if (careful && !OVERLAP_OK (w, wcw, prop))
1278 return false;
1279
1280 // this weeds out _totally_ broken fonts, or glyphs
1281 if (!OVERLAP_OK (g.xOff, wcw, prop))
1258 return false; 1282 return false;
1259 1283
1260 return true; 1284 return true;
1261} 1285}
1262 1286
1263void 1287void
1264rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1288rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1265 const text_t *text, int len, 1289 const text_t *text, int len,
1266 int fg, int bg) 1290 int fg, int bg)
1267{ 1291{
1268 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1269
1270 XGlyphInfo extents; 1292 XGlyphInfo extents;
1271 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1293 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1272 XftGlyphSpec *ep = enc; 1294 XftGlyphSpec *ep = enc;
1273 1295
1274 dTermDisplay; 1296 dTermDisplay;
1275 dTermGC; 1297 dTermGC;
1276 1298
1299 int w = term->fwidth * len;
1300 int h = term->fheight;
1301
1302 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
1303 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1304 * good idea from the perspective of packaging for wide variety of user configs.
1305 */
1306 bool buffered = true
1307#ifdef FORCE_UNBUFFERED_XFT
1308 && bg >= 0
1309#endif
1310 ;
1277 // cut trailing spaces 1311 // cut trailing spaces
1278 while (len && text [len - 1] == ' ') 1312 while (len && text [len - 1] == ' ')
1279 len--; 1313 len--;
1280 1314
1315 int x_ = buffered ? 0 : x;
1316 int y_ = buffered ? 0 : y;
1317
1281 while (len) 1318 while (len)
1282 { 1319 {
1283 int cwidth = term->fwidth; 1320 int cwidth = term->fwidth;
1284 FcChar32 fc = *text++; len--; 1321 FcChar32 fc = *text++; len--;
1285 1322
1286 while (len && *text == NOCHAR) 1323 while (len && *text == NOCHAR)
1287 text++, len--, cwidth += term->fwidth; 1324 text++, len--, cwidth += term->fwidth;
1288 1325
1289 if (fc != ' ') // skip spaces 1326 if (fc != ' ') // skip spaces
1290 { 1327 {
1291 FT_UInt glyph = XftCharIndex (disp, f, fc); 1328 FT_UInt glyph = XftCharIndex (disp, f, fc);
1292 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1329 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1293 1330
1294 ep->glyph = glyph; 1331 ep->glyph = glyph;
1295 ep->x = x + (cwidth - extents.xOff >> 1); 1332 ep->x = x_ + (cwidth - extents.xOff >> 1);
1296 ep->y = y + ascent; 1333 ep->y = y_ + ascent;
1334
1335 if (extents.xOff == 0)
1336 ep->x = x_ + cwidth;
1337
1297 ep++; 1338 ep++;
1298 } 1339 }
1299 1340
1300 x += cwidth; 1341 x_ += cwidth;
1342 }
1343
1344 if (buffered)
1301 } 1345 {
1302 1346 bool back_rendered = false;
1303 if (ep != enc) 1347 if (ep != enc)
1348 {
1349 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1350
1351#ifdef HAVE_BG_PIXMAP
1352 if (term->bgPixmap.pixmap)
1353 {
1354 Picture dst = 0;
1355
1356 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
1357 dst = XftDrawPicture (d2);
1358
1359 if (bg < 0 || dst != 0)
1360 {
1361 int src_x = x, src_y = y ;
1362
1363 if (term->bgPixmap.is_parentOrigin ())
1364 {
1365 src_x += term->window_vt_x;
1366 src_y += term->window_vt_y;
1367 }
1368
1369 if (term->bgPixmap.pmap_width >= src_x+w
1370 && term->bgPixmap.pmap_height >= src_y+h)
1371 {
1372 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1373 src_x, src_y, w, h, 0, 0);
1374 }
1375 else
1376 {
1377 XGCValues gcv;
1378
1379 gcv.fill_style = FillTiled;
1380 gcv.tile = term->bgPixmap.pixmap;
1381 gcv.ts_x_origin = -src_x;
1382 gcv.ts_y_origin = -src_y;
1383
1384 XChangeGC (disp, gc,
1385 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1386 &gcv);
1387
1388 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1389
1390 gcv.fill_style = FillSolid;
1391 XChangeGC (disp, gc, GCFillStyle, &gcv);
1392 }
1393
1394 if (bg >= 0)
1395 {
1396 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1397 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1398 }
1399
1400 back_rendered = true;
1401 }
1402 }
1403#endif
1404
1405 if (bg >= 0 && !back_rendered)
1406 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1407
1408 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1409 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1410 }
1411 else
1412 clear_rect (d, x, y, w, h, bg);
1413 }
1414 else
1415 {
1416 clear_rect (d, x, y, w, h, bg);
1304 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1417 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1418 }
1305} 1419}
1420
1306#endif 1421#endif
1307 1422
1308///////////////////////////////////////////////////////////////////////////// 1423/////////////////////////////////////////////////////////////////////////////
1309 1424
1310rxvt_fontset::rxvt_fontset (rxvt_term *term) 1425rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1321void 1436void
1322rxvt_fontset::clear () 1437rxvt_fontset::clear ()
1323{ 1438{
1324 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1439 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1325 = rxvt_fontprop::unset; 1440 = rxvt_fontprop::unset;
1441 force_prop = false;
1326 1442
1327 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1443 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1328 FONT_UNREF (*i); 1444 FONT_UNREF (*i);
1329 1445
1330 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1446 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1339 1455
1340rxvt_font * 1456rxvt_font *
1341rxvt_fontset::new_font (const char *name, codeset cs) 1457rxvt_fontset::new_font (const char *name, codeset cs)
1342{ 1458{
1343 rxvt_font *f; 1459 rxvt_font *f;
1344 1460
1345 if (!name || !*name) 1461 if (!name || !*name)
1346 { 1462 {
1347 name = ""; 1463 name = "";
1348 f = new rxvt_font_default (this); 1464 f = new rxvt_font_default (this);
1349 } 1465 }
… …
1442 if (fonts[i]->loaded) 1558 if (fonts[i]->loaded)
1443 return true; 1559 return true;
1444 1560
1445 fonts[i]->loaded = true; 1561 fonts[i]->loaded = true;
1446 1562
1447 if (!fonts[i]->load (prop)) 1563 if (!fonts[i]->load (prop, force_prop))
1448 { 1564 {
1449 fonts[i]->cs = CS_UNKNOWN; 1565 fonts[i]->cs = CS_UNKNOWN;
1450 return false; 1566 return false;
1451 } 1567 }
1452 1568
… …
1553 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1669 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1554 FcPatternAddBool (p, FC_MINSPACE, 1); 1670 FcPatternAddBool (p, FC_MINSPACE, 1);
1555 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1671 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1556 1672
1557 XftResult result; 1673 XftResult result;
1558 FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result); 1674 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1559 1675
1560 FcPatternDestroy (p); 1676 FcPatternDestroy (p);
1561 1677
1562 if (match) 1678 if (match)
1563 { 1679 {
… …
1568 if (find_font (font) < 0) 1684 if (find_font (font) < 0)
1569 { 1685 {
1570 char fontname[4096]; 1686 char fontname[4096];
1571 sprintf (fontname, "xft:%-.4090s", font); 1687 sprintf (fontname, "xft:%-.4090s", font);
1572 1688
1573 fonts.push_back (new_font (fontname, CS_UNICODE)); 1689 fonts.push_back (new_font (fontname, CS_UNICODE));
1574 } 1690 }
1575 1691
1576 free (font); 1692 free (font);
1577 } 1693 }
1578#endif 1694#endif

Diff Legend

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