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.199 by root, Thu Jun 17 00:08:35 2021 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 <schmorp@schmorp.de>
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 3 of the License, or
10 * (at your option) any later version. 10 * (at your option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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 <stdlib.h>
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 137 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
135 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
136 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
137 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
138 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
139#if XFT 138#if XFT
140 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
141 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
142 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
143 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 142 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
144 143
145 // FreeMono is usually uglier than x fonts, so try last only. 144 // FreeMono is usually uglier than x fonts, so try after the others
146 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 145 { CS_UNICODE, "xft:FreeMono:autohint=true" },
147#endif 146#endif
148 147
148 // generic font fallback, put this last, as many iso10646 fonts have extents
149 // specified for all glyphs in the range they cover, but most are simply empty
150 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
151 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
149 { CS_UNKNOWN, 0 } 152 { CS_UNKNOWN, 0 }
150}; 153};
151 154
152// these characters are used to guess the font height and width 155// these characters are used to guess the font height and width
153// pango uses a similar algorithm and doesn't trust the font either. 156// pango uses a similar algorithm and doesn't trust the font either.
… …
155 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 158 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
156 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 159 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
157 0x304c, 0x672c, // が本 160 0x304c, 0x672c, // が本
158}; 161};
159 162
160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
161
162#define dTermDisplay Display *disp = term->display->display 163#define dTermDisplay Display *disp = term->dpy
163#define dTermGC GC gc = term->gc 164#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 165
183///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
184 167
185static const char * 168static const char *
186enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 169enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
… …
228 return res; 211 return res;
229} 212}
230 213
231///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
232 215
216rxvt_font::rxvt_font ()
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{
219}
220
233void 221void
234rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name_)
235{ 223{
236 if (this->name == name) 224 if (name == name_)
237 return; 225 return;
238 226
239 if (this->name) free (this->name); // let the compiler optimize 227 if (name) free (name); // let the compiler optimize
240 this->name = name; 228 name = name_;
241} 229}
242 230
243void 231void
244rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
245{ 233{
246 dTermDisplay; 234 dTermDisplay;
247 dTermGC; 235 dTermGC;
248 236
249 if (color == Color_bg) 237 if (color == Color_bg || color == Color_transparent)
250 XClearArea (disp, d, x, y, w, h, FALSE); 238 XClearArea (disp, d, x, y, w, h, false);
251 else if (color >= 0) 239 else if (color >= 0)
252 { 240 {
253#if XFT 241#if XFT
242 Picture dst;
243
244# ifdef HAVE_IMG
245 if (term->bg_img
246 && !term->pix_colors[color].is_opaque ()
247 && ((dst = XftDrawPicture (d))))
248 {
249 XClearArea (disp, d, x, y, w, h, false);
250
251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
252 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
253 }
254 else
255# endif
254 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
257
255#else 258#else
256 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
257 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
258#endif 261#endif
259 } 262 }
260} 263}
261 264
262#include "table/linedraw.h" 265/////////////////////////////////////////////////////////////////////////////
263 266
264struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
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)
268 : rxvt_font () 272 : rxvt_font ()
269 { 273 {
… …
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)
… …
462 case '\t': 475 case '\t':
463 case ZERO_WIDTH_CHAR: 476 case ZERO_WIDTH_CHAR:
464 case NOCHAR: 477 case NOCHAR:
465 break; 478 break;
466 479
480 /*
481 * If the base font does not support variation selectors, treat them as ZWC.
482 * a point could be made to do this for all wcwidth == 0 characters, but I
483 * decided against that until more data is available.
484 */
485 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
486 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
487 break;
488
467 default: 489 default:
468 XDrawRectangle (disp, d, gc, x + 2, y + 2, 490 XDrawRectangle (disp, d, gc, x + 2, y + 2,
469 fwidth - 4, term->fheight - 4); 491 fwidth - 4, term->fheight - 4);
470 } 492 }
471 493
472 x += fwidth; 494 x += fwidth;
473 } 495 }
474} 496}
475 497
498struct rxvt_font_overflow : rxvt_font
499{
500 struct rxvt_fontset *fs;
501
502 rxvt_font_overflow (rxvt_fontset *fs)
503 : rxvt_font ()
504 {
505 this->fs = fs;
506 }
507
508 rxvt_fontprop properties ()
509 {
510 rxvt_fontprop p;
511
512 p.width = p.height = 1;
513 p.ascent = rxvt_fontprop::unset;
514 p.weight = rxvt_fontprop::medium;
515 p.slant = rxvt_fontprop::roman;
516
517 return p;
518 }
519
520 bool load (const rxvt_fontprop &prop, bool force_prop)
521 {
522 width = 1; height = 1;
523 ascent = 1; descent = 0;
524
525 set_name (strdup ("built-in rendition overflow font"));
526
527 return true;
528 }
529
530 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
531 {
532 return false;
533 }
534
535 void draw (rxvt_drawable &d, int x, int y,
536 const text_t *text, int len,
537 int fg, int bg)
538 {
539 while (len)
540 {
541 int fid = fs->find_font_idx (*text);
542 int w = 1;
543 while (w < len && text[w] == NOCHAR)
544 w++;
545 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
546 text += w;
547 len -= w;
548 x += term->fwidth * w;
549 }
550 }
551};
552
476///////////////////////////////////////////////////////////////////////////// 553/////////////////////////////////////////////////////////////////////////////
477 554
478struct rxvt_font_x11 : rxvt_font { 555struct rxvt_font_x11 : rxvt_font
556{
479 rxvt_font_x11 () { f = 0; } 557 rxvt_font_x11 () { f = 0; }
480 558
481 void clear (); 559 void clear ();
482 560
483 rxvt_fontprop properties (); 561 rxvt_fontprop properties ();
484 562
485 bool load (const rxvt_fontprop &prop); 563 bool load (const rxvt_fontprop &prop, bool force_prop);
486 564
487 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; 565 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
488 566
489 void draw (rxvt_drawable &d, int x, int y, 567 void draw (rxvt_drawable &d, int x, int y,
490 const text_t *text, int len, 568 const text_t *text, int len,
491 int fg, int bg); 569 int fg, int bg);
492 570
493 bool slow; // wether this is a proportional font or has other funny characteristics 571 bool slow; // whether this is a proportional font or has other funny characteristics
494 XFontStruct *f; 572 XFontStruct *f;
495 codeset cs;
496 bool enc2b, encm; 573 bool enc2b, encm;
497 574
498 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 575 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); 576 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); 577 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
501 bool set_properties (rxvt_fontprop &p, const char *name); 578 bool set_properties (rxvt_fontprop &p, const char *name);
502}; 579};
503 580
504char * 581char *
505rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 582rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
506{ 583{
507 unsigned long value; 584 unsigned long value;
508 585
509 if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value)) 586 if (XGetFontProperty (f, property, &value))
510 return XGetAtomName (term->display->display, value); 587 return XGetAtomName (term->dpy, value);
511 else 588 else
512 return rxvt_strdup (repl); 589 return repl ? strdup (repl) : 0;
513} 590}
514 591
515rxvt_fontprop 592rxvt_fontprop
516rxvt_font_x11::properties () 593rxvt_font_x11::properties ()
517{ 594{
… …
521} 598}
522 599
523bool 600bool
524rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 601rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
525{ 602{
526 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 603 p.width = width != rxvt_fontprop::unset ? width
604 : avgwidth ? (avgwidth + 1) / 10
605 : (height + 1) / 2;
527 p.height = height; 606 p.height = height;
528 p.ascent = rxvt_fontprop::unset; 607 p.ascent = rxvt_fontprop::unset;
529 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 608 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; 609 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
531 610
… …
536rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 615rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
537{ 616{
538 unsigned long height; 617 unsigned long height;
539 618
540#if 0 619#if 0
541 if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height)) 620 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
542 return false; 621 return false;
543#else 622#else
544 height = f->ascent + f->descent; 623 height = f->ascent + f->descent;
545#endif 624#endif
546 625
547 unsigned long avgwidth; 626 unsigned long avgwidth;
548 if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth)) 627 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
549 avgwidth = 0; 628 avgwidth = 0;
550 629
551 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 630 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
552 char *slant = get_property (f, "SLANT", "r"); 631 char *slant = get_property (f, term->xa [XA_SLANT], "r");
553 632
554 set_properties (p, height, weight, slant, avgwidth); 633 set_properties (p, height, weight, slant, avgwidth);
555 634
556 free (weight); 635 free (weight);
557 free (slant); 636 free (slant);
… …
597 return false; 676 return false;
598} 677}
599 678
600// fix the size of scalable fonts 679// fix the size of scalable fonts
601static bool 680static bool
602replace_field (char *buf, const char *name, int index, const char old, const char *replace) 681replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
603{ 682{
604 int slashes = 0; 683 int slashes = 0;
605 const char *field, *end; 684 const char *field, *end;
606 685
607 for (const char *c = name; *c; c++) 686 for (const char *c = name; *c; c++)
… …
617 break; 696 break;
618 } 697 }
619 698
620 if (slashes >= 13 && (!old || *field == old)) 699 if (slashes >= 13 && (!old || *field == old))
621 { 700 {
622 // TODO: check for overflow in font-name 701 size_t len = field - name;
623 strncpy (buf, name, field - name); 702 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
624 buf += field - name; 703 memcpy (*ptr, name, len);
625 strcpy (buf, replace); 704 strcpy (*ptr + len, replace);
626 strcat (buf, end); 705 strcat (*ptr, end);
627 706
628 return true; 707 return true;
629 } 708 }
630 else 709 else
631 { 710 {
632 strcpy (buf, name); 711 *ptr = strdup (name);
633 712
634 return false; 713 return false;
635 } 714 }
636} 715}
637 716
638bool 717bool
639rxvt_font_x11::load (const rxvt_fontprop &prop) 718rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
640{ 719{
641 dTermDisplay; 720 dTermDisplay;
642 721
643 clear (); 722 clear ();
644 723
645 char field_str[64]; // enough for 128 bits 724 char field_str[64]; // enough for 128 bits
646 725
647 // first morph the font if required 726 // first morph the font if required
648 if (prop.weight != rxvt_fontprop::unset 727 if (force_prop)
649 || prop.slant != rxvt_fontprop::unset)
650 { 728 {
651 char fname[1024]; 729 char *fname;
652 730
653 if (name[0] != '-') 731 if (name[0] != '-')
654 { 732 {
655 f = XLoadQueryFont (disp, name); 733 f = XLoadQueryFont (disp, name);
656 734
657 if (!f) 735 if (!f)
658 return false; 736 return false;
659 737
660 char *new_name = get_property (f, "FONT", name); 738 char *new_name = get_property (f, XA_FONT, 0);
661 739
662 if (new_name) 740 if (new_name)
663 set_name (new_name); 741 set_name (new_name);
664 else 742 else
665 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 743 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
666 744
667 XFreeFont (disp, f); 745 XFreeFont (disp, f);
668 f = 0; 746 f = 0;
669 } 747 }
670 748
671 if (prop.weight != rxvt_fontprop::unset) 749 if (prop.weight != rxvt_fontprop::unset)
672 { 750 {
673 replace_field (fname, name, 2, 0, 751 replace_field (&fname, name, 2, 0,
674 prop.weight < rxvt_fontprop::bold 752 prop.weight < rxvt_fontprop::bold
675 ? "medium" : "bold"); 753 ? "medium" : "bold");
676 set_name (strdup (fname)); 754 set_name (fname);
677 } 755 }
678 756
679 if (prop.slant != rxvt_fontprop::unset) 757 if (prop.slant != rxvt_fontprop::unset)
680 { 758 {
681 replace_field (fname, name, 3, 0, 759 replace_field (&fname, name, 3, 0,
682 prop.slant < rxvt_fontprop::italic 760 prop.slant < rxvt_fontprop::italic
683 ? "r" : "i"); // TODO: handle "o"blique, too 761 ? "r" : "i"); // TODO: handle "o"blique, too
684 set_name (strdup (fname)); 762 set_name (fname);
685 } 763 }
686 } 764 }
687 765
688 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 766 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
689 ? 0 : prop.height); 767 ? 0 : prop.height);
… …
714 font_weight *fonts = new font_weight[count]; 792 font_weight *fonts = new font_weight[count];
715 793
716 for (int i = 0; i < count; i++) 794 for (int i = 0; i < count; i++)
717 { 795 {
718 rxvt_fontprop p; 796 rxvt_fontprop p;
719 char fname[1024]; 797 char *fname;
720 798
721 int diff = 0; 799 int diff = 0;
722 800
723 if (replace_field (fname, list[i], 6, '0', field_str)) 801 if (replace_field (&fname, list[i], 6, '0', field_str))
724 diff += 10; // slightly penalize scalable fonts 802 diff += 10; // slightly penalize scalable fonts
803 else
804 {
805 free (fname);
725 else if (replace_field (fname, list[i], 11, '0', "0")) 806 if (replace_field (&fname, list[i], 11, '0', "0"))
726 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 807 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
808 }
727 809
728 if (!set_properties (p, fname)) 810 if (!set_properties (p, fname)
811 // also weed out too large fonts
812 || (prop.height != rxvt_fontprop::unset
813 && p.height > prop.height))
814 {
815 free (fname);
729 continue; 816 continue;
730 817 }
731 if (prop.height != rxvt_fontprop::unset
732 && p.height > prop.height) // weed out too large fonts
733 continue;
734 818
735 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 819 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); 820 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); 821 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); 822 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
739 823
740 fonts[i].name = strdup (fname); 824 fonts[i].name = fname;
741 fonts[i].diff = diff; 825 fonts[i].diff = diff;
742 } 826 }
743 827
744 XFreeFontNames (list); 828 XFreeFontNames (list);
745 829
746 // this loop only iterates when the guessed font-size is too small 830 // this loop only iterates when the guessed font-size is too small
747 for (;;) 831 for (;;)
748 { 832 {
749 font_weight *best = fonts + count - 1; 833 font_weight *best = fonts;
750 834
751 for (font_weight *w = best; w-- > fonts; ) 835 for (font_weight *w = fonts + 1; w < fonts + count; w++)
752 if (w->diff <= best->diff) 836 if (w->diff < best->diff)
753 best = w; 837 best = w;
754 838
755 if (!best->name 839 if (!best->name
756 || !(f = XLoadQueryFont (disp, best->name))) 840 || !(f = XLoadQueryFont (disp, best->name)))
757 break; 841 break;
… …
774 delete [] fonts; 858 delete [] fonts;
775 859
776 if (!f) 860 if (!f)
777 return false; 861 return false;
778 862
779 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 863 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
780 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 864 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
865
866 cs = CS_UNKNOWN;
781 867
782 if (registry && encoding) 868 if (registry && encoding)
783 { 869 {
784 char charset[64]; 870 char charset[64];
785 snprintf (charset, 64, "%s-%s", registry, encoding); 871 snprintf (charset, 64, "%s-%s", registry, encoding);
786 872
787 cs = codeset_from_name (charset); 873 cs = codeset_from_name (charset);
788 } 874
789 else 875 if (cs == CS_UNKNOWN)
876 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
790 { 877 }
878
879 free (registry);
880 free (encoding);
881
882 if (cs == CS_UNKNOWN)
883 {
791 const char *charset = get_property (f, "FONT", 0); 884 char *value = get_property (f, XA_FONT, 0);
885 const char *charset = value;
792 886
793 if (!charset) 887 if (!charset)
794 charset = name; 888 charset = name;
795 889
796 int count = 13; 890 int count = 13;
797 while (*charset) 891 while (*charset)
798 if (*charset++ == '-' && !--count) 892 if (*charset++ == '-' && !--count)
799 break; 893 break;
800 894
801 cs = codeset_from_name (charset); 895 cs = codeset_from_name (charset);
896 if (cs == CS_UNKNOWN)
897 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
898
899 free (value);
900 }
901
902 if (cs == CS_UNKNOWN)
802 } 903 {
803 904 clear ();
804 free (registry); 905 return false;
805 free (encoding); 906 }
806 907
807 if (cs == CS_UNICODE) 908 if (cs == CS_UNICODE)
808 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 909 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
809 910
810 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 911 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
811 enc2b = encm || f->max_char_or_byte2 > 255; 912 enc2b = encm || f->max_char_or_byte2 > 255;
812 913
813 slow = false; 914 slow = false;
814 915
815#if 1 // only used for slow detection, TODO optimize 916#if 1 // only used for slow detection, TODO optimize
816 if (f->min_bounds.width == f->max_bounds.width) 917 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; 918 width = f->max_bounds.width;
820 else 919 else
821 { 920 {
822 slow = true; 921 slow = true;
823 922
824 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 923 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
825 924
826 if (encm) 925 if (encm)
827 N += (f->max_byte1 - f->min_byte1) 926 N += (f->max_byte1 - f->min_byte1)
828 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 927 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
829 928
830 while (N) 929 while (N)
831 { 930 {
832 if (f->per_char[N].width > width) 931 if (f->per_char[N].width > width)
833 width = f->per_char[N].width; 932 width = f->per_char[N].width;
834 933
… …
837 } 936 }
838#endif 937#endif
839 938
840 width = 1; 939 width = 1;
841 940
842 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 941 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
843 { 942 {
844 if (cs != CS_UNICODE
845 && *t > 0x100
846 && FROM_UNICODE (cs, *t) == NOCHAR) 943 if (FROM_UNICODE (cs, *t) == NOCHAR)
847 continue; 944 continue;
848 945
849 // ignore characters we wouldn't use anyways 946 // ignore characters we wouldn't use anyways
850 bool careful; 947 bool careful;
851 if (!has_char (*t, &prop, careful)) 948 if (!has_char (*t, &prop, careful))
852 continue; 949 continue;
853 950
854 XChar2b ch = { *t >> 8, *t }; 951 // the casts are needed in C++11 (see 8.5.1)
952 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
855 953
856 XCharStruct g; 954 XCharStruct g;
857 int dir_ret, asc_ret, des_ret; 955 int dir_ret, asc_ret, des_ret;
858 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 956 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
859 957
958 int wcw = WCWIDTH (*t);
860 int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 959 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
861 960
862 if (width < g.width) width = g.width; 961 if (width < g.width) width = g.width;
863 }
864
865 if (cs == CS_UNKNOWN)
866 { 962 }
867 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
868 963
964#if 0 // do it per-character
965 if (prop && width > prop->width)
966 {
869 clear (); 967 clear ();
870 return false; 968 return false;
871 } 969 }
872
873#if 0 // do it per-character
874 if (prop && width > prop->width)
875 {
876 clear ();
877 return false;
878 }
879#endif 970#endif
880 971
881 return true; 972 return true;
882} 973}
883 974
884void 975void
885rxvt_font_x11::clear () 976rxvt_font_x11::clear ()
886{ 977{
887 if (f) 978 if (f)
888 { 979 {
889 XFreeFont (term->display->display, f); 980 XFreeFont (term->dpy, f);
890 f = 0; 981 f = 0;
891 } 982 }
892} 983}
893 984
894bool 985bool
895rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 986rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
896{ 987{
988 careful = false;
989
897 uint32_t ch = FROM_UNICODE (cs, unicode); 990 uint32_t ch = FROM_UNICODE (cs, unicode);
898 991
899 if (ch == NOCHAR) 992 if (ch == NOCHAR)
900 return false; 993 return false;
901 994
902 /* check wether the character exists in _this_ font. horrible. */ 995 /* check whether the character exists in _this_ font. horrible. */
903 XCharStruct *xcs; 996 XCharStruct *xcs;
904 997
905 if (encm) 998 if (encm)
906 { 999 {
907 unsigned char byte1 = ch >> 8; 1000 unsigned char byte1 = ch >> 8;
… …
937 return false; 1030 return false;
938 1031
939 if (!prop || prop->width == rxvt_fontprop::unset) 1032 if (!prop || prop->width == rxvt_fontprop::unset)
940 return true; 1033 return true;
941 1034
942 // check character against base font bounding box 1035 // check whether character overlaps previous/next character
943 int w = xcs->rbearing - xcs->lbearing; 1036 int w = xcs->rbearing - xcs->lbearing;
944 int wcw = WCWIDTH (unicode); 1037 int wcw = max (WCWIDTH (unicode), 1);
945 if (wcw > 0) w = (w + wcw - 1) / wcw;
946 1038
947 careful = w > prop->width; 1039 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
1040
948 if (careful && OVERLAP_OK (w, prop)) 1041 if (careful && !OVERLAP_OK (w, wcw, prop))
949 return false; 1042 return false;
950 1043
951 return true; 1044 return true;
952} 1045}
953 1046
… …
964 dTermDisplay; 1057 dTermDisplay;
965 dTermGC; 1058 dTermGC;
966 1059
967 bool slow = this->slow 1060 bool slow = this->slow
968 || width != term->fwidth 1061 || width != term->fwidth
969 || height != term->fheight; 1062 || height != term->fheight
1063 || ascent != f->ascent;
970 1064
971 int base = ascent; // sorry, incorrect: term->fbase; 1065 int base = ascent; // sorry, incorrect: term->fbase;
972 1066
973 XGCValues v; 1067 XGCValues v;
974 v.foreground = term->pix_colors[fg]; 1068 v.foreground = term->pix_colors[fg];
… …
987 else 1081 else
988 { 1082 {
989 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1083 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
990 1084
991 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1085 XChangeGC (disp, gc, GCForeground | GCFont, &v);
992 1086
993 if (slow) 1087 if (slow)
994 { 1088 {
995 do 1089 do
996 { 1090 {
997 if (xc->byte1 || xc->byte2) 1091 if (xc->byte1 || xc->byte2)
… …
1019 else 1113 else
1020 { 1114 {
1021 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1115 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1022 1116
1023 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1117 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1024 1118
1025 if (slow) 1119 if (slow)
1026 { 1120 {
1027 do 1121 do
1028 { 1122 {
1029 if (*xc) 1123 if (*xc)
… …
1042 1136
1043///////////////////////////////////////////////////////////////////////////// 1137/////////////////////////////////////////////////////////////////////////////
1044 1138
1045#if XFT 1139#if XFT
1046 1140
1047struct rxvt_font_xft : rxvt_font { 1141struct rxvt_font_xft : rxvt_font
1142{
1048 rxvt_font_xft () { f = 0; } 1143 rxvt_font_xft ()
1144 {
1145 f = 0;
1146 }
1049 1147
1050 void clear (); 1148 void clear ();
1051 1149
1052 rxvt_fontprop properties (); 1150 rxvt_fontprop properties ();
1053 1151
1054 bool load (const rxvt_fontprop &prop); 1152 bool load (const rxvt_fontprop &prop, bool force_prop);
1055 1153
1056 void draw (rxvt_drawable &d, int x, int y, 1154 void draw (rxvt_drawable &d, int x, int y,
1057 const text_t *text, int len, 1155 const text_t *text, int len,
1058 int fg, int bg); 1156 int fg, int bg);
1059 1157
1060 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1158 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1061 1159
1062protected: 1160protected:
1063 XftFont *f; 1161 XftFont *f;
1064}; 1162};
1065 1163
1066void 1164void
1067rxvt_font_xft::clear () 1165rxvt_font_xft::clear ()
1068{ 1166{
1069 if (f) 1167 if (f)
1070 { 1168 {
1071 XftFontClose (term->display->display, f); 1169 XftFontClose (term->dpy, f);
1072 f = 0; 1170 f = 0;
1073 } 1171 }
1074} 1172}
1075 1173
1076rxvt_fontprop 1174rxvt_fontprop
… …
1092 1190
1093 return p; 1191 return p;
1094} 1192}
1095 1193
1096bool 1194bool
1097rxvt_font_xft::load (const rxvt_fontprop &prop) 1195rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1098{ 1196{
1099 dTermDisplay; 1197 dTermDisplay;
1100 1198
1101 clear (); 1199 clear ();
1102 1200
… …
1111 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1209 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1112 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1210 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1113 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1211 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1114 1212
1115 if (prop.weight != rxvt_fontprop::unset 1213 if (prop.weight != rxvt_fontprop::unset
1116 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1214 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1117 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1215 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1118 1216
1119 if (prop.slant != rxvt_fontprop::unset 1217 if (prop.slant != rxvt_fontprop::unset
1120 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1218 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1121 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1219 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1122 1220
1123#if 0 // clipping unfortunately destroys our precious double-width-characters 1221#if 0 // clipping unfortunately destroys our precious double-width-characters
1124 // clip width, we can't do better, or can we? 1222 // clip width, we can't do better, or can we?
1125 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1223 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1126 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1224 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1127#endif 1225#endif
1128 1226
1129 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1227 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1130 FcPatternAddBool (p, FC_MINSPACE, 1); 1228 FcPatternAddBool (p, FC_MINSPACE, 1);
1131 1229
… …
1143 int ftheight = 0; 1241 int ftheight = 0;
1144 bool success = true; 1242 bool success = true;
1145 1243
1146 for (;;) 1244 for (;;)
1147 { 1245 {
1246 p = FcPatternDuplicate (match);
1148 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1247 f = XftFontOpenPattern (disp, p);
1149 1248
1150 if (!f) 1249 if (!f)
1151 { 1250 {
1251 FcPatternDestroy (p);
1152 success = false; 1252 success = false;
1153 break; 1253 break;
1154 } 1254 }
1155 1255
1156 FT_Face face = XftLockFace (f); 1256 FT_Face face = XftLockFace (f);
… …
1164 1264
1165 XftUnlockFace (f); 1265 XftUnlockFace (f);
1166 1266
1167 int glheight = height; 1267 int glheight = height;
1168 1268
1169 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1269 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1170 { 1270 {
1171 FcChar16 ch = *t; 1271 FcChar16 ch = *t;
1172 1272
1173 if (cs != CS_UNICODE 1273 if (cs != CS_UNICODE
1174 && ch > 0x100 1274 && ch > 0x100
… …
1243bool 1343bool
1244rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1344rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1245{ 1345{
1246 careful = false; 1346 careful = false;
1247 1347
1248 if (!XftCharExists (term->display->display, f, unicode)) 1348 if (!XftCharExists (term->dpy, f, unicode))
1249 return false; 1349 return false;
1250 1350
1251 if (!prop || prop->width == rxvt_fontprop::unset) 1351 if (!prop || prop->width == rxvt_fontprop::unset)
1252 return true; 1352 return true;
1253 1353
1254 // check character against base font bounding box 1354 // check character against base font bounding box
1255 FcChar32 ch = unicode; 1355 FcChar32 ch = unicode;
1256 XGlyphInfo g; 1356 XGlyphInfo g;
1257 XftTextExtents32 (term->display->display, f, &ch, 1, &g); 1357 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1258 1358
1259 int w = g.width - g.x; 1359 int w = g.width - g.x;
1260 int wcw = WCWIDTH (unicode); 1360 int wcw = max (WCWIDTH (unicode), 1);
1261 if (wcw > 0) w = (w + wcw - 1) / wcw;
1262 1361
1263 careful = w > prop->width; 1362 careful = g.x > 0 || w > prop->width * wcw;
1363
1264 if (careful && OVERLAP_OK (w, prop)) 1364 if (careful && !OVERLAP_OK (w, wcw, prop))
1365 return false;
1366
1367 // this weeds out _totally_ broken fonts, or glyphs
1368 if (!OVERLAP_OK (g.xOff, wcw, prop))
1265 return false; 1369 return false;
1266 1370
1267 return true; 1371 return true;
1268} 1372}
1269 1373
1270void 1374void
1271rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1375rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1272 const text_t *text, int len, 1376 const text_t *text, int len,
1273 int fg, int bg) 1377 int fg, int bg)
1274{ 1378{
1275 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1276
1277 XGlyphInfo extents; 1379 XGlyphInfo extents;
1278 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1380 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1279 XftGlyphSpec *ep = enc; 1381 XftGlyphSpec *ep = enc;
1280 1382
1281 dTermDisplay; 1383 dTermDisplay;
1282 dTermGC; 1384 dTermGC;
1385
1386 int w = term->fwidth * len;
1387 int h = term->fheight;
1388
1389 bool buffered = bg >= Color_transparent
1390 && term->option (Opt_buffered);
1283 1391
1284 // cut trailing spaces 1392 // cut trailing spaces
1285 while (len && text [len - 1] == ' ') 1393 while (len && text [len - 1] == ' ')
1286 len--; 1394 len--;
1287 1395
1396 int x_ = buffered ? 0 : x;
1397 int y_ = buffered ? 0 : y;
1398
1288 while (len) 1399 while (len)
1289 { 1400 {
1290 int cwidth = term->fwidth; 1401 int cwidth = term->fwidth;
1291 FcChar32 fc = *text++; len--; 1402 FcChar32 fc = *text++; len--;
1292 1403
1293 while (len && *text == NOCHAR) 1404 while (len && *text == NOCHAR)
1294 text++, len--, cwidth += term->fwidth; 1405 text++, len--, cwidth += term->fwidth;
1295 1406
1296 if (fc != ' ') // skip spaces 1407 if (fc != ' ') // skip spaces
1297 { 1408 {
1298 FT_UInt glyph = XftCharIndex (disp, f, fc); 1409 FT_UInt glyph = XftCharIndex (disp, f, fc);
1299 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1410 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1300 1411
1301 ep->glyph = glyph; 1412 ep->glyph = glyph;
1302 ep->x = x + (cwidth - extents.xOff >> 1); 1413 ep->x = x_ + (cwidth - extents.xOff >> 1);
1303 ep->y = y + ascent; 1414 ep->y = y_ + ascent;
1415
1416 if (extents.xOff == 0)
1417 ep->x = x_ + cwidth;
1418
1304 ep++; 1419 ep++;
1305 } 1420 }
1306 1421
1307 x += cwidth; 1422 x_ += cwidth;
1423 }
1424
1425 if (buffered)
1308 } 1426 {
1309
1310 if (ep != enc) 1427 if (ep != enc)
1428 {
1429 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1430
1431#ifdef HAVE_IMG
1432 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1433
1434 if (term->bg_img
1435 && (bg == Color_transparent || bg == Color_bg
1436 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1437 {
1438 int src_x = x, src_y = y;
1439
1440 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1441 {
1442 src_x += term->window_vt_x;
1443 src_y += term->window_vt_y;
1444 }
1445
1446 if (term->bg_img->w >= src_x + w
1447 && term->bg_img->h >= src_y + h)
1448 {
1449 XCopyArea (disp, term->bg_img->pm, d2, gc,
1450 src_x, src_y, w, h, 0, 0);
1451 }
1452 else
1453 {
1454 XGCValues gcv;
1455
1456 gcv.fill_style = FillTiled;
1457 gcv.tile = term->bg_img->pm;
1458 gcv.ts_x_origin = -src_x;
1459 gcv.ts_y_origin = -src_y;
1460
1461 XChangeGC (disp, gc,
1462 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1463 &gcv);
1464
1465 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1466
1467 gcv.fill_style = FillSolid;
1468 XChangeGC (disp, gc, GCFillStyle, &gcv);
1469 }
1470
1471 if (dst)
1472 {
1473 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1474
1475 // dst can only be set when bg >= 0
1476 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1477 }
1478 }
1479 else
1480#endif
1481 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1482
1483 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1484 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1485 }
1486 else
1487 clear_rect (d, x, y, w, h, bg);
1488 }
1489 else
1490 {
1491 clear_rect (d, x, y, w, h, bg);
1311 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1492 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1493 }
1312} 1494}
1495
1313#endif 1496#endif
1314 1497
1315///////////////////////////////////////////////////////////////////////////// 1498/////////////////////////////////////////////////////////////////////////////
1316 1499
1317rxvt_fontset::rxvt_fontset (rxvt_term *term) 1500rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1328void 1511void
1329rxvt_fontset::clear () 1512rxvt_fontset::clear ()
1330{ 1513{
1331 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1514 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1332 = rxvt_fontprop::unset; 1515 = rxvt_fontprop::unset;
1516 force_prop = false;
1333 1517
1334 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1518 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1335 FONT_UNREF (*i); 1519 (*i)->unref ();
1336 1520
1337 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1521 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1338 delete *p; 1522 delete *p;
1339 1523
1340 free (fontdesc); fontdesc = 0; 1524 free (fontdesc); fontdesc = 0;
… …
1342 fonts.clear (); 1526 fonts.clear ();
1343 1527
1344 fallback = fallback_fonts; 1528 fallback = fallback_fonts;
1345} 1529}
1346 1530
1531void
1532rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1533{
1534 font->set_term (term);
1535
1536 font->cs = cs;
1537 font->loaded = false;
1538}
1539
1347rxvt_font * 1540rxvt_font *
1348rxvt_fontset::new_font (const char *name, codeset cs) 1541rxvt_fontset::new_font (const char *name, codeset cs)
1349{ 1542{
1350 rxvt_font *f; 1543 rxvt_font *f;
1351 1544
1352 if (!name || !*name) 1545 if (!name || !*name)
1353 { 1546 {
1354 name = ""; 1547 name = "";
1355 f = new rxvt_font_default (this); 1548 f = new rxvt_font_default (this);
1356 } 1549 }
… …
1367 f = new rxvt_font_x11; 1560 f = new rxvt_font_x11;
1368 } 1561 }
1369 else 1562 else
1370 f = new rxvt_font_x11; 1563 f = new rxvt_font_x11;
1371 1564
1372 f->set_term (term);
1373 f->set_name (strdup (name)); 1565 f->set_name (strdup (name));
1374 1566 prepare_font (f, cs);
1375 f->cs = cs;
1376 f->loaded = false;
1377 1567
1378 return f; 1568 return f;
1379} 1569}
1380 1570
1381///////////////////////////////////////////////////////////////////////////// 1571/////////////////////////////////////////////////////////////////////////////
1572
1573void
1574rxvt_fontset::push_font (rxvt_font *font)
1575{
1576 // the fontCount index is reserved for the overflow font, it is only
1577 // necessary when we get fontCount or more fonts, as they cannot be
1578 // represented in the rendition.
1579 if (fonts.size () == fontCount)
1580 {
1581 rxvt_font *f = new rxvt_font_overflow (this);
1582
1583 prepare_font (f, CS_UNICODE);
1584 fonts.push_back (f);
1585 }
1586
1587 fonts.push_back (font);
1588}
1382 1589
1383void 1590void
1384rxvt_fontset::add_fonts (const char *desc) 1591rxvt_fontset::add_fonts (const char *desc)
1385{ 1592{
1386 if (desc) 1593 if (desc)
… …
1415 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1622 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1416 else 1623 else
1417 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1624 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1418 1625
1419 desc++; 1626 desc++;
1420 while (*desc <= ' ') desc++; 1627 while (*desc <= ' ' && *desc) desc++;
1421 } 1628 }
1422 1629
1423 end = strchr (desc, ','); 1630 end = strchr (desc, ',');
1424 if (!end) 1631 if (!end)
1425 end = desc + strlen (desc); 1632 end = desc + strlen (desc);
1426 1633
1427 if (end - desc < 511) 1634 if (end - desc < 511)
1428 { 1635 {
1429 strncpy (buf, desc, end - desc); 1636 memcpy (buf, desc, end - desc);
1430 buf[end - desc] = 0; 1637 buf[end - desc] = 0;
1431 1638
1432 fonts.push_back (new_font (buf, cs)); 1639 push_font (new_font (buf, cs));
1433 } 1640 }
1434 else 1641 else
1435 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1642 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1436 1643
1437 desc = end + 1; 1644 desc = end + 1;
1438 } 1645 }
1439 while (*end); 1646 while (*end);
1440 } 1647 }
… …
1449 if (fonts[i]->loaded) 1656 if (fonts[i]->loaded)
1450 return true; 1657 return true;
1451 1658
1452 fonts[i]->loaded = true; 1659 fonts[i]->loaded = true;
1453 1660
1454 if (!fonts[i]->load (prop)) 1661 if (!fonts[i]->load (prop, force_prop))
1455 { 1662 {
1456 fonts[i]->cs = CS_UNKNOWN; 1663 fonts[i]->cs = CS_UNKNOWN;
1457 return false; 1664 return false;
1458 } 1665 }
1459 1666
… …
1465{ 1672{
1466 clear (); 1673 clear ();
1467 1674
1468 fontdesc = strdup (desc); 1675 fontdesc = strdup (desc);
1469 1676
1470 fonts.push_back (new_font (0, CS_UNICODE)); 1677 push_font (new_font (0, CS_UNICODE));
1471 realize_font (0); 1678 realize_font (0);
1472 1679
1473 add_fonts (desc); 1680 add_fonts (desc);
1474 1681
1475 return true; 1682 return true;
… …
1484 1691
1485 return -1; 1692 return -1;
1486} 1693}
1487 1694
1488int 1695int
1489rxvt_fontset::find_font (unicode_t unicode) 1696rxvt_fontset::find_font_idx (unicode_t unicode)
1490{ 1697{
1491 if (unicode >= 1<<20) 1698 if (unicode >= 1<<20)
1492 return 0; 1699 return 0;
1493 1700
1494 unicode_t hi = unicode >> 8; 1701 unicode_t hi = unicode >> 8;
… …
1520 goto next_font; 1727 goto next_font;
1521 1728
1522 bool careful; 1729 bool careful;
1523 if (f->has_char (unicode, &prop, careful)) 1730 if (f->has_char (unicode, &prop, careful))
1524 { 1731 {
1525 if (careful) 1732 i = (i << 1) | careful;
1526 i |= 128;
1527 1733
1528 goto found; 1734 goto found;
1529 } 1735 }
1530 1736
1531 next_font: 1737 next_font:
1532 if (i == fonts.size () - 1) 1738 if (i == fonts.size () - 1)
1533 { 1739 {
1534 if (fallback->name) 1740 if (fallback->name)
1535 { 1741 {
1536 // search through the fallback list 1742 // search through the fallback list
1537 fonts.push_back (new_font (fallback->name, fallback->cs)); 1743 push_font (new_font (fallback->name, fallback->cs));
1538 fallback++; 1744 fallback++;
1539 } 1745 }
1540 else 1746 else
1541 { 1747 {
1542 // try to find a new font. 1748 // try to find a new font.
… …
1544 // way to configure this and xft is easier to hack in, 1750 // way to configure this and xft is easier to hack in,
1545 // while x11 has more framework in place already. 1751 // while x11 has more framework in place already.
1546 // TODO: this is a real resource hog, xft takes ages(?) 1752 // TODO: this is a real resource hog, xft takes ages(?)
1547#if XFT && USE_SLOW_LOOKUP 1753#if XFT && USE_SLOW_LOOKUP
1548 // grab the first xft font that seems suitable 1754 // grab the first xft font that seems suitable
1755 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1549 FcPattern *p = FcPatternCreate (); 1756 FcPattern *p = FcPatternCreate ();
1550 1757
1551 FcCharSet *s = FcCharSetCreate (); 1758 FcCharSet *s = FcCharSetCreate ();
1552 FcCharSetAddChar (s, unicode); 1759 FcCharSetAddChar (s, unicode);
1553 FcPatternAddCharSet (p, FC_CHARSET, s); 1760 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1560 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1767 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1561 FcPatternAddBool (p, FC_MINSPACE, 1); 1768 FcPatternAddBool (p, FC_MINSPACE, 1);
1562 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1769 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1563 1770
1564 XftResult result; 1771 XftResult result;
1565 FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result); 1772 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1566 1773
1567 FcPatternDestroy (p); 1774 FcPatternDestroy (p);
1568 1775
1569 if (match) 1776 if (match)
1570 { 1777 {
… …
1573 FcPatternDestroy (match); 1780 FcPatternDestroy (match);
1574 1781
1575 if (find_font (font) < 0) 1782 if (find_font (font) < 0)
1576 { 1783 {
1577 char fontname[4096]; 1784 char fontname[4096];
1578 sprintf (fontname, "xft:%-.4090s", font); 1785 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1579 1786
1580 fonts.push_back (new_font (fontname, CS_UNICODE)); 1787 push_font (new_font (fontname, CS_UNICODE));
1581 } 1788 }
1582 1789
1583 free (font); 1790 free (font);
1584 } 1791 }
1585#endif 1792#endif
… …
1597 while (hi >= fmap.size ()) 1804 while (hi >= fmap.size ())
1598 fmap.push_back (0); 1805 fmap.push_back (0);
1599 1806
1600 if (!fmap[hi]) 1807 if (!fmap[hi])
1601 { 1808 {
1602 fmap[hi] = (pagemap *)new pagemap; 1809 fmap[hi] = new pagemap;
1603 memset (fmap[hi], 0xff, sizeof (pagemap)); 1810 memset (fmap[hi], 0xff, sizeof (pagemap));
1604 } 1811 }
1605 1812
1606 (*fmap[hi])[unicode & 0xff] = i; 1813 (*fmap[hi])[unicode & 0xff] = i;
1607 } 1814 }
1608 1815
1609 return i; 1816 return i;
1610} 1817}
1611 1818
1612
1613

Diff Legend

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