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.167 by sf-exg, Mon Nov 29 12:33:22 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
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
34
32#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width 35#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
36#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
37
38#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
39 (prop)->slant >= rxvt_fontprop::italic \
40 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
41 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
42 ))
33 43
34const struct rxvt_fallback_font { 44const struct rxvt_fallback_font {
35 codeset cs; 45 codeset cs;
36 const char *name; 46 const char *name;
37} fallback_fonts[] = { 47} fallback_fonts[] = {
38 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
39 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
40 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 50 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
41 51
42#if ENCODING_EU 52#if ENCODING_EU
43 // cyrillic 53 // cyrillic
44 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 54 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
45 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 55 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
46 56
47 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 57 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
48 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 58 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
49 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 59 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
50 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 60 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
51 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 61 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
57 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 67 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
58 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 68 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
59 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 69 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
60 70
61# if XFT 71# if XFT
62 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 72 { CS_KOI8_U, "xft::lang=ru" },
63 73
64 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 74 { CS_ISO8859_5, "xft::lang=ru" },
65 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 75 { CS_ISO8859_6, "xft::lang=ar" },
66 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 76 { CS_ISO8859_7, "xft::lang=el" },
67 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 77 { CS_ISO8859_8, "xft::lang=he" },
68 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 78 { CS_ISO8859_9, "xft::lang=tr" },
69 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 79 { CS_ISO8859_10, "xft::lang=se" },
70 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 80 { CS_ISO8859_11, "xft::lang=th" },
71# endif 81# endif
72#endif 82#endif
73 83
74 // japanese 84 // japanese
75#if ENCODING_JP || ENCODING_JP_EXT 85#if ENCODING_JP || ENCODING_JP_EXT
76# if XFT 86# if XFT
77 // prefer xft for complex scripts 87 // prefer xft for complex scripts
88 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
78 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 89 { 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" }, 90 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
81 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 91 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
82# endif 92# endif
83 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
84 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
85 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 95 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
86 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 96 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
… …
90 100
91#if ENCODING_ZH || ENCODING_ZH_EXT 101#if ENCODING_ZH || ENCODING_ZH_EXT
92# if XFT 102# if XFT
93 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 103 { CS_GBK_0, "xft:AR PL KaitiM GB" },
94 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 104 { CS_GBK_0, "xft:AR PL SungtiL GB" },
95 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 105 { CS_GBK_0, "xft::lang=zh" },
96 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 106 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
97 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 107 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
98 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 108 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
99 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 109 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
100 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 110 { CS_GB2312_1980_0, "xft::lang=zh" },
101# endif 111# endif
102 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 112 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
103 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 113 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
104 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 114 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
105 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 115 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
118#if ENCODING_KR 128#if ENCODING_KR
119 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 129 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
120 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 130 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
121# if XFT 131# if XFT
122 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
123 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
124# endif 134# endif
125#endif 135#endif
126 136
127 // generic font fallback
128 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 137 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
129 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 138 //{ 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 139#if XFT
133 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
134 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 141 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
135 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 142 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
136 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 143 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
137 144
138 // FreeMono is usually uglier than x fonts, so try last only. 145 // FreeMono is usually uglier than x fonts, so try after the others
139 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 146 { CS_UNICODE, "xft:FreeMono:autohint=true" },
140#endif 147#endif
141 148
149 // generic font fallback, put this last, as many iso10646 fonts have extents
150 // specified for all glyphs in the range they cover, but most are simply empty
151 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
152 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
142 { CS_UNKNOWN, 0 } 153 { CS_UNKNOWN, 0 }
143}; 154};
144 155
145// these characters are used to guess the font height and width 156// these characters are used to guess the font height and width
146// pango uses a similar algorithm and doesn't trust the font either. 157// pango uses a similar algorithm and doesn't trust the font either.
… …
150 0x304c, 0x672c, // が本 161 0x304c, 0x672c, // が本
151}; 162};
152 163
153#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 164#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
154 165
155#define dTermDisplay Display *disp = term->display->display 166#define dTermDisplay Display *disp = term->dpy
156#define dTermGC GC gc = term->gc 167#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 168
176///////////////////////////////////////////////////////////////////////////// 169/////////////////////////////////////////////////////////////////////////////
177 170
178static const char * 171static const char *
179enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 172enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
… …
221 return res; 214 return res;
222} 215}
223 216
224///////////////////////////////////////////////////////////////////////////// 217/////////////////////////////////////////////////////////////////////////////
225 218
219rxvt_font::rxvt_font ()
220: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
221{
222}
223
226void 224void
227rxvt_font::set_name (char *name) 225rxvt_font::set_name (char *name_)
228{ 226{
229 if (this->name == name) 227 if (name == name_)
230 return; 228 return;
231 229
232 if (this->name) free (this->name); // let the compiler optimize 230 if (name) free (name); // let the compiler optimize
233 this->name = name; 231 name = name_;
234} 232}
235 233
236void 234void
237rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 235rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
238{ 236{
239 dTermDisplay; 237 dTermDisplay;
240 dTermGC; 238 dTermGC;
241 239
242 if (color == Color_bg) 240 if (color == Color_bg || color == Color_transparent)
243 XClearArea (disp, d, x, y, w, h, FALSE); 241 XClearArea (disp, d, x, y, w, h, false);
244 else if (color >= 0) 242 else if (color >= 0)
245 { 243 {
246#if XFT 244#if XFT
245 Picture dst;
246
247# ifdef HAVE_BG_PIXMAP
248 if (term->bgPixmap.pixmap
249 && !term->pix_colors[color].is_opaque ()
250 && ((dst = XftDrawPicture (d))))
251 {
252 XClearArea (disp, d, x, y, w, h, false);
253
254 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
255 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
256 }
257 else
258# endif
247 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 259 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
260
248#else 261#else
249 XSetForeground (disp, gc, term->pix_colors[color]); 262 XSetForeground (disp, gc, term->pix_colors[color]);
250 XFillRectangle (disp, d, gc, x, y, w, h); 263 XFillRectangle (disp, d, gc, x, y, w, h);
251#endif 264#endif
252 } 265 }
253} 266}
254 267
255#include "table/linedraw.h" 268/////////////////////////////////////////////////////////////////////////////
256 269
257struct rxvt_font_default : rxvt_font { 270struct rxvt_font_default : rxvt_font {
258 struct rxvt_fontset *fs; 271 struct rxvt_fontset *fs;
259 272
260 rxvt_font_default (rxvt_fontset *fs) 273 rxvt_font_default (rxvt_fontset *fs)
… …
273 p.slant = rxvt_fontprop::roman; 286 p.slant = rxvt_fontprop::roman;
274 287
275 return p; 288 return p;
276 } 289 }
277 290
278 bool load (const rxvt_fontprop &prop) 291 bool load (const rxvt_fontprop &prop, bool force_prop)
279 { 292 {
280 width = 1; height = 1; 293 width = 1; height = 1;
281 ascent = 1; descent = 0; 294 ascent = 1; descent = 0;
282 295
283 set_name (strdup ("built-in support font")); 296 set_name (strdup ("built-in support font"));
… …
296 return false; 309 return false;
297 310
298 if (unicode <= 0x009f) 311 if (unicode <= 0x009f)
299 return true; 312 return true;
300 313
314#ifdef BUILTIN_GLYPHS
301 if (unicode >= 0x2500 && unicode <= 0x259f && 315 if (unicode >= 0x2500 && unicode <= 0x259f &&
302 !term->option (Opt_skipBuiltinGlyphs)) 316 !term->option (Opt_skipBuiltinGlyphs))
303 return true; 317 return true;
318#endif
304 319
305 if (IS_COMPOSE (unicode)) 320 if (IS_COMPOSE (unicode))
306 return true; 321 return true;
307 322
308 switch (unicode) 323 switch (unicode)
… …
344 ; 359 ;
345 360
346 int width = text - tp; 361 int width = text - tp;
347 int fwidth = term->fwidth * width; 362 int fwidth = term->fwidth * width;
348 363
364#ifdef BUILTIN_GLYPHS
349 if (0x2500 <= t && t <= 0x259f) 365 if (0x2500 <= t && t <= 0x259f)
350 { 366 {
367# include "table/linedraw.h"
351 uint16_t offs = linedraw_offs[t - 0x2500]; 368 uint16_t offs = linedraw_offs[t - 0x2500];
352 uint32_t *a = linedraw_command + (offs >> 4); 369 uint32_t *a = linedraw_command + (offs >> 4);
353 uint32_t *b = a + (offs & 15); 370 uint32_t *b = a + (offs & 15);
354 371
355 int W = fwidth; 372 int W = fwidth;
… …
393 410
394 case 1: // rectangle, possibly stippled 411 case 1: // rectangle, possibly stippled
395 if (a) 412 if (a)
396 { 413 {
397 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 414 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
398 415
399 gcv.fill_style = FillStippled; 416 gcv.fill_style = FillStippled;
400 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 417 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
401 gcv.ts_x_origin = x; 418 gcv.ts_x_origin = x;
402 gcv.ts_y_origin = y; 419 gcv.ts_y_origin = y;
403 420
… …
422 (a - 1) * 90*64, (b - 1) * 90*64); 439 (a - 1) * 90*64, (b - 1) * 90*64);
423 break; 440 break;
424 } 441 }
425 } 442 }
426 } 443 }
444#else
445 if (0)
446 ;
447#endif
427#if ENABLE_COMBINING 448#if ENABLE_COMBINING
428 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 449 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
429 { 450 {
451 min_it (width, 2); // we only support wcwidth up to 2
452
430 text_t chrs[2]; 453 text_t chrs[2];
431 width = min (2, width);
432 chrs [1] = NOCHAR; 454 chrs [1] = NOCHAR;
433 455
434 *chrs = cc->c1; 456 *chrs = cc->c1;
435 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 457 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
436 f1->draw (d, x, y, chrs, width, fg, bg); 458 f1->draw (d, x, y, chrs, width, fg, bg);
437 459
438 if (cc->c2 != NOCHAR) 460 if (cc->c2 != NOCHAR)
439 { 461 {
440 bool careful; 462 bool careful;
441 463
442 // prefer font of first character, for no good reasons 464 // prefer font of first character, for no good reasons
443 *chrs = cc->c2; 465 *chrs = cc->c2;
444 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 466 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
445 ? f1 467 ? f1
446 : (*fs)[fs->find_font (cc->c2)]; 468 : (*fs)[fs->find_font_idx (cc->c2)];
447 469
448 f2->draw (d, x, y, chrs, width, fg, -1); 470 f2->draw (d, x, y, chrs, width, fg, Color_none);
449 } 471 }
450 } 472 }
451#endif 473#endif
452 else 474 else
453 switch (t) 475 switch (t)
… …
464 486
465 x += fwidth; 487 x += fwidth;
466 } 488 }
467} 489}
468 490
491struct rxvt_font_overflow : rxvt_font {
492 struct rxvt_fontset *fs;
493
494 rxvt_font_overflow (rxvt_fontset *fs)
495 : rxvt_font ()
496 {
497 this->fs = fs;
498 }
499
500 rxvt_fontprop properties ()
501 {
502 rxvt_fontprop p;
503
504 p.width = p.height = 1;
505 p.ascent = rxvt_fontprop::unset;
506 p.weight = rxvt_fontprop::medium;
507 p.slant = rxvt_fontprop::roman;
508
509 return p;
510 }
511
512 bool load (const rxvt_fontprop &prop, bool force_prop)
513 {
514 width = 1; height = 1;
515 ascent = 1; descent = 0;
516
517 set_name (strdup ("built-in rendition overflow font"));
518
519 return true;
520 }
521
522 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
523 {
524 return false;
525 }
526
527 void draw (rxvt_drawable &d, int x, int y,
528 const text_t *text, int len,
529 int fg, int bg)
530 {
531 while (len--)
532 {
533 int fid = fs->find_font_idx (*text);
534 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
535 ++text;
536 x += term->fwidth;
537 }
538 }
539};
540
469///////////////////////////////////////////////////////////////////////////// 541/////////////////////////////////////////////////////////////////////////////
470 542
471struct rxvt_font_x11 : rxvt_font { 543struct rxvt_font_x11 : rxvt_font {
472 rxvt_font_x11 () { f = 0; } 544 rxvt_font_x11 () { f = 0; }
473 545
474 void clear (); 546 void clear ();
475 547
476 rxvt_fontprop properties (); 548 rxvt_fontprop properties ();
477 549
478 bool load (const rxvt_fontprop &prop); 550 bool load (const rxvt_fontprop &prop, bool force_prop);
479 551
480 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; 552 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
481 553
482 void draw (rxvt_drawable &d, int x, int y, 554 void draw (rxvt_drawable &d, int x, int y,
483 const text_t *text, int len, 555 const text_t *text, int len,
484 int fg, int bg); 556 int fg, int bg);
485 557
486 bool slow; // wether this is a proportional font or has other funny characteristics 558 bool slow; // whether this is a proportional font or has other funny characteristics
487 XFontStruct *f; 559 XFontStruct *f;
488 codeset cs;
489 bool enc2b, encm; 560 bool enc2b, encm;
490 561
491 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 562 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); 563 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); 564 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
494 bool set_properties (rxvt_fontprop &p, const char *name); 565 bool set_properties (rxvt_fontprop &p, const char *name);
495}; 566};
496 567
497char * 568char *
498rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 569rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
499{ 570{
500 unsigned long value; 571 unsigned long value;
501 572
502 if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value)) 573 if (XGetFontProperty (f, property, &value))
503 return XGetAtomName (term->display->display, value); 574 return XGetAtomName (term->dpy, value);
504 else 575 else
505 return rxvt_strdup (repl); 576 return repl ? strdup (repl) : 0;
506} 577}
507 578
508rxvt_fontprop 579rxvt_fontprop
509rxvt_font_x11::properties () 580rxvt_font_x11::properties ()
510{ 581{
… …
514} 585}
515 586
516bool 587bool
517rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 588rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
518{ 589{
519 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 590 p.width = width != rxvt_fontprop::unset ? width
591 : avgwidth ? (avgwidth + 1) / 10
592 : (height + 1) / 2;
520 p.height = height; 593 p.height = height;
521 p.ascent = rxvt_fontprop::unset; 594 p.ascent = rxvt_fontprop::unset;
522 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 595 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; 596 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
524 597
… …
529rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 602rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
530{ 603{
531 unsigned long height; 604 unsigned long height;
532 605
533#if 0 606#if 0
534 if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height)) 607 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
535 return false; 608 return false;
536#else 609#else
537 height = f->ascent + f->descent; 610 height = f->ascent + f->descent;
538#endif 611#endif
539 612
540 unsigned long avgwidth; 613 unsigned long avgwidth;
541 if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth)) 614 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
542 avgwidth = 0; 615 avgwidth = 0;
543 616
544 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 617 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
545 char *slant = get_property (f, "SLANT", "r"); 618 char *slant = get_property (f, term->xa [XA_SLANT], "r");
546 619
547 set_properties (p, height, weight, slant, avgwidth); 620 set_properties (p, height, weight, slant, avgwidth);
548 621
549 free (weight); 622 free (weight);
550 free (slant); 623 free (slant);
… …
590 return false; 663 return false;
591} 664}
592 665
593// fix the size of scalable fonts 666// fix the size of scalable fonts
594static bool 667static bool
595replace_field (char *buf, const char *name, int index, const char old, const char *replace) 668replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
596{ 669{
597 int slashes = 0; 670 int slashes = 0;
598 const char *field, *end; 671 const char *field, *end;
599 672
600 for (const char *c = name; *c; c++) 673 for (const char *c = name; *c; c++)
… …
610 break; 683 break;
611 } 684 }
612 685
613 if (slashes >= 13 && (!old || *field == old)) 686 if (slashes >= 13 && (!old || *field == old))
614 { 687 {
615 // TODO: check for overflow in font-name 688 size_t len = field - name;
616 strncpy (buf, name, field - name); 689 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
617 buf += field - name; 690 memcpy (*ptr, name, len);
618 strcpy (buf, replace); 691 strcpy (*ptr + len, replace);
619 strcat (buf, end); 692 strcat (*ptr, end);
620 693
621 return true; 694 return true;
622 } 695 }
623 else 696 else
624 { 697 {
625 strcpy (buf, name); 698 *ptr = strdup (name);
626 699
627 return false; 700 return false;
628 } 701 }
629} 702}
630 703
631bool 704bool
632rxvt_font_x11::load (const rxvt_fontprop &prop) 705rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
633{ 706{
634 dTermDisplay; 707 dTermDisplay;
635 708
636 clear (); 709 clear ();
637 710
638 char field_str[64]; // enough for 128 bits 711 char field_str[64]; // enough for 128 bits
639 712
640 // first morph the font if required 713 // first morph the font if required
641 if (prop.weight != rxvt_fontprop::unset 714 if (force_prop)
642 || prop.slant != rxvt_fontprop::unset)
643 { 715 {
644 char fname[1024]; 716 char *fname;
645 717
646 if (name[0] != '-') 718 if (name[0] != '-')
647 { 719 {
648 f = XLoadQueryFont (disp, name); 720 f = XLoadQueryFont (disp, name);
649 721
650 if (!f) 722 if (!f)
651 return false; 723 return false;
652 724
653 char *new_name = get_property (f, "FONT", name); 725 char *new_name = get_property (f, XA_FONT, name);
654 726
655 if (new_name) 727 if (new_name)
656 set_name (new_name); 728 set_name (new_name);
657 else 729 else
658 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 730 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
661 f = 0; 733 f = 0;
662 } 734 }
663 735
664 if (prop.weight != rxvt_fontprop::unset) 736 if (prop.weight != rxvt_fontprop::unset)
665 { 737 {
666 replace_field (fname, name, 2, 0, 738 replace_field (&fname, name, 2, 0,
667 prop.weight < rxvt_fontprop::bold 739 prop.weight < rxvt_fontprop::bold
668 ? "medium" : "bold"); 740 ? "medium" : "bold");
669 set_name (strdup (fname)); 741 set_name (fname);
670 } 742 }
671 743
672 if (prop.slant != rxvt_fontprop::unset) 744 if (prop.slant != rxvt_fontprop::unset)
673 { 745 {
674 replace_field (fname, name, 3, 0, 746 replace_field (&fname, name, 3, 0,
675 prop.slant < rxvt_fontprop::italic 747 prop.slant < rxvt_fontprop::italic
676 ? "r" : "i"); // TODO: handle "o"blique, too 748 ? "r" : "i"); // TODO: handle "o"blique, too
677 set_name (strdup (fname)); 749 set_name (fname);
678 } 750 }
679 } 751 }
680 752
681 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 753 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
682 ? 0 : prop.height); 754 ? 0 : prop.height);
… …
707 font_weight *fonts = new font_weight[count]; 779 font_weight *fonts = new font_weight[count];
708 780
709 for (int i = 0; i < count; i++) 781 for (int i = 0; i < count; i++)
710 { 782 {
711 rxvt_fontprop p; 783 rxvt_fontprop p;
712 char fname[1024]; 784 char *fname;
713 785
714 int diff = 0; 786 int diff = 0;
715 787
716 if (replace_field (fname, list[i], 6, '0', field_str)) 788 if (replace_field (&fname, list[i], 6, '0', field_str))
717 diff += 10; // slightly penalize scalable fonts 789 diff += 10; // slightly penalize scalable fonts
790 else
791 {
792 free (fname);
718 else if (replace_field (fname, list[i], 11, '0', "0")) 793 if (replace_field (&fname, list[i], 11, '0', "0"))
719 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 794 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
795 }
720 796
721 if (!set_properties (p, fname)) 797 if (!set_properties (p, fname))
722 continue; 798 continue;
723 799
724 if (prop.height != rxvt_fontprop::unset 800 if (prop.height != rxvt_fontprop::unset
… …
728 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 804 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); 805 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); 806 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); 807 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
732 808
733 fonts[i].name = strdup (fname); 809 fonts[i].name = fname;
734 fonts[i].diff = diff; 810 fonts[i].diff = diff;
735 } 811 }
736 812
737 XFreeFontNames (list); 813 XFreeFontNames (list);
738 814
… …
767 delete [] fonts; 843 delete [] fonts;
768 844
769 if (!f) 845 if (!f)
770 return false; 846 return false;
771 847
772 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 848 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
773 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 849 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
850
851 cs = CS_UNKNOWN;
774 852
775 if (registry && encoding) 853 if (registry && encoding)
776 { 854 {
777 char charset[64]; 855 char charset[64];
778 snprintf (charset, 64, "%s-%s", registry, encoding); 856 snprintf (charset, 64, "%s-%s", registry, encoding);
779 857
780 cs = codeset_from_name (charset); 858 cs = codeset_from_name (charset);
781 } 859
782 else 860 if (cs == CS_UNKNOWN)
861 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
783 { 862 }
863
864 free (registry);
865 free (encoding);
866
867 if (cs == CS_UNKNOWN)
868 {
784 const char *charset = get_property (f, "FONT", 0); 869 const char *charset = get_property (f, XA_FONT, 0);
785 870
786 if (!charset) 871 if (!charset)
787 charset = name; 872 charset = name;
788 873
789 int count = 13; 874 int count = 13;
790 while (*charset) 875 while (*charset)
791 if (*charset++ == '-' && !--count) 876 if (*charset++ == '-' && !--count)
792 break; 877 break;
793 878
794 cs = codeset_from_name (charset); 879 cs = codeset_from_name (charset);
880 if (cs == CS_UNKNOWN)
881 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
882 }
883
884 if (cs == CS_UNKNOWN)
795 } 885 {
796 886 clear ();
797 free (registry); 887 return false;
798 free (encoding); 888 }
799 889
800 if (cs == CS_UNICODE) 890 if (cs == CS_UNICODE)
801 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 891 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
802 892
803 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 893 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
804 enc2b = encm || f->max_char_or_byte2 > 255; 894 enc2b = encm || f->max_char_or_byte2 > 255;
805 895
806 slow = false; 896 slow = false;
807 897
808#if 1 // only used for slow detection, TODO optimize 898#if 1 // only used for slow detection, TODO optimize
809 if (f->min_bounds.width == f->max_bounds.width) 899 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; 900 width = f->max_bounds.width;
813 else 901 else
814 { 902 {
815 slow = true; 903 slow = true;
816 904
817 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 905 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
818 906
819 if (encm) 907 if (encm)
820 N += (f->max_byte1 - f->min_byte1) 908 N += (f->max_byte1 - f->min_byte1)
821 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 909 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
822 910
823 while (N) 911 while (N)
824 { 912 {
825 if (f->per_char[N].width > width) 913 if (f->per_char[N].width > width)
826 width = f->per_char[N].width; 914 width = f->per_char[N].width;
827 915
… …
832 920
833 width = 1; 921 width = 1;
834 922
835 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 923 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
836 { 924 {
837 if (cs != CS_UNICODE
838 && *t > 0x100
839 && FROM_UNICODE (cs, *t) == NOCHAR) 925 if (FROM_UNICODE (cs, *t) == NOCHAR)
840 continue; 926 continue;
841 927
842 // ignore characters we wouldn't use anyways 928 // ignore characters we wouldn't use anyways
843 bool careful; 929 bool careful;
844 if (!has_char (*t, &prop, careful)) 930 if (!has_char (*t, &prop, careful))
… …
848 934
849 XCharStruct g; 935 XCharStruct g;
850 int dir_ret, asc_ret, des_ret; 936 int dir_ret, asc_ret, des_ret;
851 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 937 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
852 938
939 int wcw = WCWIDTH (*t);
853 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 940 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
854 941
855 if (width < g.width) width = g.width; 942 if (width < g.width) width = g.width;
856 }
857
858 if (cs == CS_UNKNOWN)
859 { 943 }
860 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
861 944
945#if 0 // do it per-character
946 if (prop && width > prop->width)
947 {
862 clear (); 948 clear ();
863 return false; 949 return false;
864 } 950 }
865
866#if 0 // do it per-character
867 if (prop && width > prop->width)
868 {
869 clear ();
870 return false;
871 }
872#endif 951#endif
873 952
874 return true; 953 return true;
875} 954}
876 955
877void 956void
878rxvt_font_x11::clear () 957rxvt_font_x11::clear ()
879{ 958{
880 if (f) 959 if (f)
881 { 960 {
882 XFreeFont (term->display->display, f); 961 XFreeFont (term->dpy, f);
883 f = 0; 962 f = 0;
884 } 963 }
885} 964}
886 965
887bool 966bool
… …
890 uint32_t ch = FROM_UNICODE (cs, unicode); 969 uint32_t ch = FROM_UNICODE (cs, unicode);
891 970
892 if (ch == NOCHAR) 971 if (ch == NOCHAR)
893 return false; 972 return false;
894 973
895 /* check wether the character exists in _this_ font. horrible. */ 974 /* check whether the character exists in _this_ font. horrible. */
896 XCharStruct *xcs; 975 XCharStruct *xcs;
897 976
898 if (encm) 977 if (encm)
899 { 978 {
900 unsigned char byte1 = ch >> 8; 979 unsigned char byte1 = ch >> 8;
… …
930 return false; 1009 return false;
931 1010
932 if (!prop || prop->width == rxvt_fontprop::unset) 1011 if (!prop || prop->width == rxvt_fontprop::unset)
933 return true; 1012 return true;
934 1013
935 // check character against base font bounding box 1014 // check whether character overlaps previous/next character
936 int w = xcs->width; 1015 int w = xcs->rbearing - xcs->lbearing;
937 int wcw = wcwidth (unicode); 1016 int wcw = max (WCWIDTH (unicode), 1);
938 if (wcw > 0) w = (w + wcw - 1) / wcw;
939 1017
940 careful = w > prop->width; 1018 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
941 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1019
1020 if (careful && !OVERLAP_OK (w, wcw, prop))
942 return false; 1021 return false;
943 1022
944 return true; 1023 return true;
945} 1024}
946 1025
… …
980 else 1059 else
981 { 1060 {
982 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1061 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
983 1062
984 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1063 XChangeGC (disp, gc, GCForeground | GCFont, &v);
985 1064
986 if (slow) 1065 if (slow)
987 { 1066 {
988 do 1067 do
989 { 1068 {
990 if (xc->byte1 || xc->byte2) 1069 if (xc->byte1 || xc->byte2)
… …
1012 else 1091 else
1013 { 1092 {
1014 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1093 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1015 1094
1016 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1095 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1017 1096
1018 if (slow) 1097 if (slow)
1019 { 1098 {
1020 do 1099 do
1021 { 1100 {
1022 if (*xc) 1101 if (*xc)
… …
1042 1121
1043 void clear (); 1122 void clear ();
1044 1123
1045 rxvt_fontprop properties (); 1124 rxvt_fontprop properties ();
1046 1125
1047 bool load (const rxvt_fontprop &prop); 1126 bool load (const rxvt_fontprop &prop, bool force_prop);
1048 1127
1049 void draw (rxvt_drawable &d, int x, int y, 1128 void draw (rxvt_drawable &d, int x, int y,
1050 const text_t *text, int len, 1129 const text_t *text, int len,
1051 int fg, int bg); 1130 int fg, int bg);
1052 1131
1053 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1132 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1054 1133
1055protected: 1134protected:
1056 XftFont *f; 1135 XftFont *f;
1057}; 1136};
1058 1137
1059void 1138void
1060rxvt_font_xft::clear () 1139rxvt_font_xft::clear ()
1061{ 1140{
1062 if (f) 1141 if (f)
1063 { 1142 {
1064 XftFontClose (term->display->display, f); 1143 XftFontClose (term->dpy, f);
1065 f = 0; 1144 f = 0;
1066 } 1145 }
1067} 1146}
1068 1147
1069rxvt_fontprop 1148rxvt_fontprop
… …
1085 1164
1086 return p; 1165 return p;
1087} 1166}
1088 1167
1089bool 1168bool
1090rxvt_font_xft::load (const rxvt_fontprop &prop) 1169rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1091{ 1170{
1092 dTermDisplay; 1171 dTermDisplay;
1093 1172
1094 clear (); 1173 clear ();
1095 1174
… …
1104 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1183 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1105 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1184 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1106 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1185 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1107 1186
1108 if (prop.weight != rxvt_fontprop::unset 1187 if (prop.weight != rxvt_fontprop::unset
1109 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1188 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1110 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1189 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1111 1190
1112 if (prop.slant != rxvt_fontprop::unset 1191 if (prop.slant != rxvt_fontprop::unset
1113 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1192 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1114 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1193 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1115 1194
1116#if 0 // clipping unfortunately destroys our precious double-width-characters 1195#if 0 // clipping unfortunately destroys our precious double-width-characters
1117 // clip width, we can't do better, or can we? 1196 // clip width, we can't do better, or can we?
1118 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1197 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1119 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1198 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1120#endif 1199#endif
1121 1200
1122 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1201 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1123 FcPatternAddBool (p, FC_MINSPACE, 1); 1202 FcPatternAddBool (p, FC_MINSPACE, 1);
1124 1203
… …
1176 XGlyphInfo g; 1255 XGlyphInfo g;
1177 XftTextExtents16 (disp, f, &ch, 1, &g); 1256 XftTextExtents16 (disp, f, &ch, 1, &g);
1178 1257
1179 g.width -= g.x; 1258 g.width -= g.x;
1180 1259
1181 int wcw = wcwidth (ch); 1260 int wcw = WCWIDTH (ch);
1182 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1261 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1183 1262
1184 if (width < g.width ) width = g.width; 1263 if (width < g.width ) width = g.width;
1185 if (height < g.height ) height = g.height; 1264 if (height < g.height ) height = g.height;
1186 if (glheight < g.height - g.y) glheight = g.height - g.y; 1265 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1236bool 1315bool
1237rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1316rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1238{ 1317{
1239 careful = false; 1318 careful = false;
1240 1319
1241 if (!XftCharExists (term->display->display, f, unicode)) 1320 if (!XftCharExists (term->dpy, f, unicode))
1242 return false; 1321 return false;
1243 1322
1244 if (!prop || prop->width == rxvt_fontprop::unset) 1323 if (!prop || prop->width == rxvt_fontprop::unset)
1245 return true; 1324 return true;
1246 1325
1247 // check character against base font bounding box 1326 // check character against base font bounding box
1248 FcChar32 ch = unicode; 1327 FcChar32 ch = unicode;
1249 XGlyphInfo g; 1328 XGlyphInfo g;
1250 XftTextExtents32 (term->display->display, f, &ch, 1, &g); 1329 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1251 1330
1252 int w = g.width - g.x; 1331 int w = g.width - g.x;
1253 int wcw = wcwidth (unicode); 1332 int wcw = max (WCWIDTH (unicode), 1);
1254 if (wcw > 0) w = (w + wcw - 1) / wcw;
1255 1333
1256 careful = w > prop->width; 1334 careful = g.x > 0 || w > prop->width * wcw;
1257 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1335
1336 if (careful && !OVERLAP_OK (w, wcw, prop))
1337 return false;
1338
1339 // this weeds out _totally_ broken fonts, or glyphs
1340 if (!OVERLAP_OK (g.xOff, wcw, prop))
1258 return false; 1341 return false;
1259 1342
1260 return true; 1343 return true;
1261} 1344}
1262 1345
1263void 1346void
1264rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1347rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1265 const text_t *text, int len, 1348 const text_t *text, int len,
1266 int fg, int bg) 1349 int fg, int bg)
1267{ 1350{
1268 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1269
1270 XGlyphInfo extents; 1351 XGlyphInfo extents;
1271 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1352 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1272 XftGlyphSpec *ep = enc; 1353 XftGlyphSpec *ep = enc;
1273 1354
1274 dTermDisplay; 1355 dTermDisplay;
1275 dTermGC; 1356 dTermGC;
1357
1358 int w = term->fwidth * len;
1359 int h = term->fheight;
1360
1361 bool buffered = bg >= Color_transparent
1362 && term->option (Opt_buffered);
1276 1363
1277 // cut trailing spaces 1364 // cut trailing spaces
1278 while (len && text [len - 1] == ' ') 1365 while (len && text [len - 1] == ' ')
1279 len--; 1366 len--;
1280 1367
1368 int x_ = buffered ? 0 : x;
1369 int y_ = buffered ? 0 : y;
1370
1281 while (len) 1371 while (len)
1282 { 1372 {
1283 int cwidth = term->fwidth; 1373 int cwidth = term->fwidth;
1284 FcChar32 fc = *text++; len--; 1374 FcChar32 fc = *text++; len--;
1285 1375
1286 while (len && *text == NOCHAR) 1376 while (len && *text == NOCHAR)
1287 text++, len--, cwidth += term->fwidth; 1377 text++, len--, cwidth += term->fwidth;
1288 1378
1289 if (fc != ' ') // skip spaces 1379 if (fc != ' ') // skip spaces
1290 { 1380 {
1291 FT_UInt glyph = XftCharIndex (disp, f, fc); 1381 FT_UInt glyph = XftCharIndex (disp, f, fc);
1292 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1382 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1293 1383
1294 ep->glyph = glyph; 1384 ep->glyph = glyph;
1295 ep->x = x + (cwidth - extents.xOff >> 1); 1385 ep->x = x_ + (cwidth - extents.xOff >> 1);
1296 ep->y = y + ascent; 1386 ep->y = y_ + ascent;
1387
1388 if (extents.xOff == 0)
1389 ep->x = x_ + cwidth;
1390
1297 ep++; 1391 ep++;
1298 } 1392 }
1299 1393
1300 x += cwidth; 1394 x_ += cwidth;
1395 }
1396
1397 if (buffered)
1301 } 1398 {
1302
1303 if (ep != enc) 1399 if (ep != enc)
1400 {
1401 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1402
1403#ifdef HAVE_BG_PIXMAP
1404 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1405
1406 if (term->bgPixmap.pixmap
1407 && (bg == Color_transparent || bg == Color_bg
1408 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1409 {
1410 int src_x = x, src_y = y;
1411
1412 if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
1413 {
1414 src_x += term->window_vt_x;
1415 src_y += term->window_vt_y;
1416 }
1417
1418 if (term->bgPixmap.pmap_width >= src_x + w
1419 && term->bgPixmap.pmap_height >= src_y + h)
1420 {
1421 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1422 src_x, src_y, w, h, 0, 0);
1423 }
1424 else
1425 {
1426 XGCValues gcv;
1427
1428 gcv.fill_style = FillTiled;
1429 gcv.tile = term->bgPixmap.pixmap;
1430 gcv.ts_x_origin = -src_x;
1431 gcv.ts_y_origin = -src_y;
1432
1433 XChangeGC (disp, gc,
1434 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1435 &gcv);
1436
1437 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1438
1439 gcv.fill_style = FillSolid;
1440 XChangeGC (disp, gc, GCFillStyle, &gcv);
1441 }
1442
1443 if (dst)
1444 {
1445 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1446
1447 // dst can only be set when bg >= 0
1448 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1449 }
1450 }
1451 else
1452#endif
1453 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1454
1455 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1456 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1457 }
1458 else
1459 clear_rect (d, x, y, w, h, bg);
1460 }
1461 else
1462 {
1463 clear_rect (d, x, y, w, h, bg);
1304 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1464 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1465 }
1305} 1466}
1467
1306#endif 1468#endif
1307 1469
1308///////////////////////////////////////////////////////////////////////////// 1470/////////////////////////////////////////////////////////////////////////////
1309 1471
1310rxvt_fontset::rxvt_fontset (rxvt_term *term) 1472rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1321void 1483void
1322rxvt_fontset::clear () 1484rxvt_fontset::clear ()
1323{ 1485{
1324 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1486 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1325 = rxvt_fontprop::unset; 1487 = rxvt_fontprop::unset;
1488 force_prop = false;
1326 1489
1327 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1490 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1328 FONT_UNREF (*i); 1491 (*i)->unref ();
1329 1492
1330 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1493 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1331 delete *p; 1494 delete *p;
1332 1495
1333 free (fontdesc); fontdesc = 0; 1496 free (fontdesc); fontdesc = 0;
… …
1335 fonts.clear (); 1498 fonts.clear ();
1336 1499
1337 fallback = fallback_fonts; 1500 fallback = fallback_fonts;
1338} 1501}
1339 1502
1503void
1504rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1505{
1506 font->set_term (term);
1507
1508 font->cs = cs;
1509 font->loaded = false;
1510}
1511
1340rxvt_font * 1512rxvt_font *
1341rxvt_fontset::new_font (const char *name, codeset cs) 1513rxvt_fontset::new_font (const char *name, codeset cs)
1342{ 1514{
1343 rxvt_font *f; 1515 rxvt_font *f;
1344 1516
1345 if (!name || !*name) 1517 if (!name || !*name)
1346 { 1518 {
1347 name = ""; 1519 name = "";
1348 f = new rxvt_font_default (this); 1520 f = new rxvt_font_default (this);
1349 } 1521 }
… …
1360 f = new rxvt_font_x11; 1532 f = new rxvt_font_x11;
1361 } 1533 }
1362 else 1534 else
1363 f = new rxvt_font_x11; 1535 f = new rxvt_font_x11;
1364 1536
1365 f->set_term (term);
1366 f->set_name (strdup (name)); 1537 f->set_name (strdup (name));
1367 1538 prepare_font (f, cs);
1368 f->cs = cs;
1369 f->loaded = false;
1370 1539
1371 return f; 1540 return f;
1372} 1541}
1373 1542
1374///////////////////////////////////////////////////////////////////////////// 1543/////////////////////////////////////////////////////////////////////////////
1544
1545void
1546rxvt_fontset::push_font (rxvt_font *font)
1547{
1548 // the fontCount index is reserved for the overflow font, it is only
1549 // necessary when we get fontCount or more fonts, as they cannot be
1550 // represented in the rendition.
1551 if (fonts.size () == fontCount)
1552 {
1553 rxvt_font *f = new rxvt_font_overflow (this);
1554
1555 prepare_font (f, CS_UNICODE);
1556 fonts.push_back (f);
1557 }
1558
1559 fonts.push_back (font);
1560}
1375 1561
1376void 1562void
1377rxvt_fontset::add_fonts (const char *desc) 1563rxvt_fontset::add_fonts (const char *desc)
1378{ 1564{
1379 if (desc) 1565 if (desc)
… …
1417 if (!end) 1603 if (!end)
1418 end = desc + strlen (desc); 1604 end = desc + strlen (desc);
1419 1605
1420 if (end - desc < 511) 1606 if (end - desc < 511)
1421 { 1607 {
1422 strncpy (buf, desc, end - desc); 1608 memcpy (buf, desc, end - desc);
1423 buf[end - desc] = 0; 1609 buf[end - desc] = 0;
1424 1610
1425 fonts.push_back (new_font (buf, cs)); 1611 push_font (new_font (buf, cs));
1426 } 1612 }
1427 else 1613 else
1428 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1614 rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1429 1615
1430 desc = end + 1; 1616 desc = end + 1;
… …
1442 if (fonts[i]->loaded) 1628 if (fonts[i]->loaded)
1443 return true; 1629 return true;
1444 1630
1445 fonts[i]->loaded = true; 1631 fonts[i]->loaded = true;
1446 1632
1447 if (!fonts[i]->load (prop)) 1633 if (!fonts[i]->load (prop, force_prop))
1448 { 1634 {
1449 fonts[i]->cs = CS_UNKNOWN; 1635 fonts[i]->cs = CS_UNKNOWN;
1450 return false; 1636 return false;
1451 } 1637 }
1452 1638
… …
1458{ 1644{
1459 clear (); 1645 clear ();
1460 1646
1461 fontdesc = strdup (desc); 1647 fontdesc = strdup (desc);
1462 1648
1463 fonts.push_back (new_font (0, CS_UNICODE)); 1649 push_font (new_font (0, CS_UNICODE));
1464 realize_font (0); 1650 realize_font (0);
1465 1651
1466 add_fonts (desc); 1652 add_fonts (desc);
1467 1653
1468 return true; 1654 return true;
… …
1477 1663
1478 return -1; 1664 return -1;
1479} 1665}
1480 1666
1481int 1667int
1482rxvt_fontset::find_font (unicode_t unicode) 1668rxvt_fontset::find_font_idx (unicode_t unicode)
1483{ 1669{
1484 if (unicode >= 1<<20) 1670 if (unicode >= 1<<20)
1485 return 0; 1671 return 0;
1486 1672
1487 unicode_t hi = unicode >> 8; 1673 unicode_t hi = unicode >> 8;
… …
1513 goto next_font; 1699 goto next_font;
1514 1700
1515 bool careful; 1701 bool careful;
1516 if (f->has_char (unicode, &prop, careful)) 1702 if (f->has_char (unicode, &prop, careful))
1517 { 1703 {
1518 if (careful) 1704 i = (i << 1) | careful;
1519 i |= 128;
1520 1705
1521 goto found; 1706 goto found;
1522 } 1707 }
1523 1708
1524 next_font: 1709 next_font:
1525 if (i == fonts.size () - 1) 1710 if (i == fonts.size () - 1)
1526 { 1711 {
1527 if (fallback->name) 1712 if (fallback->name)
1528 { 1713 {
1529 // search through the fallback list 1714 // search through the fallback list
1530 fonts.push_back (new_font (fallback->name, fallback->cs)); 1715 push_font (new_font (fallback->name, fallback->cs));
1531 fallback++; 1716 fallback++;
1532 } 1717 }
1533 else 1718 else
1534 { 1719 {
1535 // try to find a new font. 1720 // try to find a new font.
… …
1553 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1738 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1554 FcPatternAddBool (p, FC_MINSPACE, 1); 1739 FcPatternAddBool (p, FC_MINSPACE, 1);
1555 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1740 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1556 1741
1557 XftResult result; 1742 XftResult result;
1558 FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result); 1743 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1559 1744
1560 FcPatternDestroy (p); 1745 FcPatternDestroy (p);
1561 1746
1562 if (match) 1747 if (match)
1563 { 1748 {
… …
1566 FcPatternDestroy (match); 1751 FcPatternDestroy (match);
1567 1752
1568 if (find_font (font) < 0) 1753 if (find_font (font) < 0)
1569 { 1754 {
1570 char fontname[4096]; 1755 char fontname[4096];
1571 sprintf (fontname, "xft:%-.4090s", font); 1756 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1572 1757
1573 fonts.push_back (new_font (fontname, CS_UNICODE)); 1758 push_font (new_font (fontname, CS_UNICODE));
1574 } 1759 }
1575 1760
1576 free (font); 1761 free (font);
1577 } 1762 }
1578#endif 1763#endif
… …
1600 } 1785 }
1601 1786
1602 return i; 1787 return i;
1603} 1788}
1604 1789
1605
1606

Diff Legend

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