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.86 by root, Wed Jan 25 13:24:45 2006 UTC vs.
Revision 1.140 by root, Wed Jan 23 14:18:19 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_ROMAN (8 + 2) // max. character width in 8ths of the base width 31#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 32#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34 33
35#define OVERLAP_OK(w,prop) (w) > ( \ 34#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36 prop->slant >= rxvt_fontprop::italic \ 35 (prop)->slant >= rxvt_fontprop::italic \
37 ? (prop->width * MAX_OVERLAP_ITALIC + 7) >> 3 \ 36 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : (prop->width * MAX_OVERLAP_ROMAN + 7) >> 3 \ 37 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 ) 38 ))
40 39
41const struct rxvt_fallback_font { 40const struct rxvt_fallback_font {
42 codeset cs; 41 codeset cs;
43 const char *name; 42 const char *name;
44} fallback_fonts[] = { 43} fallback_fonts[] = {
45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 44 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 45 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
47 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
48 47
49#if ENCODING_EU 48#if ENCODING_EU
50 // cyrillic 49 // cyrillic
51 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 50 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
52 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 51 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
53 52
54 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 53 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
55 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 54 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
56 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 55 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
57 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 56 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
58 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 57 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
64 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 63 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 64 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 65 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
67 66
68# if XFT 67# if XFT
69 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 68 { CS_KOI8_U, "xft::lang=ru" },
70 69
71 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 70 { CS_ISO8859_5, "xft::lang=ru" },
72 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 71 { CS_ISO8859_6, "xft::lang=ar" },
73 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 72 { CS_ISO8859_7, "xft::lang=el" },
74 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 73 { CS_ISO8859_8, "xft::lang=he" },
75 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 74 { CS_ISO8859_9, "xft::lang=tr" },
76 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 75 { CS_ISO8859_10, "xft::lang=se" },
77 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 76 { CS_ISO8859_11, "xft::lang=th" },
78# endif 77# endif
79#endif 78#endif
80 79
81 // japanese 80 // japanese
82#if ENCODING_JP || ENCODING_JP_EXT 81#if ENCODING_JP || ENCODING_JP_EXT
83# if XFT 82# if XFT
84 // prefer xft for complex scripts 83 // prefer xft for complex scripts
85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 84 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, 85 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 86 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 87 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89# endif 88# endif
90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 89 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 90 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
92 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 91 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
93 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 92 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
… …
97 96
98#if ENCODING_ZH || ENCODING_ZH_EXT 97#if ENCODING_ZH || ENCODING_ZH_EXT
99# if XFT 98# if XFT
100 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 99 { CS_GBK_0, "xft:AR PL KaitiM GB" },
101 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 100 { CS_GBK_0, "xft:AR PL SungtiL GB" },
102 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 101 { CS_GBK_0, "xft::lang=zh" },
103 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 102 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
104 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
105 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 104 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
106 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
107 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 106 { CS_GB2312_1980_0, "xft::lang=zh" },
108# endif 107# endif
109 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 108 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
110 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 109 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
111 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 110 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
112 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 111 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
125#if ENCODING_KR 124#if ENCODING_KR
126 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 125 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
127 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 126 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
128# if XFT 127# if XFT
129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 128 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
130 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
131# endif 130# endif
132#endif 131#endif
133 132
134 // generic font fallback
135 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 133 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
136 { 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.
137 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
138 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
139#if XFT 135#if XFT
140 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
141 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 137 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
142 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 138 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
143 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 139 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
144 140
145 // FreeMono is usually uglier than x fonts, so try last only. 141 // FreeMono is usually uglier than x fonts, so try after the others
146 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 142 { CS_UNICODE, "xft:FreeMono:autohint=true" },
147#endif 143#endif
148 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" },
149 { CS_UNKNOWN, 0 } 149 { CS_UNKNOWN, 0 }
150}; 150};
151 151
152// these characters are used to guess the font height and width 152// these characters are used to guess the font height and width
153// 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.
… …
157 0x304c, 0x672c, // が本 157 0x304c, 0x672c, // が本
158}; 158};
159 159
160#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]))
161 161
162#define dTermDisplay Display *disp = term->display->display 162#define dTermDisplay Display *disp = term->dpy
163#define dTermGC GC gc = term->gc 163#define dTermGC GC gc = term->gc
164
165/////////////////////////////////////////////////////////////////////////////
166
167#if XFT
168rxvt_drawable::~rxvt_drawable ()
169{
170 if (xftdrawable)
171 XftDrawDestroy (xftdrawable);
172}
173
174rxvt_drawable::operator XftDraw *()
175{
176 if (!xftdrawable)
177 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
178
179 return xftdrawable;
180}
181#endif
182 164
183///////////////////////////////////////////////////////////////////////////// 165/////////////////////////////////////////////////////////////////////////////
184 166
185static const char * 167static const char *
186enc_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)
… …
228 return res; 210 return res;
229} 211}
230 212
231///////////////////////////////////////////////////////////////////////////// 213/////////////////////////////////////////////////////////////////////////////
232 214
215rxvt_font::rxvt_font ()
216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217{
218}
219
233void 220void
234rxvt_font::set_name (char *name) 221rxvt_font::set_name (char *name)
235{ 222{
236 if (this->name == name) 223 if (this->name == name)
237 return; 224 return;
… …
243void 230void
244rxvt_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
245{ 232{
246 dTermDisplay; 233 dTermDisplay;
247 dTermGC; 234 dTermGC;
248 235
249 if (color == Color_bg) 236 if (color == Color_bg || color == Color_transparent)
250 XClearArea (disp, d, x, y, w, h, FALSE); 237 XClearArea (disp, d, x, y, w, h, false);
251 else if (color >= 0) 238 else if (color >= 0)
252 { 239 {
253#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
254 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 255 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
256
255#else 257#else
256 XSetForeground (disp, gc, term->pix_colors[color]); 258 XSetForeground (disp, gc, term->pix_colors[color]);
257 XFillRectangle (disp, d, gc, x, y, w, h); 259 XFillRectangle (disp, d, gc, x, y, w, h);
258#endif 260#endif
259 } 261 }
260} 262}
261 263
262#include "table/linedraw.h" 264/////////////////////////////////////////////////////////////////////////////
263 265
264struct rxvt_font_default : rxvt_font { 266struct rxvt_font_default : rxvt_font {
265 struct rxvt_fontset *fs; 267 struct rxvt_fontset *fs;
266 268
267 rxvt_font_default (rxvt_fontset *fs) 269 rxvt_font_default (rxvt_fontset *fs)
… …
280 p.slant = rxvt_fontprop::roman; 282 p.slant = rxvt_fontprop::roman;
281 283
282 return p; 284 return p;
283 } 285 }
284 286
285 bool load (const rxvt_fontprop &prop) 287 bool load (const rxvt_fontprop &prop, bool force_prop)
286 { 288 {
287 width = 1; height = 1; 289 width = 1; height = 1;
288 ascent = 1; descent = 0; 290 ascent = 1; descent = 0;
289 291
290 set_name (strdup ("built-in support font")); 292 set_name (strdup ("built-in support font"));
… …
303 return false; 305 return false;
304 306
305 if (unicode <= 0x009f) 307 if (unicode <= 0x009f)
306 return true; 308 return true;
307 309
310#ifdef BUILTIN_GLYPHS
308 if (unicode >= 0x2500 && unicode <= 0x259f && 311 if (unicode >= 0x2500 && unicode <= 0x259f &&
309 !term->option (Opt_skipBuiltinGlyphs)) 312 !term->option (Opt_skipBuiltinGlyphs))
310 return true; 313 return true;
314#endif
311 315
312 if (IS_COMPOSE (unicode)) 316 if (IS_COMPOSE (unicode))
313 return true; 317 return true;
314 318
315 switch (unicode) 319 switch (unicode)
… …
351 ; 355 ;
352 356
353 int width = text - tp; 357 int width = text - tp;
354 int fwidth = term->fwidth * width; 358 int fwidth = term->fwidth * width;
355 359
360#ifdef BUILTIN_GLYPHS
356 if (0x2500 <= t && t <= 0x259f) 361 if (0x2500 <= t && t <= 0x259f)
357 { 362 {
363# include "table/linedraw.h"
358 uint16_t offs = linedraw_offs[t - 0x2500]; 364 uint16_t offs = linedraw_offs[t - 0x2500];
359 uint32_t *a = linedraw_command + (offs >> 4); 365 uint32_t *a = linedraw_command + (offs >> 4);
360 uint32_t *b = a + (offs & 15); 366 uint32_t *b = a + (offs & 15);
361 367
362 int W = fwidth; 368 int W = fwidth;
… …
400 406
401 case 1: // rectangle, possibly stippled 407 case 1: // rectangle, possibly stippled
402 if (a) 408 if (a)
403 { 409 {
404 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 410 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
405 411
406 gcv.fill_style = FillStippled; 412 gcv.fill_style = FillStippled;
407 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 413 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
408 gcv.ts_x_origin = x; 414 gcv.ts_x_origin = x;
409 gcv.ts_y_origin = y; 415 gcv.ts_y_origin = y;
410 416
… …
429 (a - 1) * 90*64, (b - 1) * 90*64); 435 (a - 1) * 90*64, (b - 1) * 90*64);
430 break; 436 break;
431 } 437 }
432 } 438 }
433 } 439 }
440#else
441 if (0)
442 ;
443#endif
434#if ENABLE_COMBINING 444#if ENABLE_COMBINING
435 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
436 { 446 {
447 min_it (width, 2); // we only support wcwidth up to 2
448
437 text_t chrs[2]; 449 text_t chrs[2];
438 width = min (2, width);
439 chrs [1] = NOCHAR; 450 chrs [1] = NOCHAR;
440 451
441 *chrs = cc->c1; 452 *chrs = cc->c1;
442 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 453 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
443 f1->draw (d, x, y, chrs, width, fg, bg); 454 f1->draw (d, x, y, chrs, width, fg, bg);
… …
450 *chrs = cc->c2; 461 *chrs = cc->c2;
451 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
452 ? f1 463 ? f1
453 : (*fs)[fs->find_font (cc->c2)]; 464 : (*fs)[fs->find_font (cc->c2)];
454 465
455 f2->draw (d, x, y, chrs, width, fg, -1); 466 f2->draw (d, x, y, chrs, width, fg, Color_none);
456 } 467 }
457 } 468 }
458#endif 469#endif
459 else 470 else
460 switch (t) 471 switch (t)
… …
480 491
481 void clear (); 492 void clear ();
482 493
483 rxvt_fontprop properties (); 494 rxvt_fontprop properties ();
484 495
485 bool load (const rxvt_fontprop &prop); 496 bool load (const rxvt_fontprop &prop, bool force_prop);
486 497
487 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;
488 499
489 void draw (rxvt_drawable &d, int x, int y, 500 void draw (rxvt_drawable &d, int x, int y,
490 const text_t *text, int len, 501 const text_t *text, int len,
491 int fg, int bg); 502 int fg, int bg);
492 503
493 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
494 XFontStruct *f; 505 XFontStruct *f;
495 codeset cs;
496 bool enc2b, encm; 506 bool enc2b, encm;
497 507
498 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 508 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
499 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);
500 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 510 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
501 bool set_properties (rxvt_fontprop &p, const char *name); 511 bool set_properties (rxvt_fontprop &p, const char *name);
502}; 512};
503 513
504char * 514char *
505rxvt_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
506{ 516{
507 unsigned long value; 517 unsigned long value;
508 518
509 if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value)) 519 if (XGetFontProperty (f, property, &value))
510 return XGetAtomName (term->display->display, value); 520 return XGetAtomName (term->dpy, value);
511 else 521 else
512 return rxvt_strdup (repl); 522 return repl ? strdup (repl) : 0;
513} 523}
514 524
515rxvt_fontprop 525rxvt_fontprop
516rxvt_font_x11::properties () 526rxvt_font_x11::properties ()
517{ 527{
… …
521} 531}
522 532
523bool 533bool
524rxvt_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)
525{ 535{
526 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;
527 p.height = height; 539 p.height = height;
528 p.ascent = rxvt_fontprop::unset; 540 p.ascent = rxvt_fontprop::unset;
529 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;
530 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;
531 543
… …
536rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 548rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
537{ 549{
538 unsigned long height; 550 unsigned long height;
539 551
540#if 0 552#if 0
541 if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height)) 553 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
542 return false; 554 return false;
543#else 555#else
544 height = f->ascent + f->descent; 556 height = f->ascent + f->descent;
545#endif 557#endif
546 558
547 unsigned long avgwidth; 559 unsigned long avgwidth;
548 if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth)) 560 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
549 avgwidth = 0; 561 avgwidth = 0;
550 562
551 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 563 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
552 char *slant = get_property (f, "SLANT", "r"); 564 char *slant = get_property (f, term->xa [XA_SLANT], "r");
553 565
554 set_properties (p, height, weight, slant, avgwidth); 566 set_properties (p, height, weight, slant, avgwidth);
555 567
556 free (weight); 568 free (weight);
557 free (slant); 569 free (slant);
… …
597 return false; 609 return false;
598} 610}
599 611
600// fix the size of scalable fonts 612// fix the size of scalable fonts
601static bool 613static bool
602replace_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)
603{ 615{
604 int slashes = 0; 616 int slashes = 0;
605 const char *field, *end; 617 const char *field, *end;
606 618
607 for (const char *c = name; *c; c++) 619 for (const char *c = name; *c; c++)
… …
617 break; 629 break;
618 } 630 }
619 631
620 if (slashes >= 13 && (!old || *field == old)) 632 if (slashes >= 13 && (!old || *field == old))
621 { 633 {
622 // TODO: check for overflow in font-name 634 size_t len = field - name;
623 strncpy (buf, name, field - name); 635 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
624 buf += field - name; 636 memcpy (*ptr, name, len);
625 strcpy (buf, replace); 637 strcpy (*ptr + len, replace);
626 strcat (buf, end); 638 strcat (*ptr, end);
627 639
628 return true; 640 return true;
629 } 641 }
630 else 642 else
631 { 643 {
632 strcpy (buf, name); 644 *ptr = strdup (name);
633 645
634 return false; 646 return false;
635 } 647 }
636} 648}
637 649
638bool 650bool
639rxvt_font_x11::load (const rxvt_fontprop &prop) 651rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
640{ 652{
641 dTermDisplay; 653 dTermDisplay;
642 654
643 clear (); 655 clear ();
644 656
645 char field_str[64]; // enough for 128 bits 657 char field_str[64]; // enough for 128 bits
646 658
647 // first morph the font if required 659 // first morph the font if required
648 if (prop.weight != rxvt_fontprop::unset 660 if (force_prop)
649 || prop.slant != rxvt_fontprop::unset)
650 { 661 {
651 char fname[1024]; 662 char *fname;
652 663
653 if (name[0] != '-') 664 if (name[0] != '-')
654 { 665 {
655 f = XLoadQueryFont (disp, name); 666 f = XLoadQueryFont (disp, name);
656 667
657 if (!f) 668 if (!f)
658 return false; 669 return false;
659 670
660 char *new_name = get_property (f, "FONT", name); 671 char *new_name = get_property (f, XA_FONT, name);
661 672
662 if (new_name) 673 if (new_name)
663 set_name (new_name); 674 set_name (new_name);
664 else 675 else
665 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
668 f = 0; 679 f = 0;
669 } 680 }
670 681
671 if (prop.weight != rxvt_fontprop::unset) 682 if (prop.weight != rxvt_fontprop::unset)
672 { 683 {
673 replace_field (fname, name, 2, 0, 684 replace_field (&fname, name, 2, 0,
674 prop.weight < rxvt_fontprop::bold 685 prop.weight < rxvt_fontprop::bold
675 ? "medium" : "bold"); 686 ? "medium" : "bold");
676 set_name (strdup (fname)); 687 set_name (fname);
677 } 688 }
678 689
679 if (prop.slant != rxvt_fontprop::unset) 690 if (prop.slant != rxvt_fontprop::unset)
680 { 691 {
681 replace_field (fname, name, 3, 0, 692 replace_field (&fname, name, 3, 0,
682 prop.slant < rxvt_fontprop::italic 693 prop.slant < rxvt_fontprop::italic
683 ? "r" : "i"); // TODO: handle "o"blique, too 694 ? "r" : "i"); // TODO: handle "o"blique, too
684 set_name (strdup (fname)); 695 set_name (fname);
685 } 696 }
686 } 697 }
687 698
688 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 699 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
689 ? 0 : prop.height); 700 ? 0 : prop.height);
… …
714 font_weight *fonts = new font_weight[count]; 725 font_weight *fonts = new font_weight[count];
715 726
716 for (int i = 0; i < count; i++) 727 for (int i = 0; i < count; i++)
717 { 728 {
718 rxvt_fontprop p; 729 rxvt_fontprop p;
719 char fname[1024]; 730 char *fname;
720 731
721 int diff = 0; 732 int diff = 0;
722 733
723 if (replace_field (fname, list[i], 6, '0', field_str)) 734 if (replace_field (&fname, list[i], 6, '0', field_str))
724 diff += 10; // slightly penalize scalable fonts 735 diff += 10; // slightly penalize scalable fonts
736 else
737 {
738 free (fname);
725 else if (replace_field (fname, list[i], 11, '0', "0")) 739 if (replace_field (&fname, list[i], 11, '0', "0"))
726 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 }
727 742
728 if (!set_properties (p, fname)) 743 if (!set_properties (p, fname))
729 continue; 744 continue;
730 745
731 if (prop.height != rxvt_fontprop::unset 746 if (prop.height != rxvt_fontprop::unset
… …
735 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;
736 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);
737 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);
738 //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);
739 754
740 fonts[i].name = strdup (fname); 755 fonts[i].name = fname;
741 fonts[i].diff = diff; 756 fonts[i].diff = diff;
742 } 757 }
743 758
744 XFreeFontNames (list); 759 XFreeFontNames (list);
745 760
… …
774 delete [] fonts; 789 delete [] fonts;
775 790
776 if (!f) 791 if (!f)
777 return false; 792 return false;
778 793
779 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
780 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
781 796
782 if (registry && encoding) 797 if (registry && encoding)
783 { 798 {
784 char charset[64]; 799 char charset[64];
785 snprintf (charset, 64, "%s-%s", registry, encoding); 800 snprintf (charset, 64, "%s-%s", registry, encoding);
786 801
787 cs = codeset_from_name (charset); 802 cs = codeset_from_name (charset);
788 } 803 }
789 else 804 else
790 { 805 {
791 const char *charset = get_property (f, "FONT", 0); 806 const char *charset = get_property (f, XA_FONT, 0);
792 807
793 if (!charset) 808 if (!charset)
794 charset = name; 809 charset = name;
795 810
796 int count = 13; 811 int count = 13;
… …
811 enc2b = encm || f->max_char_or_byte2 > 255; 826 enc2b = encm || f->max_char_or_byte2 > 255;
812 827
813 slow = false; 828 slow = false;
814 829
815#if 1 // only used for slow detection, TODO optimize 830#if 1 // only used for slow detection, TODO optimize
816 if (f->min_bounds.width == f->max_bounds.width) 831 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
817 width = f->min_bounds.width;
818 else if (f->per_char == NULL)
819 width = f->max_bounds.width; 832 width = f->max_bounds.width;
820 else 833 else
821 { 834 {
822 slow = true; 835 slow = true;
823 836
824 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;
825 838
826 if (encm) 839 if (encm)
827 N += (f->max_byte1 - f->min_byte1) 840 N += (f->max_byte1 - f->min_byte1)
828 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 841 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
829 842
830 while (N) 843 while (N)
831 { 844 {
832 if (f->per_char[N].width > width) 845 if (f->per_char[N].width > width)
833 width = f->per_char[N].width; 846 width = f->per_char[N].width;
834 847
… …
839 852
840 width = 1; 853 width = 1;
841 854
842 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; )
843 { 856 {
844 if (cs != CS_UNICODE
845 && *t > 0x100
846 && FROM_UNICODE (cs, *t) == NOCHAR) 857 if (FROM_UNICODE (cs, *t) == NOCHAR)
847 continue; 858 continue;
848 859
849 // ignore characters we wouldn't use anyways 860 // ignore characters we wouldn't use anyways
850 bool careful; 861 bool careful;
851 if (!has_char (*t, &prop, careful)) 862 if (!has_char (*t, &prop, careful))
… …
855 866
856 XCharStruct g; 867 XCharStruct g;
857 int dir_ret, asc_ret, des_ret; 868 int dir_ret, asc_ret, des_ret;
858 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 869 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
859 870
871 int wcw = WCWIDTH (*t);
860 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;
861 873
862 if (width < g.width) width = g.width; 874 if (width < g.width) width = g.width;
863 } 875 }
864 876
865 if (cs == CS_UNKNOWN) 877 if (cs == CS_UNKNOWN)
866 { 878 {
867 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 879 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
884void 896void
885rxvt_font_x11::clear () 897rxvt_font_x11::clear ()
886{ 898{
887 if (f) 899 if (f)
888 { 900 {
889 XFreeFont (term->display->display, f); 901 XFreeFont (term->dpy, f);
890 f = 0; 902 f = 0;
891 } 903 }
892} 904}
893 905
894bool 906bool
… …
937 return false; 949 return false;
938 950
939 if (!prop || prop->width == rxvt_fontprop::unset) 951 if (!prop || prop->width == rxvt_fontprop::unset)
940 return true; 952 return true;
941 953
942 // check character against base font bounding box 954 // check wether character overlaps previous/next character
943 int w = xcs->rbearing - xcs->lbearing; 955 int w = xcs->rbearing - xcs->lbearing;
944 int wcw = WCWIDTH (unicode); 956 int wcw = max (WCWIDTH (unicode), 1);
945 if (wcw > 0) w = (w + wcw - 1) / wcw;
946 957
947 careful = w > prop->width; 958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
959
948 if (careful && OVERLAP_OK (w, prop)) 960 if (careful && !OVERLAP_OK (w, wcw, prop))
949 return false; 961 return false;
950 962
951 return true; 963 return true;
952} 964}
953 965
… …
987 else 999 else
988 { 1000 {
989 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1001 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
990 1002
991 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1003 XChangeGC (disp, gc, GCForeground | GCFont, &v);
992 1004
993 if (slow) 1005 if (slow)
994 { 1006 {
995 do 1007 do
996 { 1008 {
997 if (xc->byte1 || xc->byte2) 1009 if (xc->byte1 || xc->byte2)
… …
1019 else 1031 else
1020 { 1032 {
1021 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1033 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1022 1034
1023 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1035 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1024 1036
1025 if (slow) 1037 if (slow)
1026 { 1038 {
1027 do 1039 do
1028 { 1040 {
1029 if (*xc) 1041 if (*xc)
… …
1049 1061
1050 void clear (); 1062 void clear ();
1051 1063
1052 rxvt_fontprop properties (); 1064 rxvt_fontprop properties ();
1053 1065
1054 bool load (const rxvt_fontprop &prop); 1066 bool load (const rxvt_fontprop &prop, bool force_prop);
1055 1067
1056 void draw (rxvt_drawable &d, int x, int y, 1068 void draw (rxvt_drawable &d, int x, int y,
1057 const text_t *text, int len, 1069 const text_t *text, int len,
1058 int fg, int bg); 1070 int fg, int bg);
1059 1071
1060 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;
1061 1073
1062protected: 1074protected:
1063 XftFont *f; 1075 XftFont *f;
1064}; 1076};
1065 1077
1066void 1078void
1067rxvt_font_xft::clear () 1079rxvt_font_xft::clear ()
1068{ 1080{
1069 if (f) 1081 if (f)
1070 { 1082 {
1071 XftFontClose (term->display->display, f); 1083 XftFontClose (term->dpy, f);
1072 f = 0; 1084 f = 0;
1073 } 1085 }
1074} 1086}
1075 1087
1076rxvt_fontprop 1088rxvt_fontprop
… …
1092 1104
1093 return p; 1105 return p;
1094} 1106}
1095 1107
1096bool 1108bool
1097rxvt_font_xft::load (const rxvt_fontprop &prop) 1109rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1098{ 1110{
1099 dTermDisplay; 1111 dTermDisplay;
1100 1112
1101 clear (); 1113 clear ();
1102 1114
… …
1111 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1123 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1112 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1124 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1113 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1125 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1114 1126
1115 if (prop.weight != rxvt_fontprop::unset 1127 if (prop.weight != rxvt_fontprop::unset
1116 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1128 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1117 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1129 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1118 1130
1119 if (prop.slant != rxvt_fontprop::unset 1131 if (prop.slant != rxvt_fontprop::unset
1120 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1132 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1121 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1133 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1122 1134
1123#if 0 // clipping unfortunately destroys our precious double-width-characters 1135#if 0 // clipping unfortunately destroys our precious double-width-characters
1124 // clip width, we can't do better, or can we? 1136 // clip width, we can't do better, or can we?
1125 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1243bool 1255bool
1244rxvt_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
1245{ 1257{
1246 careful = false; 1258 careful = false;
1247 1259
1248 if (!XftCharExists (term->display->display, f, unicode)) 1260 if (!XftCharExists (term->dpy, f, unicode))
1249 return false; 1261 return false;
1250 1262
1251 if (!prop || prop->width == rxvt_fontprop::unset) 1263 if (!prop || prop->width == rxvt_fontprop::unset)
1252 return true; 1264 return true;
1253 1265
1254 // check character against base font bounding box 1266 // check character against base font bounding box
1255 FcChar32 ch = unicode; 1267 FcChar32 ch = unicode;
1256 XGlyphInfo g; 1268 XGlyphInfo g;
1257 XftTextExtents32 (term->display->display, f, &ch, 1, &g); 1269 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1258 1270
1259 int w = g.width - g.x; 1271 int w = g.width - g.x;
1260 int wcw = WCWIDTH (unicode); 1272 int wcw = max (WCWIDTH (unicode), 1);
1261 if (wcw > 0) w = (w + wcw - 1) / wcw;
1262 1273
1263 careful = w > prop->width; 1274 careful = g.x > 0 || w > prop->width * wcw;
1275
1264 if (careful && OVERLAP_OK (w, prop)) 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))
1265 return false; 1281 return false;
1266 1282
1267 return true; 1283 return true;
1268} 1284}
1269 1285
1270void 1286void
1271rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1272 const text_t *text, int len, 1288 const text_t *text, int len,
1273 int fg, int bg) 1289 int fg, int bg)
1274{ 1290{
1275 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1276
1277 XGlyphInfo extents; 1291 XGlyphInfo extents;
1278 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1279 XftGlyphSpec *ep = enc; 1293 XftGlyphSpec *ep = enc;
1280 1294
1281 dTermDisplay; 1295 dTermDisplay;
1282 dTermGC; 1296 dTermGC;
1283 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
1309 buffered=false;//D
1310
1284 // cut trailing spaces 1311 // cut trailing spaces
1285 while (len && text [len - 1] == ' ') 1312 while (len && text [len - 1] == ' ')
1286 len--; 1313 len--;
1287 1314
1315 int x_ = buffered ? 0 : x;
1316 int y_ = buffered ? 0 : y;
1317
1288 while (len) 1318 while (len)
1289 { 1319 {
1290 int cwidth = term->fwidth; 1320 int cwidth = term->fwidth;
1291 FcChar32 fc = *text++; len--; 1321 FcChar32 fc = *text++; len--;
1292 1322
1293 while (len && *text == NOCHAR) 1323 while (len && *text == NOCHAR)
1294 text++, len--, cwidth += term->fwidth; 1324 text++, len--, cwidth += term->fwidth;
1295 1325
1296 if (fc != ' ') // skip spaces 1326 if (fc != ' ') // skip spaces
1297 { 1327 {
1298 FT_UInt glyph = XftCharIndex (disp, f, fc); 1328 FT_UInt glyph = XftCharIndex (disp, f, fc);
1299 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1329 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1300 1330
1301 ep->glyph = glyph; 1331 ep->glyph = glyph;
1302 ep->x = x + (cwidth - extents.xOff >> 1); 1332 ep->x = x_ + (cwidth - extents.xOff >> 1);
1303 ep->y = y + ascent; 1333 ep->y = y_ + ascent;
1334
1335 if (extents.xOff == 0)
1336 ep->x = x_ + cwidth;
1337
1304 ep++; 1338 ep++;
1305 } 1339 }
1306 1340
1307 x += cwidth; 1341 x_ += cwidth;
1342 }
1343
1344 if (buffered)
1308 } 1345 {
1309
1310 if (ep != enc) 1346 if (ep != enc)
1347 {
1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1349
1350#ifdef HAVE_BG_PIXMAP
1351 Picture dst = 0;
1352
1353 if (term->bgPixmap.pixmap
1354 && (bg == Color_transparent || bg == Color_bg
1355 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1356 {
1357 int src_x = x, src_y = y;
1358
1359 if (term->bgPixmap.is_parentOrigin ())
1360 {
1361 src_x += term->window_vt_x;
1362 src_y += term->window_vt_y;
1363 }
1364
1365 if (term->bgPixmap.pmap_width >= src_x + w
1366 && term->bgPixmap.pmap_height >= src_y + h)
1367 {
1368 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1369 src_x, src_y, w, h, 0, 0);
1370 }
1371 else
1372 {
1373 XGCValues gcv;
1374
1375 gcv.fill_style = FillTiled;
1376 gcv.tile = term->bgPixmap.pixmap;
1377 gcv.ts_x_origin = -src_x;
1378 gcv.ts_y_origin = -src_y;
1379
1380 XChangeGC (disp, gc,
1381 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1382 &gcv);
1383
1384 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1385
1386 gcv.fill_style = FillSolid;
1387 XChangeGC (disp, gc, GCFillStyle, &gcv);
1388 }
1389
1390 if (dst)
1391 {
1392 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1393
1394 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1395 }
1396 }
1397 else
1398#endif
1399 clear_rect (d, x, y, w, h, bg);
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);
1311 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1410 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1411 }
1312} 1412}
1413
1313#endif 1414#endif
1314 1415
1315///////////////////////////////////////////////////////////////////////////// 1416/////////////////////////////////////////////////////////////////////////////
1316 1417
1317rxvt_fontset::rxvt_fontset (rxvt_term *term) 1418rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1328void 1429void
1329rxvt_fontset::clear () 1430rxvt_fontset::clear ()
1330{ 1431{
1331 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1432 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1332 = rxvt_fontprop::unset; 1433 = rxvt_fontprop::unset;
1434 force_prop = false;
1333 1435
1334 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1436 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1335 FONT_UNREF (*i); 1437 FONT_UNREF (*i);
1336 1438
1337 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1439 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1346 1448
1347rxvt_font * 1449rxvt_font *
1348rxvt_fontset::new_font (const char *name, codeset cs) 1450rxvt_fontset::new_font (const char *name, codeset cs)
1349{ 1451{
1350 rxvt_font *f; 1452 rxvt_font *f;
1351 1453
1352 if (!name || !*name) 1454 if (!name || !*name)
1353 { 1455 {
1354 name = ""; 1456 name = "";
1355 f = new rxvt_font_default (this); 1457 f = new rxvt_font_default (this);
1356 } 1458 }
… …
1424 if (!end) 1526 if (!end)
1425 end = desc + strlen (desc); 1527 end = desc + strlen (desc);
1426 1528
1427 if (end - desc < 511) 1529 if (end - desc < 511)
1428 { 1530 {
1429 strncpy (buf, desc, end - desc); 1531 memcpy (buf, desc, end - desc);
1430 buf[end - desc] = 0; 1532 buf[end - desc] = 0;
1431 1533
1432 fonts.push_back (new_font (buf, cs)); 1534 fonts.push_back (new_font (buf, cs));
1433 } 1535 }
1434 else 1536 else
… …
1449 if (fonts[i]->loaded) 1551 if (fonts[i]->loaded)
1450 return true; 1552 return true;
1451 1553
1452 fonts[i]->loaded = true; 1554 fonts[i]->loaded = true;
1453 1555
1454 if (!fonts[i]->load (prop)) 1556 if (!fonts[i]->load (prop, force_prop))
1455 { 1557 {
1456 fonts[i]->cs = CS_UNKNOWN; 1558 fonts[i]->cs = CS_UNKNOWN;
1457 return false; 1559 return false;
1458 } 1560 }
1459 1561
… …
1560 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1662 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1561 FcPatternAddBool (p, FC_MINSPACE, 1); 1663 FcPatternAddBool (p, FC_MINSPACE, 1);
1562 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1664 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1563 1665
1564 XftResult result; 1666 XftResult result;
1565 FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result); 1667 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1566 1668
1567 FcPatternDestroy (p); 1669 FcPatternDestroy (p);
1568 1670
1569 if (match) 1671 if (match)
1570 { 1672 {
… …
1575 if (find_font (font) < 0) 1677 if (find_font (font) < 0)
1576 { 1678 {
1577 char fontname[4096]; 1679 char fontname[4096];
1578 sprintf (fontname, "xft:%-.4090s", font); 1680 sprintf (fontname, "xft:%-.4090s", font);
1579 1681
1580 fonts.push_back (new_font (fontname, CS_UNICODE)); 1682 fonts.push_back (new_font (fontname, CS_UNICODE));
1581 } 1683 }
1582 1684
1583 free (font); 1685 free (font);
1584 } 1686 }
1585#endif 1687#endif

Diff Legend

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