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

Diff Legend

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