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.156 by root, Tue Mar 30 23:36:14 2010 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
25#include "rxvtutil.h" 24#include "rxvtutil.h"
26#include "rxvtfont.h" 25#include "rxvtfont.h"
27 26
28#include <cstdlib> 27#include <cstdlib>
29#include <wchar.h> 28
30#include <inttypes.h> 29#include <inttypes.h>
31 30
32#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width 31#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
32#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
33
34#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
35 (prop)->slant >= rxvt_fontprop::italic \
36 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
37 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
38 ))
33 39
34const struct rxvt_fallback_font { 40const struct rxvt_fallback_font {
35 codeset cs; 41 codeset cs;
36 const char *name; 42 const char *name;
37} fallback_fonts[] = { 43} fallback_fonts[] = {
38 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 44 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
39 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 45 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
40 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
41 47
42#if ENCODING_EU 48#if ENCODING_EU
43 // cyrillic 49 // cyrillic
44 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 50 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
45 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 51 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
46 52
47 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 53 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
48 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 54 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
49 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 55 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
50 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 56 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
51 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 57 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
57 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 63 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
58 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 64 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
59 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 65 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
60 66
61# if XFT 67# if XFT
62 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 68 { CS_KOI8_U, "xft::lang=ru" },
63 69
64 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 70 { CS_ISO8859_5, "xft::lang=ru" },
65 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 71 { CS_ISO8859_6, "xft::lang=ar" },
66 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 72 { CS_ISO8859_7, "xft::lang=el" },
67 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 73 { CS_ISO8859_8, "xft::lang=he" },
68 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 74 { CS_ISO8859_9, "xft::lang=tr" },
69 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 75 { CS_ISO8859_10, "xft::lang=se" },
70 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 76 { CS_ISO8859_11, "xft::lang=th" },
71# endif 77# endif
72#endif 78#endif
73 79
74 // japanese 80 // japanese
75#if ENCODING_JP || ENCODING_JP_EXT 81#if ENCODING_JP || ENCODING_JP_EXT
76# if XFT 82# if XFT
77 // prefer xft for complex scripts 83 // prefer xft for complex scripts
84 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
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" },
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 (name == name_)
230 return; 224 return;
231 225
232 if (this->name) free (this->name); // let the compiler optimize 226 if (name) free (name); // let the compiler optimize
233 this->name = name; 227 name = name_;
234} 228}
235 229
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 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
247 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 255 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
256
248#else 257#else
249 XSetForeground (disp, gc, term->pix_colors[color]); 258 XSetForeground (disp, gc, term->pix_colors[color]);
250 XFillRectangle (disp, d, gc, x, y, w, h); 259 XFillRectangle (disp, d, gc, x, y, w, h);
251#endif 260#endif
252 } 261 }
253} 262}
254 263
255#include "table/linedraw.h" 264/////////////////////////////////////////////////////////////////////////////
256 265
257struct rxvt_font_default : rxvt_font { 266struct rxvt_font_default : rxvt_font {
258 struct rxvt_fontset *fs; 267 struct rxvt_fontset *fs;
259 268
260 rxvt_font_default (rxvt_fontset *fs) 269 rxvt_font_default (rxvt_fontset *fs)
… …
273 p.slant = rxvt_fontprop::roman; 282 p.slant = rxvt_fontprop::roman;
274 283
275 return p; 284 return p;
276 } 285 }
277 286
278 bool load (const rxvt_fontprop &prop) 287 bool load (const rxvt_fontprop &prop, bool force_prop)
279 { 288 {
280 width = 1; height = 1; 289 width = 1; height = 1;
281 ascent = 1; descent = 0; 290 ascent = 1; descent = 0;
282 291
283 set_name (strdup ("built-in support font")); 292 set_name (strdup ("built-in support font"));
… …
296 return false; 305 return false;
297 306
298 if (unicode <= 0x009f) 307 if (unicode <= 0x009f)
299 return true; 308 return true;
300 309
310#ifdef BUILTIN_GLYPHS
301 if (unicode >= 0x2500 && unicode <= 0x259f && 311 if (unicode >= 0x2500 && unicode <= 0x259f &&
302 !term->option (Opt_skipBuiltinGlyphs)) 312 !term->option (Opt_skipBuiltinGlyphs))
303 return true; 313 return true;
314#endif
304 315
305 if (IS_COMPOSE (unicode)) 316 if (IS_COMPOSE (unicode))
306 return true; 317 return true;
307 318
308 switch (unicode) 319 switch (unicode)
… …
344 ; 355 ;
345 356
346 int width = text - tp; 357 int width = text - tp;
347 int fwidth = term->fwidth * width; 358 int fwidth = term->fwidth * width;
348 359
360#ifdef BUILTIN_GLYPHS
349 if (0x2500 <= t && t <= 0x259f) 361 if (0x2500 <= t && t <= 0x259f)
350 { 362 {
363# include "table/linedraw.h"
351 uint16_t offs = linedraw_offs[t - 0x2500]; 364 uint16_t offs = linedraw_offs[t - 0x2500];
352 uint32_t *a = linedraw_command + (offs >> 4); 365 uint32_t *a = linedraw_command + (offs >> 4);
353 uint32_t *b = a + (offs & 15); 366 uint32_t *b = a + (offs & 15);
354 367
355 int W = fwidth; 368 int W = fwidth;
… …
393 406
394 case 1: // rectangle, possibly stippled 407 case 1: // rectangle, possibly stippled
395 if (a) 408 if (a)
396 { 409 {
397 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 410 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
398 411
399 gcv.fill_style = FillStippled; 412 gcv.fill_style = FillStippled;
400 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 413 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
401 gcv.ts_x_origin = x; 414 gcv.ts_x_origin = x;
402 gcv.ts_y_origin = y; 415 gcv.ts_y_origin = y;
403 416
… …
422 (a - 1) * 90*64, (b - 1) * 90*64); 435 (a - 1) * 90*64, (b - 1) * 90*64);
423 break; 436 break;
424 } 437 }
425 } 438 }
426 } 439 }
440#else
441 if (0)
442 ;
443#endif
427#if ENABLE_COMBINING 444#if ENABLE_COMBINING
428 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
429 { 446 {
447 min_it (width, 2); // we only support wcwidth up to 2
448
430 text_t chrs[2]; 449 text_t chrs[2];
431 width = min (2, width);
432 chrs [1] = NOCHAR; 450 chrs [1] = NOCHAR;
433 451
434 *chrs = cc->c1; 452 *chrs = cc->c1;
435 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 453 rxvt_font *f1 = fs->get (cc->c1);
436 f1->draw (d, x, y, chrs, width, fg, bg); 454 f1->draw (d, x, y, chrs, width, fg, bg);
437 455
438 if (cc->c2 != NOCHAR) 456 if (cc->c2 != NOCHAR)
439 { 457 {
440 bool careful; 458 bool careful;
441 459
442 // prefer font of first character, for no good reasons 460 // prefer font of first character, for no good reasons
443 *chrs = cc->c2; 461 *chrs = cc->c2;
444 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
445 ? f1 463 ? f1
446 : (*fs)[fs->find_font (cc->c2)]; 464 : fs->get (cc->c2);
447 465
448 f2->draw (d, x, y, chrs, width, fg, -1); 466 f2->draw (d, x, y, chrs, width, fg, Color_none);
449 } 467 }
450 } 468 }
451#endif 469#endif
452 else 470 else
453 switch (t) 471 switch (t)
… …
473 491
474 void clear (); 492 void clear ();
475 493
476 rxvt_fontprop properties (); 494 rxvt_fontprop properties ();
477 495
478 bool load (const rxvt_fontprop &prop); 496 bool load (const rxvt_fontprop &prop, bool force_prop);
479 497
480 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;
481 499
482 void draw (rxvt_drawable &d, int x, int y, 500 void draw (rxvt_drawable &d, int x, int y,
483 const text_t *text, int len, 501 const text_t *text, int len,
484 int fg, int bg); 502 int fg, int bg);
485 503
486 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
487 XFontStruct *f; 505 XFontStruct *f;
488 codeset cs;
489 bool enc2b, encm; 506 bool enc2b, encm;
490 507
491 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 508 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); 509 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); 510 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
494 bool set_properties (rxvt_fontprop &p, const char *name); 511 bool set_properties (rxvt_fontprop &p, const char *name);
495}; 512};
496 513
497char * 514char *
498rxvt_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
499{ 516{
500 unsigned long value; 517 unsigned long value;
501 518
502 if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value)) 519 if (XGetFontProperty (f, property, &value))
503 return XGetAtomName (term->display->display, value); 520 return XGetAtomName (term->dpy, value);
504 else 521 else
505 return rxvt_strdup (repl); 522 return repl ? strdup (repl) : 0;
506} 523}
507 524
508rxvt_fontprop 525rxvt_fontprop
509rxvt_font_x11::properties () 526rxvt_font_x11::properties ()
510{ 527{
… …
514} 531}
515 532
516bool 533bool
517rxvt_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)
518{ 535{
519 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;
520 p.height = height; 539 p.height = height;
521 p.ascent = rxvt_fontprop::unset; 540 p.ascent = rxvt_fontprop::unset;
522 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;
523 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;
524 543
… …
529rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 548rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
530{ 549{
531 unsigned long height; 550 unsigned long height;
532 551
533#if 0 552#if 0
534 if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height)) 553 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
535 return false; 554 return false;
536#else 555#else
537 height = f->ascent + f->descent; 556 height = f->ascent + f->descent;
538#endif 557#endif
539 558
540 unsigned long avgwidth; 559 unsigned long avgwidth;
541 if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth)) 560 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
542 avgwidth = 0; 561 avgwidth = 0;
543 562
544 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 563 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
545 char *slant = get_property (f, "SLANT", "r"); 564 char *slant = get_property (f, term->xa [XA_SLANT], "r");
546 565
547 set_properties (p, height, weight, slant, avgwidth); 566 set_properties (p, height, weight, slant, avgwidth);
548 567
549 free (weight); 568 free (weight);
550 free (slant); 569 free (slant);
… …
590 return false; 609 return false;
591} 610}
592 611
593// fix the size of scalable fonts 612// fix the size of scalable fonts
594static bool 613static bool
595replace_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)
596{ 615{
597 int slashes = 0; 616 int slashes = 0;
598 const char *field, *end; 617 const char *field, *end;
599 618
600 for (const char *c = name; *c; c++) 619 for (const char *c = name; *c; c++)
… …
610 break; 629 break;
611 } 630 }
612 631
613 if (slashes >= 13 && (!old || *field == old)) 632 if (slashes >= 13 && (!old || *field == old))
614 { 633 {
615 // TODO: check for overflow in font-name 634 size_t len = field - name;
616 strncpy (buf, name, field - name); 635 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
617 buf += field - name; 636 memcpy (*ptr, name, len);
618 strcpy (buf, replace); 637 strcpy (*ptr + len, replace);
619 strcat (buf, end); 638 strcat (*ptr, end);
620 639
621 return true; 640 return true;
622 } 641 }
623 else 642 else
624 { 643 {
625 strcpy (buf, name); 644 *ptr = strdup (name);
626 645
627 return false; 646 return false;
628 } 647 }
629} 648}
630 649
631bool 650bool
632rxvt_font_x11::load (const rxvt_fontprop &prop) 651rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
633{ 652{
634 dTermDisplay; 653 dTermDisplay;
635 654
636 clear (); 655 clear ();
637 656
638 char field_str[64]; // enough for 128 bits 657 char field_str[64]; // enough for 128 bits
639 658
640 // first morph the font if required 659 // first morph the font if required
641 if (prop.weight != rxvt_fontprop::unset 660 if (force_prop)
642 || prop.slant != rxvt_fontprop::unset)
643 { 661 {
644 char fname[1024]; 662 char *fname;
645 663
646 if (name[0] != '-') 664 if (name[0] != '-')
647 { 665 {
648 f = XLoadQueryFont (disp, name); 666 f = XLoadQueryFont (disp, name);
649 667
650 if (!f) 668 if (!f)
651 return false; 669 return false;
652 670
653 char *new_name = get_property (f, "FONT", name); 671 char *new_name = get_property (f, XA_FONT, name);
654 672
655 if (new_name) 673 if (new_name)
656 set_name (new_name); 674 set_name (new_name);
657 else 675 else
658 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
661 f = 0; 679 f = 0;
662 } 680 }
663 681
664 if (prop.weight != rxvt_fontprop::unset) 682 if (prop.weight != rxvt_fontprop::unset)
665 { 683 {
666 replace_field (fname, name, 2, 0, 684 replace_field (&fname, name, 2, 0,
667 prop.weight < rxvt_fontprop::bold 685 prop.weight < rxvt_fontprop::bold
668 ? "medium" : "bold"); 686 ? "medium" : "bold");
669 set_name (strdup (fname)); 687 set_name (fname);
670 } 688 }
671 689
672 if (prop.slant != rxvt_fontprop::unset) 690 if (prop.slant != rxvt_fontprop::unset)
673 { 691 {
674 replace_field (fname, name, 3, 0, 692 replace_field (&fname, name, 3, 0,
675 prop.slant < rxvt_fontprop::italic 693 prop.slant < rxvt_fontprop::italic
676 ? "r" : "i"); // TODO: handle "o"blique, too 694 ? "r" : "i"); // TODO: handle "o"blique, too
677 set_name (strdup (fname)); 695 set_name (fname);
678 } 696 }
679 } 697 }
680 698
681 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 699 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
682 ? 0 : prop.height); 700 ? 0 : prop.height);
… …
707 font_weight *fonts = new font_weight[count]; 725 font_weight *fonts = new font_weight[count];
708 726
709 for (int i = 0; i < count; i++) 727 for (int i = 0; i < count; i++)
710 { 728 {
711 rxvt_fontprop p; 729 rxvt_fontprop p;
712 char fname[1024]; 730 char *fname;
713 731
714 int diff = 0; 732 int diff = 0;
715 733
716 if (replace_field (fname, list[i], 6, '0', field_str)) 734 if (replace_field (&fname, list[i], 6, '0', field_str))
717 diff += 10; // slightly penalize scalable fonts 735 diff += 10; // slightly penalize scalable fonts
736 else
737 {
738 free (fname);
718 else if (replace_field (fname, list[i], 11, '0', "0")) 739 if (replace_field (&fname, list[i], 11, '0', "0"))
719 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 }
720 742
721 if (!set_properties (p, fname)) 743 if (!set_properties (p, fname))
722 continue; 744 continue;
723 745
724 if (prop.height != rxvt_fontprop::unset 746 if (prop.height != rxvt_fontprop::unset
… …
728 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;
729 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);
730 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);
731 //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);
732 754
733 fonts[i].name = strdup (fname); 755 fonts[i].name = fname;
734 fonts[i].diff = diff; 756 fonts[i].diff = diff;
735 } 757 }
736 758
737 XFreeFontNames (list); 759 XFreeFontNames (list);
738 760
… …
767 delete [] fonts; 789 delete [] fonts;
768 790
769 if (!f) 791 if (!f)
770 return false; 792 return false;
771 793
772 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
773 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
796
797 cs = CS_UNKNOWN;
774 798
775 if (registry && encoding) 799 if (registry && encoding)
776 { 800 {
777 char charset[64]; 801 char charset[64];
778 snprintf (charset, 64, "%s-%s", registry, encoding); 802 snprintf (charset, 64, "%s-%s", registry, encoding);
779 803
780 cs = codeset_from_name (charset); 804 cs = codeset_from_name (charset);
781 } 805
782 else 806 if (cs == CS_UNKNOWN)
807 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
783 { 808 }
809
810 free (registry);
811 free (encoding);
812
813 if (cs == CS_UNKNOWN)
814 {
784 const char *charset = get_property (f, "FONT", 0); 815 const char *charset = get_property (f, XA_FONT, 0);
785 816
786 if (!charset) 817 if (!charset)
787 charset = name; 818 charset = name;
788 819
789 int count = 13; 820 int count = 13;
790 while (*charset) 821 while (*charset)
791 if (*charset++ == '-' && !--count) 822 if (*charset++ == '-' && !--count)
792 break; 823 break;
793 824
794 cs = codeset_from_name (charset); 825 cs = codeset_from_name (charset);
826 if (cs == CS_UNKNOWN)
827 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
828 }
829
830 if (cs == CS_UNKNOWN)
795 } 831 {
796 832 clear ();
797 free (registry); 833 return false;
798 free (encoding); 834 }
799 835
800 if (cs == CS_UNICODE) 836 if (cs == CS_UNICODE)
801 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 837 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
802 838
803 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 839 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
804 enc2b = encm || f->max_char_or_byte2 > 255; 840 enc2b = encm || f->max_char_or_byte2 > 255;
805 841
806 slow = false; 842 slow = false;
807 843
808#if 1 // only used for slow detection, TODO optimize 844#if 1 // only used for slow detection, TODO optimize
809 if (f->min_bounds.width == f->max_bounds.width) 845 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; 846 width = f->max_bounds.width;
813 else 847 else
814 { 848 {
815 slow = true; 849 slow = true;
816 850
817 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 851 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
818 852
819 if (encm) 853 if (encm)
820 N += (f->max_byte1 - f->min_byte1) 854 N += (f->max_byte1 - f->min_byte1)
821 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 855 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
822 856
823 while (N) 857 while (N)
824 { 858 {
825 if (f->per_char[N].width > width) 859 if (f->per_char[N].width > width)
826 width = f->per_char[N].width; 860 width = f->per_char[N].width;
827 861
… …
832 866
833 width = 1; 867 width = 1;
834 868
835 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 869 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
836 { 870 {
837 if (cs != CS_UNICODE
838 && *t > 0x100
839 && FROM_UNICODE (cs, *t) == NOCHAR) 871 if (FROM_UNICODE (cs, *t) == NOCHAR)
840 continue; 872 continue;
841 873
842 // ignore characters we wouldn't use anyways 874 // ignore characters we wouldn't use anyways
843 bool careful; 875 bool careful;
844 if (!has_char (*t, &prop, careful)) 876 if (!has_char (*t, &prop, careful))
… …
848 880
849 XCharStruct g; 881 XCharStruct g;
850 int dir_ret, asc_ret, des_ret; 882 int dir_ret, asc_ret, des_ret;
851 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 883 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
852 884
885 int wcw = WCWIDTH (*t);
853 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 886 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
854 887
855 if (width < g.width) width = g.width; 888 if (width < g.width) width = g.width;
856 }
857
858 if (cs == CS_UNKNOWN)
859 { 889 }
860 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
861 890
891#if 0 // do it per-character
892 if (prop && width > prop->width)
893 {
862 clear (); 894 clear ();
863 return false; 895 return false;
864 } 896 }
865
866#if 0 // do it per-character
867 if (prop && width > prop->width)
868 {
869 clear ();
870 return false;
871 }
872#endif 897#endif
873 898
874 return true; 899 return true;
875} 900}
876 901
877void 902void
878rxvt_font_x11::clear () 903rxvt_font_x11::clear ()
879{ 904{
880 if (f) 905 if (f)
881 { 906 {
882 XFreeFont (term->display->display, f); 907 XFreeFont (term->dpy, f);
883 f = 0; 908 f = 0;
884 } 909 }
885} 910}
886 911
887bool 912bool
… …
930 return false; 955 return false;
931 956
932 if (!prop || prop->width == rxvt_fontprop::unset) 957 if (!prop || prop->width == rxvt_fontprop::unset)
933 return true; 958 return true;
934 959
935 // check character against base font bounding box 960 // check wether character overlaps previous/next character
936 int w = xcs->width; 961 int w = xcs->rbearing - xcs->lbearing;
937 int wcw = wcwidth (unicode); 962 int wcw = max (WCWIDTH (unicode), 1);
938 if (wcw > 0) w = (w + wcw - 1) / wcw;
939 963
940 careful = w > prop->width; 964 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
941 if (careful && w > prop->width * MAX_OVERLAP >> 2) 965
966 if (careful && !OVERLAP_OK (w, wcw, prop))
942 return false; 967 return false;
943 968
944 return true; 969 return true;
945} 970}
946 971
… …
980 else 1005 else
981 { 1006 {
982 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1007 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
983 1008
984 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1009 XChangeGC (disp, gc, GCForeground | GCFont, &v);
985 1010
986 if (slow) 1011 if (slow)
987 { 1012 {
988 do 1013 do
989 { 1014 {
990 if (xc->byte1 || xc->byte2) 1015 if (xc->byte1 || xc->byte2)
… …
1012 else 1037 else
1013 { 1038 {
1014 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1039 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1015 1040
1016 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1041 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1017 1042
1018 if (slow) 1043 if (slow)
1019 { 1044 {
1020 do 1045 do
1021 { 1046 {
1022 if (*xc) 1047 if (*xc)
… …
1042 1067
1043 void clear (); 1068 void clear ();
1044 1069
1045 rxvt_fontprop properties (); 1070 rxvt_fontprop properties ();
1046 1071
1047 bool load (const rxvt_fontprop &prop); 1072 bool load (const rxvt_fontprop &prop, bool force_prop);
1048 1073
1049 void draw (rxvt_drawable &d, int x, int y, 1074 void draw (rxvt_drawable &d, int x, int y,
1050 const text_t *text, int len, 1075 const text_t *text, int len,
1051 int fg, int bg); 1076 int fg, int bg);
1052 1077
1053 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1078 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1054 1079
1055protected: 1080protected:
1056 XftFont *f; 1081 XftFont *f;
1057}; 1082};
1058 1083
1059void 1084void
1060rxvt_font_xft::clear () 1085rxvt_font_xft::clear ()
1061{ 1086{
1062 if (f) 1087 if (f)
1063 { 1088 {
1064 XftFontClose (term->display->display, f); 1089 XftFontClose (term->dpy, f);
1065 f = 0; 1090 f = 0;
1066 } 1091 }
1067} 1092}
1068 1093
1069rxvt_fontprop 1094rxvt_fontprop
… …
1085 1110
1086 return p; 1111 return p;
1087} 1112}
1088 1113
1089bool 1114bool
1090rxvt_font_xft::load (const rxvt_fontprop &prop) 1115rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1091{ 1116{
1092 dTermDisplay; 1117 dTermDisplay;
1093 1118
1094 clear (); 1119 clear ();
1095 1120
… …
1104 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1129 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1105 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1130 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1106 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1131 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1107 1132
1108 if (prop.weight != rxvt_fontprop::unset 1133 if (prop.weight != rxvt_fontprop::unset
1109 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1134 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1110 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1135 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1111 1136
1112 if (prop.slant != rxvt_fontprop::unset 1137 if (prop.slant != rxvt_fontprop::unset
1113 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1138 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1114 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1139 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1115 1140
1116#if 0 // clipping unfortunately destroys our precious double-width-characters 1141#if 0 // clipping unfortunately destroys our precious double-width-characters
1117 // clip width, we can't do better, or can we? 1142 // clip width, we can't do better, or can we?
1118 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1143 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1119 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1144 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1120#endif 1145#endif
1121 1146
1122 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1147 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1123 FcPatternAddBool (p, FC_MINSPACE, 1); 1148 FcPatternAddBool (p, FC_MINSPACE, 1);
1124 1149
… …
1176 XGlyphInfo g; 1201 XGlyphInfo g;
1177 XftTextExtents16 (disp, f, &ch, 1, &g); 1202 XftTextExtents16 (disp, f, &ch, 1, &g);
1178 1203
1179 g.width -= g.x; 1204 g.width -= g.x;
1180 1205
1181 int wcw = wcwidth (ch); 1206 int wcw = WCWIDTH (ch);
1182 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1207 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1183 1208
1184 if (width < g.width ) width = g.width; 1209 if (width < g.width ) width = g.width;
1185 if (height < g.height ) height = g.height; 1210 if (height < g.height ) height = g.height;
1186 if (glheight < g.height - g.y) glheight = g.height - g.y; 1211 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1236bool 1261bool
1237rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1262rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1238{ 1263{
1239 careful = false; 1264 careful = false;
1240 1265
1241 if (!XftCharExists (term->display->display, f, unicode)) 1266 if (!XftCharExists (term->dpy, f, unicode))
1242 return false; 1267 return false;
1243 1268
1244 if (!prop || prop->width == rxvt_fontprop::unset) 1269 if (!prop || prop->width == rxvt_fontprop::unset)
1245 return true; 1270 return true;
1246 1271
1247 // check character against base font bounding box 1272 // check character against base font bounding box
1248 FcChar32 ch = unicode; 1273 FcChar32 ch = unicode;
1249 XGlyphInfo g; 1274 XGlyphInfo g;
1250 XftTextExtents32 (term->display->display, f, &ch, 1, &g); 1275 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1251 1276
1252 int w = g.width - g.x; 1277 int w = g.width - g.x;
1253 int wcw = wcwidth (unicode); 1278 int wcw = max (WCWIDTH (unicode), 1);
1254 if (wcw > 0) w = (w + wcw - 1) / wcw;
1255 1279
1256 careful = w > prop->width; 1280 careful = g.x > 0 || w > prop->width * wcw;
1257 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1281
1282 if (careful && !OVERLAP_OK (w, wcw, prop))
1283 return false;
1284
1285 // this weeds out _totally_ broken fonts, or glyphs
1286 if (!OVERLAP_OK (g.xOff, wcw, prop))
1258 return false; 1287 return false;
1259 1288
1260 return true; 1289 return true;
1261} 1290}
1262 1291
1263void 1292void
1264rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1293rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1265 const text_t *text, int len, 1294 const text_t *text, int len,
1266 int fg, int bg) 1295 int fg, int bg)
1267{ 1296{
1268 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1269
1270 XGlyphInfo extents; 1297 XGlyphInfo extents;
1271 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1298 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1272 XftGlyphSpec *ep = enc; 1299 XftGlyphSpec *ep = enc;
1273 1300
1274 dTermDisplay; 1301 dTermDisplay;
1275 dTermGC; 1302 dTermGC;
1303
1304 int w = term->fwidth * len;
1305 int h = term->fheight;
1306
1307 bool buffered = bg >= Color_transparent
1308 && term->option (Opt_buffered);
1276 1309
1277 // cut trailing spaces 1310 // cut trailing spaces
1278 while (len && text [len - 1] == ' ') 1311 while (len && text [len - 1] == ' ')
1279 len--; 1312 len--;
1280 1313
1314 int x_ = buffered ? 0 : x;
1315 int y_ = buffered ? 0 : y;
1316
1281 while (len) 1317 while (len)
1282 { 1318 {
1283 int cwidth = term->fwidth; 1319 int cwidth = term->fwidth;
1284 FcChar32 fc = *text++; len--; 1320 FcChar32 fc = *text++; len--;
1285 1321
1286 while (len && *text == NOCHAR) 1322 while (len && *text == NOCHAR)
1287 text++, len--, cwidth += term->fwidth; 1323 text++, len--, cwidth += term->fwidth;
1288 1324
1289 if (fc != ' ') // skip spaces 1325 if (fc != ' ') // skip spaces
1290 { 1326 {
1291 FT_UInt glyph = XftCharIndex (disp, f, fc); 1327 FT_UInt glyph = XftCharIndex (disp, f, fc);
1292 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1328 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1293 1329
1294 ep->glyph = glyph; 1330 ep->glyph = glyph;
1295 ep->x = x + (cwidth - extents.xOff >> 1); 1331 ep->x = x_ + (cwidth - extents.xOff >> 1);
1296 ep->y = y + ascent; 1332 ep->y = y_ + ascent;
1333
1334 if (extents.xOff == 0)
1335 ep->x = x_ + cwidth;
1336
1297 ep++; 1337 ep++;
1298 } 1338 }
1299 1339
1300 x += cwidth; 1340 x_ += cwidth;
1341 }
1342
1343 if (buffered)
1301 } 1344 {
1302
1303 if (ep != enc) 1345 if (ep != enc)
1346 {
1347 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1348
1349#ifdef HAVE_BG_PIXMAP
1350 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1351
1352 if (term->bgPixmap.pixmap
1353 && (bg == Color_transparent || bg == Color_bg
1354 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1355 {
1356 int src_x = x, src_y = y;
1357
1358 if (term->bgPixmap.is_parentOrigin ())
1359 {
1360 src_x += term->window_vt_x;
1361 src_y += term->window_vt_y;
1362 }
1363
1364 if (term->bgPixmap.pmap_width >= src_x + w
1365 && term->bgPixmap.pmap_height >= src_y + h)
1366 {
1367 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1368 src_x, src_y, w, h, 0, 0);
1369 }
1370 else
1371 {
1372 XGCValues gcv;
1373
1374 gcv.fill_style = FillTiled;
1375 gcv.tile = term->bgPixmap.pixmap;
1376 gcv.ts_x_origin = -src_x;
1377 gcv.ts_y_origin = -src_y;
1378
1379 XChangeGC (disp, gc,
1380 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1381 &gcv);
1382
1383 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1384
1385 gcv.fill_style = FillSolid;
1386 XChangeGC (disp, gc, GCFillStyle, &gcv);
1387 }
1388
1389 if (dst)
1390 {
1391 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1392
1393 // dst can only be set when bg >= 0
1394 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1395 }
1396 }
1397 else
1398#endif
1399 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1400
1401 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1402 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1403 }
1404 else
1405 clear_rect (d, x, y, w, h, bg);
1406 }
1407 else
1408 {
1409 clear_rect (d, x, y, w, h, bg);
1304 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1410 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1411 }
1305} 1412}
1413
1306#endif 1414#endif
1307 1415
1308///////////////////////////////////////////////////////////////////////////// 1416/////////////////////////////////////////////////////////////////////////////
1309 1417
1310rxvt_fontset::rxvt_fontset (rxvt_term *term) 1418rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1321void 1429void
1322rxvt_fontset::clear () 1430rxvt_fontset::clear ()
1323{ 1431{
1324 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1432 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1325 = rxvt_fontprop::unset; 1433 = rxvt_fontprop::unset;
1434 force_prop = false;
1326 1435
1327 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1436 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1328 FONT_UNREF (*i); 1437 FONT_UNREF (*i);
1329 1438
1330 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1439 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1339 1448
1340rxvt_font * 1449rxvt_font *
1341rxvt_fontset::new_font (const char *name, codeset cs) 1450rxvt_fontset::new_font (const char *name, codeset cs)
1342{ 1451{
1343 rxvt_font *f; 1452 rxvt_font *f;
1344 1453
1345 if (!name || !*name) 1454 if (!name || !*name)
1346 { 1455 {
1347 name = ""; 1456 name = "";
1348 f = new rxvt_font_default (this); 1457 f = new rxvt_font_default (this);
1349 } 1458 }
… …
1417 if (!end) 1526 if (!end)
1418 end = desc + strlen (desc); 1527 end = desc + strlen (desc);
1419 1528
1420 if (end - desc < 511) 1529 if (end - desc < 511)
1421 { 1530 {
1422 strncpy (buf, desc, end - desc); 1531 memcpy (buf, desc, end - desc);
1423 buf[end - desc] = 0; 1532 buf[end - desc] = 0;
1424 1533
1425 fonts.push_back (new_font (buf, cs)); 1534 fonts.push_back (new_font (buf, cs));
1426 } 1535 }
1427 else 1536 else
… …
1442 if (fonts[i]->loaded) 1551 if (fonts[i]->loaded)
1443 return true; 1552 return true;
1444 1553
1445 fonts[i]->loaded = true; 1554 fonts[i]->loaded = true;
1446 1555
1447 if (!fonts[i]->load (prop)) 1556 if (!fonts[i]->load (prop, force_prop))
1448 { 1557 {
1449 fonts[i]->cs = CS_UNKNOWN; 1558 fonts[i]->cs = CS_UNKNOWN;
1450 return false; 1559 return false;
1451 } 1560 }
1452 1561
… …
1477 1586
1478 return -1; 1587 return -1;
1479} 1588}
1480 1589
1481int 1590int
1482rxvt_fontset::find_font (unicode_t unicode) 1591rxvt_fontset::find_font_idx (unicode_t unicode, bool &careful)
1483{ 1592{
1484 if (unicode >= 1<<20) 1593 if (unicode >= 1<<20)
1485 return 0; 1594 return 0;
1486 1595
1487 unicode_t hi = unicode >> 8; 1596 unicode_t hi = unicode >> 8;
1488 1597
1489 if (hi < fmap.size () 1598 if (hi < fmap.size () && fmap[hi])
1490 && fmap[hi] 1599 {
1491 && (*fmap[hi])[unicode & 0xff] != 0xff) 1600 unsigned char m = (*fmap[hi])[unicode & 0xff];
1492 return (*fmap[hi])[unicode & 0xff]; 1601
1602 if (m != 0xff)
1603 {
1604 careful = m & 128;
1605 return m & 127;
1606 }
1607 }
1493 1608
1494 unsigned int i; 1609 unsigned int i;
1495 1610
1496 for (i = 0; i < fonts.size (); i++) 1611 for (i = 0; i < fonts.size (); i++)
1497 { 1612 {
… …
1510 } 1625 }
1511 1626
1512 if (f->cs == CS_UNKNOWN) 1627 if (f->cs == CS_UNKNOWN)
1513 goto next_font; 1628 goto next_font;
1514 1629
1515 bool careful;
1516 if (f->has_char (unicode, &prop, careful)) 1630 if (f->has_char (unicode, &prop, careful))
1517 {
1518 if (careful)
1519 i |= 128;
1520
1521 goto found; 1631 goto found;
1522 }
1523 1632
1524 next_font: 1633 next_font:
1525 if (i == fonts.size () - 1) 1634 if (i == fonts.size () - 1)
1526 { 1635 {
1527 if (fallback->name) 1636 if (fallback->name)
… …
1553 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1662 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1554 FcPatternAddBool (p, FC_MINSPACE, 1); 1663 FcPatternAddBool (p, FC_MINSPACE, 1);
1555 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1664 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1556 1665
1557 XftResult result; 1666 XftResult result;
1558 FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result); 1667 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1559 1668
1560 FcPatternDestroy (p); 1669 FcPatternDestroy (p);
1561 1670
1562 if (match) 1671 if (match)
1563 { 1672 {
… …
1566 FcPatternDestroy (match); 1675 FcPatternDestroy (match);
1567 1676
1568 if (find_font (font) < 0) 1677 if (find_font (font) < 0)
1569 { 1678 {
1570 char fontname[4096]; 1679 char fontname[4096];
1571 sprintf (fontname, "xft:%-.4090s", font); 1680 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1572 1681
1573 fonts.push_back (new_font (fontname, CS_UNICODE)); 1682 fonts.push_back (new_font (fontname, CS_UNICODE));
1574 } 1683 }
1575 1684
1576 free (font); 1685 free (font);
1577 } 1686 }
1578#endif 1687#endif
… …
1580 } 1689 }
1581 } 1690 }
1582 1691
1583 /* we must return SOME font */ 1692 /* we must return SOME font */
1584 i = 0; 1693 i = 0;
1694 careful = false;
1585 1695
1586found: 1696found:
1587 // found a font, cache it 1697 // found a font, cache it
1588 if (i < 255) 1698 if (i < 255)
1589 { 1699 {
… …
1594 { 1704 {
1595 fmap[hi] = (pagemap *)new pagemap; 1705 fmap[hi] = (pagemap *)new pagemap;
1596 memset (fmap[hi], 0xff, sizeof (pagemap)); 1706 memset (fmap[hi], 0xff, sizeof (pagemap));
1597 } 1707 }
1598 1708
1599 (*fmap[hi])[unicode & 0xff] = i; 1709 (*fmap[hi])[unicode & 0xff] = i | (careful ? 128 : 0);
1600 } 1710 }
1601 1711
1602 return i; 1712 return i;
1603} 1713}
1604 1714
1715int
1716rxvt_fontset::find_font (unicode_t unicode)
1717{
1718 bool careful;
1719 int id = find_font_idx (unicode, careful);
1605 1720
1721 return min<int> (fontCount, id) | (careful ? Careful : 0);
1722}
1606 1723

Diff Legend

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