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.84 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.180 by sf-exg, Mon May 30 18:39:03 2011 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 2 of the License, or
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
25#include "rxvtutil.h" 24#include "rxvtutil.h"
26#include "rxvtfont.h" 25#include "rxvtfont.h"
27 26
28#include <cstdlib> 27#include <cstdlib>
29#include <wchar.h> 28
30#include <inttypes.h> 29#include <inttypes.h>
31 30
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
34
32#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width 35#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
36#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
33 37
38#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
39 (prop)->slant >= rxvt_fontprop::italic \
40 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
41 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
42 ))
43
34const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
35 codeset cs; 45 codeset cs;
36 const char *name; 46 const char *name;
37} fallback_fonts[] = { 47} fallback_fonts[] = {
38 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
39 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
40 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 50 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
41 51
42#if ENCODING_EU 52#if ENCODING_EU
43 // cyrillic 53 // cyrillic
44 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 54 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
45 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 55 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
46 56
47 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 57 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
48 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 58 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
49 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 59 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
50 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 60 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
51 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 61 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
57 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 67 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
58 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 68 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
59 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 69 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
60 70
61# if XFT 71# if XFT
62 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 72 { CS_KOI8_U, "xft::lang=ru" },
63 73
64 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 74 { CS_ISO8859_5, "xft::lang=ru" },
65 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 75 { CS_ISO8859_6, "xft::lang=ar" },
66 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 76 { CS_ISO8859_7, "xft::lang=el" },
67 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 77 { CS_ISO8859_8, "xft::lang=he" },
68 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 78 { CS_ISO8859_9, "xft::lang=tr" },
69 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 79 { CS_ISO8859_10, "xft::lang=se" },
70 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 80 { CS_ISO8859_11, "xft::lang=th" },
71# endif 81# endif
72#endif 82#endif
73 83
74 // japanese 84 // japanese
75#if ENCODING_JP || ENCODING_JP_EXT 85#if ENCODING_JP || ENCODING_JP_EXT
76# if XFT 86# if XFT
77 // prefer xft for complex scripts 87 // prefer xft for complex scripts
88 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
78 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 89 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
79 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
80 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 90 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
81 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 91 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
82# endif 92# endif
83 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
84 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
85 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 95 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
86 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 96 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
… …
90 100
91#if ENCODING_ZH || ENCODING_ZH_EXT 101#if ENCODING_ZH || ENCODING_ZH_EXT
92# if XFT 102# if XFT
93 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 103 { CS_GBK_0, "xft:AR PL KaitiM GB" },
94 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 104 { CS_GBK_0, "xft:AR PL SungtiL GB" },
95 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 105 { CS_GBK_0, "xft::lang=zh" },
96 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 106 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
97 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 107 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
98 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 108 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
99 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 109 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
100 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 110 { CS_GB2312_1980_0, "xft::lang=zh" },
101# endif 111# endif
102 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 112 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
103 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 113 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
104 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 114 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
105 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 115 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
118#if ENCODING_KR 128#if ENCODING_KR
119 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 129 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
120 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 130 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
121# if XFT 131# if XFT
122 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
123 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
124# endif 134# endif
125#endif 135#endif
126 136
127 // generic font fallback
128 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 137 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
129 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 138 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
130 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
131 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
132#if XFT 139#if XFT
133 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
134 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 141 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
135 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 142 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
136 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 143 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
137 144
138 // FreeMono is usually uglier than x fonts, so try last only. 145 // FreeMono is usually uglier than x fonts, so try after the others
139 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 146 { CS_UNICODE, "xft:FreeMono:autohint=true" },
140#endif 147#endif
141 148
149 // generic font fallback, put this last, as many iso10646 fonts have extents
150 // specified for all glyphs in the range they cover, but most are simply empty
151 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
152 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
142 { CS_UNKNOWN, 0 } 153 { CS_UNKNOWN, 0 }
143}; 154};
144 155
145// these characters are used to guess the font height and width 156// these characters are used to guess the font height and width
146// pango uses a similar algorithm and doesn't trust the font either. 157// pango uses a similar algorithm and doesn't trust the font either.
… …
148 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 159 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
149 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 160 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
150 0x304c, 0x672c, // が本 161 0x304c, 0x672c, // が本
151}; 162};
152 163
153#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
154
155#define dTermDisplay Display *disp = term->display->display 164#define dTermDisplay Display *disp = term->dpy
156#define dTermGC GC gc = term->gc 165#define dTermGC GC gc = term->gc
157 166
158///////////////////////////////////////////////////////////////////////////// 167/////////////////////////////////////////////////////////////////////////////
159
160#if XFT
161rxvt_drawable::~rxvt_drawable ()
162{
163 if (xftdrawable)
164 XftDrawDestroy (xftdrawable);
165}
166
167rxvt_drawable::operator XftDraw *()
168{
169 if (!xftdrawable)
170 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
171
172 return xftdrawable;
173}
174#endif
175
176/////////////////////////////////////////////////////////////////////////////
177
178static void *enc_buf;
179static uint32_t enc_len;
180
181static inline void *
182get_enc_buf (uint32_t len)
183{
184 if (len > enc_len)
185 {
186 free (enc_buf);
187 enc_buf = malloc (len);
188 enc_len = len;
189 }
190
191 return enc_buf;
192}
193 168
194static const char * 169static const char *
195enc_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)
196{ 171{
197 uint8_t *buf = (uint8_t *)get_enc_buf (len); 172 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
173 uint8_t *res = buf;
198 174
199 while (len--) 175 while (len--)
200 { 176 {
201 uint32_t c = FROM_UNICODE (cs, *text++); 177 uint32_t c = FROM_UNICODE (cs, *text++);
202 178
… …
207 } 183 }
208 184
209 *buf++ = c; 185 *buf++ = c;
210 } 186 }
211 187
212 return (const char *)enc_buf; 188 return (const char *)res;
213} 189}
214 190
215static const XChar2b * 191static const XChar2b *
216enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 192enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
217{ 193{
218 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 194 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
195 XChar2b *res = buf;
219 196
220 while (len--) 197 while (len--)
221 { 198 {
222 uint32_t c = FROM_UNICODE (cs, *text++); 199 uint32_t c = FROM_UNICODE (cs, *text++);
223 200
… …
230 buf->byte1 = c >> 8; 207 buf->byte1 = c >> 8;
231 buf->byte2 = c; 208 buf->byte2 = c;
232 buf++; 209 buf++;
233 } 210 }
234 211
235 return (XChar2b *)enc_buf; 212 return res;
236} 213}
237 214
238///////////////////////////////////////////////////////////////////////////// 215/////////////////////////////////////////////////////////////////////////////
239 216
217rxvt_font::rxvt_font ()
218: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
219{
220}
221
240void 222void
241rxvt_font::set_name (char *name) 223rxvt_font::set_name (char *name_)
242{ 224{
243 if (this->name == name) 225 if (name == name_)
244 return; 226 return;
245 227
246 if (this->name) free (this->name); // let the compiler optimize 228 if (name) free (name); // let the compiler optimize
247 this->name = name; 229 name = name_;
248} 230}
249 231
250void 232void
251rxvt_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
252{ 234{
253 dTermDisplay; 235 dTermDisplay;
254 dTermGC; 236 dTermGC;
255 237
256 if (color == Color_bg) 238 if (color == Color_bg || color == Color_transparent)
257 XClearArea (disp, d, x, y, w, h, FALSE); 239 XClearArea (disp, d, x, y, w, h, false);
258 else if (color >= 0) 240 else if (color >= 0)
259 { 241 {
260#if XFT 242#if XFT
243 Picture dst;
244
245# ifdef HAVE_BG_PIXMAP
246 if (term->bg_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
261 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258
262#else 259#else
263 XSetForeground (disp, gc, term->pix_colors[color]); 260 XSetForeground (disp, gc, term->pix_colors[color]);
264 XFillRectangle (disp, d, gc, x, y, w, h); 261 XFillRectangle (disp, d, gc, x, y, w, h);
265#endif 262#endif
266 } 263 }
267} 264}
268 265
269#include "table/linedraw.h" 266/////////////////////////////////////////////////////////////////////////////
270 267
271struct rxvt_font_default : rxvt_font { 268struct rxvt_font_default : rxvt_font {
272 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
273 270
274 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
… …
287 p.slant = rxvt_fontprop::roman; 284 p.slant = rxvt_fontprop::roman;
288 285
289 return p; 286 return p;
290 } 287 }
291 288
292 bool load (const rxvt_fontprop &prop) 289 bool load (const rxvt_fontprop &prop, bool force_prop)
293 { 290 {
294 width = 1; height = 1; 291 width = 1; height = 1;
295 ascent = 1; descent = 0; 292 ascent = 1; descent = 0;
296 293
297 set_name (strdup ("built-in support font")); 294 set_name (strdup ("built-in support font"));
… …
310 return false; 307 return false;
311 308
312 if (unicode <= 0x009f) 309 if (unicode <= 0x009f)
313 return true; 310 return true;
314 311
312#ifdef BUILTIN_GLYPHS
315 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
316 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
317 return true; 315 return true;
316#endif
318 317
319 if (IS_COMPOSE (unicode)) 318 if (IS_COMPOSE (unicode))
320 return true; 319 return true;
321 320
322 switch (unicode) 321 switch (unicode)
… …
358 ; 357 ;
359 358
360 int width = text - tp; 359 int width = text - tp;
361 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
362 361
362#ifdef BUILTIN_GLYPHS
363 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
364 { 364 {
365# include "table/linedraw.h"
365 uint16_t offs = linedraw_offs[t - 0x2500]; 366 uint16_t offs = linedraw_offs[t - 0x2500];
366 uint32_t *a = linedraw_command + (offs >> 4); 367 uint32_t *a = linedraw_command + (offs >> 4);
367 uint32_t *b = a + (offs & 15); 368 uint32_t *b = a + (offs & 15);
368 369
369 int W = fwidth; 370 int W = fwidth;
… …
407 408
408 case 1: // rectangle, possibly stippled 409 case 1: // rectangle, possibly stippled
409 if (a) 410 if (a)
410 { 411 {
411 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
412 413
413 gcv.fill_style = FillStippled; 414 gcv.fill_style = FillStippled;
414 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
415 gcv.ts_x_origin = x; 416 gcv.ts_x_origin = x;
416 gcv.ts_y_origin = y; 417 gcv.ts_y_origin = y;
417 418
… …
436 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
437 break; 438 break;
438 } 439 }
439 } 440 }
440 } 441 }
442#else
443 if (0)
444 ;
445#endif
441#if ENABLE_COMBINING 446#if ENABLE_COMBINING
442 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
443 { 448 {
449 min_it (width, 2); // we only support wcwidth up to 2
450
444 text_t chrs[2]; 451 text_t chrs[2];
445 width = min (2, width);
446 chrs [1] = NOCHAR; 452 chrs [1] = NOCHAR;
447 453
448 *chrs = cc->c1; 454 *chrs = cc->c1;
449 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
450 f1->draw (d, x, y, chrs, width, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
451 457
452 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
453 { 459 {
454 bool careful; 460 bool careful;
455 461
456 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
457 *chrs = cc->c2; 463 *chrs = cc->c2;
458 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
459 ? f1 465 ? f1
460 : (*fs)[fs->find_font (cc->c2)]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
461 467
462 f2->draw (d, x, y, chrs, width, fg, -1); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
463 } 469 }
464 } 470 }
465#endif 471#endif
466 else 472 else
467 switch (t) 473 switch (t)
… …
478 484
479 x += fwidth; 485 x += fwidth;
480 } 486 }
481} 487}
482 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 int w = 1;
533 while (w < len && text[w] == NOCHAR)
534 w++;
535 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
536 text += w;
537 len -= w;
538 x += term->fwidth * w;
539 }
540 }
541};
542
483///////////////////////////////////////////////////////////////////////////// 543/////////////////////////////////////////////////////////////////////////////
484 544
485struct rxvt_font_x11 : rxvt_font { 545struct rxvt_font_x11 : rxvt_font {
486 rxvt_font_x11 () { f = 0; } 546 rxvt_font_x11 () { f = 0; }
487 547
488 void clear (); 548 void clear ();
489 549
490 rxvt_fontprop properties (); 550 rxvt_fontprop properties ();
491 551
492 bool load (const rxvt_fontprop &prop); 552 bool load (const rxvt_fontprop &prop, bool force_prop);
493 553
494 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; 554 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
495 555
496 void draw (rxvt_drawable &d, int x, int y, 556 void draw (rxvt_drawable &d, int x, int y,
497 const text_t *text, int len, 557 const text_t *text, int len,
498 int fg, int bg); 558 int fg, int bg);
499 559
500 bool slow; // wether this is a proportional font or has other funny characteristics 560 bool slow; // whether this is a proportional font or has other funny characteristics
501 XFontStruct *f; 561 XFontStruct *f;
502 codeset cs;
503 bool enc2b, encm; 562 bool enc2b, encm;
504 563
505 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 564 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
506 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 565 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
507 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 566 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
508 bool set_properties (rxvt_fontprop &p, const char *name); 567 bool set_properties (rxvt_fontprop &p, const char *name);
509}; 568};
510 569
511char * 570char *
512rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 571rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
513{ 572{
514 unsigned long value; 573 unsigned long value;
515 574
516 if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value)) 575 if (XGetFontProperty (f, property, &value))
517 return XGetAtomName (term->display->display, value); 576 return XGetAtomName (term->dpy, value);
518 else 577 else
519 return rxvt_strdup (repl); 578 return repl ? strdup (repl) : 0;
520} 579}
521 580
522rxvt_fontprop 581rxvt_fontprop
523rxvt_font_x11::properties () 582rxvt_font_x11::properties ()
524{ 583{
… …
528} 587}
529 588
530bool 589bool
531rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 590rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
532{ 591{
533 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 592 p.width = width != rxvt_fontprop::unset ? width
593 : avgwidth ? (avgwidth + 1) / 10
594 : (height + 1) / 2;
534 p.height = height; 595 p.height = height;
535 p.ascent = rxvt_fontprop::unset; 596 p.ascent = rxvt_fontprop::unset;
536 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 597 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
537 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 598 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
538 599
… …
543rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 604rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
544{ 605{
545 unsigned long height; 606 unsigned long height;
546 607
547#if 0 608#if 0
548 if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height)) 609 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
549 return false; 610 return false;
550#else 611#else
551 height = f->ascent + f->descent; 612 height = f->ascent + f->descent;
552#endif 613#endif
553 614
554 unsigned long avgwidth; 615 unsigned long avgwidth;
555 if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth)) 616 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
556 avgwidth = 0; 617 avgwidth = 0;
557 618
558 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 619 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
559 char *slant = get_property (f, "SLANT", "r"); 620 char *slant = get_property (f, term->xa [XA_SLANT], "r");
560 621
561 set_properties (p, height, weight, slant, avgwidth); 622 set_properties (p, height, weight, slant, avgwidth);
562 623
563 free (weight); 624 free (weight);
564 free (slant); 625 free (slant);
… …
604 return false; 665 return false;
605} 666}
606 667
607// fix the size of scalable fonts 668// fix the size of scalable fonts
608static bool 669static bool
609replace_field (char *buf, const char *name, int index, const char old, const char *replace) 670replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
610{ 671{
611 int slashes = 0; 672 int slashes = 0;
612 const char *field, *end; 673 const char *field, *end;
613 674
614 for (const char *c = name; *c; c++) 675 for (const char *c = name; *c; c++)
… …
624 break; 685 break;
625 } 686 }
626 687
627 if (slashes >= 13 && (!old || *field == old)) 688 if (slashes >= 13 && (!old || *field == old))
628 { 689 {
629 // TODO: check for overflow in font-name 690 size_t len = field - name;
630 strncpy (buf, name, field - name); 691 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
631 buf += field - name; 692 memcpy (*ptr, name, len);
632 strcpy (buf, replace); 693 strcpy (*ptr + len, replace);
633 strcat (buf, end); 694 strcat (*ptr, end);
634 695
635 return true; 696 return true;
636 } 697 }
637 else 698 else
638 { 699 {
639 strcpy (buf, name); 700 *ptr = strdup (name);
640 701
641 return false; 702 return false;
642 } 703 }
643} 704}
644 705
645bool 706bool
646rxvt_font_x11::load (const rxvt_fontprop &prop) 707rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
647{ 708{
648 dTermDisplay; 709 dTermDisplay;
649 710
650 clear (); 711 clear ();
651 712
652 char field_str[64]; // enough for 128 bits 713 char field_str[64]; // enough for 128 bits
653 714
654 // first morph the font if required 715 // first morph the font if required
655 if (prop.weight != rxvt_fontprop::unset 716 if (force_prop)
656 || prop.slant != rxvt_fontprop::unset)
657 { 717 {
658 char fname[1024]; 718 char *fname;
659 719
660 if (name[0] != '-') 720 if (name[0] != '-')
661 { 721 {
662 f = XLoadQueryFont (disp, name); 722 f = XLoadQueryFont (disp, name);
663 723
664 if (!f) 724 if (!f)
665 return false; 725 return false;
666 726
667 char *new_name = get_property (f, "FONT", name); 727 char *new_name = get_property (f, XA_FONT, 0);
668 728
669 if (new_name) 729 if (new_name)
670 set_name (new_name); 730 set_name (new_name);
671 else 731 else
672 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 732 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
673 733
674 XFreeFont (disp, f); 734 XFreeFont (disp, f);
675 f = 0; 735 f = 0;
676 } 736 }
677 737
678 if (prop.weight != rxvt_fontprop::unset) 738 if (prop.weight != rxvt_fontprop::unset)
679 { 739 {
680 replace_field (fname, name, 2, 0, 740 replace_field (&fname, name, 2, 0,
681 prop.weight < rxvt_fontprop::bold 741 prop.weight < rxvt_fontprop::bold
682 ? "medium" : "bold"); 742 ? "medium" : "bold");
683 set_name (strdup (fname)); 743 set_name (fname);
684 } 744 }
685 745
686 if (prop.slant != rxvt_fontprop::unset) 746 if (prop.slant != rxvt_fontprop::unset)
687 { 747 {
688 replace_field (fname, name, 3, 0, 748 replace_field (&fname, name, 3, 0,
689 prop.slant < rxvt_fontprop::italic 749 prop.slant < rxvt_fontprop::italic
690 ? "r" : "i"); // TODO: handle "o"blique, too 750 ? "r" : "i"); // TODO: handle "o"blique, too
691 set_name (strdup (fname)); 751 set_name (fname);
692 } 752 }
693 } 753 }
694 754
695 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 755 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
696 ? 0 : prop.height); 756 ? 0 : prop.height);
… …
721 font_weight *fonts = new font_weight[count]; 781 font_weight *fonts = new font_weight[count];
722 782
723 for (int i = 0; i < count; i++) 783 for (int i = 0; i < count; i++)
724 { 784 {
725 rxvt_fontprop p; 785 rxvt_fontprop p;
726 char fname[1024]; 786 char *fname;
727 787
728 int diff = 0; 788 int diff = 0;
729 789
730 if (replace_field (fname, list[i], 6, '0', field_str)) 790 if (replace_field (&fname, list[i], 6, '0', field_str))
731 diff += 10; // slightly penalize scalable fonts 791 diff += 10; // slightly penalize scalable fonts
792 else
793 {
794 free (fname);
732 else if (replace_field (fname, list[i], 11, '0', "0")) 795 if (replace_field (&fname, list[i], 11, '0', "0"))
733 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 796 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
797 }
734 798
735 if (!set_properties (p, fname)) 799 if (!set_properties (p, fname)
800 // also weed out too large fonts
801 || (prop.height != rxvt_fontprop::unset
802 && p.height > prop.height))
803 {
804 free (fname);
736 continue; 805 continue;
737 806 }
738 if (prop.height != rxvt_fontprop::unset
739 && p.height > prop.height) // weed out too large fonts
740 continue;
741 807
742 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 808 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
743 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 809 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
744 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 810 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
745 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 811 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
746 812
747 fonts[i].name = strdup (fname); 813 fonts[i].name = fname;
748 fonts[i].diff = diff; 814 fonts[i].diff = diff;
749 } 815 }
750 816
751 XFreeFontNames (list); 817 XFreeFontNames (list);
752 818
… …
781 delete [] fonts; 847 delete [] fonts;
782 848
783 if (!f) 849 if (!f)
784 return false; 850 return false;
785 851
786 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 852 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
787 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 853 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
854
855 cs = CS_UNKNOWN;
788 856
789 if (registry && encoding) 857 if (registry && encoding)
790 { 858 {
791 char charset[64]; 859 char charset[64];
792 snprintf (charset, 64, "%s-%s", registry, encoding); 860 snprintf (charset, 64, "%s-%s", registry, encoding);
793 861
794 cs = codeset_from_name (charset); 862 cs = codeset_from_name (charset);
795 } 863
796 else 864 if (cs == CS_UNKNOWN)
865 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
797 { 866 }
867
868 free (registry);
869 free (encoding);
870
871 if (cs == CS_UNKNOWN)
872 {
798 const char *charset = get_property (f, "FONT", 0); 873 char *value = get_property (f, XA_FONT, 0);
874 const char *charset = value;
799 875
800 if (!charset) 876 if (!charset)
801 charset = name; 877 charset = name;
802 878
803 int count = 13; 879 int count = 13;
804 while (*charset) 880 while (*charset)
805 if (*charset++ == '-' && !--count) 881 if (*charset++ == '-' && !--count)
806 break; 882 break;
807 883
808 cs = codeset_from_name (charset); 884 cs = codeset_from_name (charset);
885 if (cs == CS_UNKNOWN)
886 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
887
888 free (value);
889 }
890
891 if (cs == CS_UNKNOWN)
809 } 892 {
810 893 clear ();
811 free (registry); 894 return false;
812 free (encoding); 895 }
813 896
814 if (cs == CS_UNICODE) 897 if (cs == CS_UNICODE)
815 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 898 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
816 899
817 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 900 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
818 enc2b = encm || f->max_char_or_byte2 > 255; 901 enc2b = encm || f->max_char_or_byte2 > 255;
819 902
820 slow = false; 903 slow = false;
821 904
822#if 1 // only used for slow detection, TODO optimize 905#if 1 // only used for slow detection, TODO optimize
823 if (f->min_bounds.width == f->max_bounds.width) 906 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
824 width = f->min_bounds.width;
825 else if (f->per_char == NULL)
826 width = f->max_bounds.width; 907 width = f->max_bounds.width;
827 else 908 else
828 { 909 {
829 slow = true; 910 slow = true;
830 911
831 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 912 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
832 913
833 if (encm) 914 if (encm)
834 N += (f->max_byte1 - f->min_byte1) 915 N += (f->max_byte1 - f->min_byte1)
835 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 916 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
836 917
837 while (N) 918 while (N)
838 { 919 {
839 if (f->per_char[N].width > width) 920 if (f->per_char[N].width > width)
840 width = f->per_char[N].width; 921 width = f->per_char[N].width;
841 922
… …
844 } 925 }
845#endif 926#endif
846 927
847 width = 1; 928 width = 1;
848 929
849 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 930 for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; )
850 { 931 {
851 if (cs != CS_UNICODE
852 && *t > 0x100
853 && FROM_UNICODE (cs, *t) == NOCHAR) 932 if (FROM_UNICODE (cs, *t) == NOCHAR)
854 continue; 933 continue;
855 934
856 // ignore characters we wouldn't use anyways 935 // ignore characters we wouldn't use anyways
857 bool careful; 936 bool careful;
858 if (!has_char (*t, &prop, careful)) 937 if (!has_char (*t, &prop, careful))
… …
862 941
863 XCharStruct g; 942 XCharStruct g;
864 int dir_ret, asc_ret, des_ret; 943 int dir_ret, asc_ret, des_ret;
865 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 944 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
866 945
946 int wcw = WCWIDTH (*t);
867 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 947 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
868 948
869 if (width < g.width) width = g.width; 949 if (width < g.width) width = g.width;
870 }
871
872 if (cs == CS_UNKNOWN)
873 { 950 }
874 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
875 951
952#if 0 // do it per-character
953 if (prop && width > prop->width)
954 {
876 clear (); 955 clear ();
877 return false; 956 return false;
878 } 957 }
879
880#if 0 // do it per-character
881 if (prop && width > prop->width)
882 {
883 clear ();
884 return false;
885 }
886#endif 958#endif
887 959
888 return true; 960 return true;
889} 961}
890 962
891void 963void
892rxvt_font_x11::clear () 964rxvt_font_x11::clear ()
893{ 965{
894 if (f) 966 if (f)
895 { 967 {
896 XFreeFont (term->display->display, f); 968 XFreeFont (term->dpy, f);
897 f = 0; 969 f = 0;
898 } 970 }
899} 971}
900 972
901bool 973bool
902rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 974rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
903{ 975{
976 careful = false;
977
904 uint32_t ch = FROM_UNICODE (cs, unicode); 978 uint32_t ch = FROM_UNICODE (cs, unicode);
905 979
906 if (ch == NOCHAR) 980 if (ch == NOCHAR)
907 return false; 981 return false;
908 982
909 /* check wether the character exists in _this_ font. horrible. */ 983 /* check whether the character exists in _this_ font. horrible. */
910 XCharStruct *xcs; 984 XCharStruct *xcs;
911 985
912 if (encm) 986 if (encm)
913 { 987 {
914 unsigned char byte1 = ch >> 8; 988 unsigned char byte1 = ch >> 8;
… …
944 return false; 1018 return false;
945 1019
946 if (!prop || prop->width == rxvt_fontprop::unset) 1020 if (!prop || prop->width == rxvt_fontprop::unset)
947 return true; 1021 return true;
948 1022
949 // check character against base font bounding box 1023 // check whether character overlaps previous/next character
950 int w = xcs->width; 1024 int w = xcs->rbearing - xcs->lbearing;
951 int wcw = wcwidth (unicode); 1025 int wcw = max (WCWIDTH (unicode), 1);
952 if (wcw > 0) w = (w + wcw - 1) / wcw;
953 1026
954 careful = w > prop->width; 1027 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
955 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1028
1029 if (careful && !OVERLAP_OK (w, wcw, prop))
956 return false; 1030 return false;
957 1031
958 return true; 1032 return true;
959} 1033}
960 1034
… …
994 else 1068 else
995 { 1069 {
996 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1070 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
997 1071
998 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1072 XChangeGC (disp, gc, GCForeground | GCFont, &v);
999 1073
1000 if (slow) 1074 if (slow)
1001 { 1075 {
1002 do 1076 do
1003 { 1077 {
1004 if (xc->byte1 || xc->byte2) 1078 if (xc->byte1 || xc->byte2)
… …
1026 else 1100 else
1027 { 1101 {
1028 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1102 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1029 1103
1030 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1104 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1031 1105
1032 if (slow) 1106 if (slow)
1033 { 1107 {
1034 do 1108 do
1035 { 1109 {
1036 if (*xc) 1110 if (*xc)
… …
1056 1130
1057 void clear (); 1131 void clear ();
1058 1132
1059 rxvt_fontprop properties (); 1133 rxvt_fontprop properties ();
1060 1134
1061 bool load (const rxvt_fontprop &prop); 1135 bool load (const rxvt_fontprop &prop, bool force_prop);
1062 1136
1063 void draw (rxvt_drawable &d, int x, int y, 1137 void draw (rxvt_drawable &d, int x, int y,
1064 const text_t *text, int len, 1138 const text_t *text, int len,
1065 int fg, int bg); 1139 int fg, int bg);
1066 1140
1067 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1141 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1068 1142
1069protected: 1143protected:
1070 XftFont *f; 1144 XftFont *f;
1071}; 1145};
1072 1146
1073void 1147void
1074rxvt_font_xft::clear () 1148rxvt_font_xft::clear ()
1075{ 1149{
1076 if (f) 1150 if (f)
1077 { 1151 {
1078 XftFontClose (term->display->display, f); 1152 XftFontClose (term->dpy, f);
1079 f = 0; 1153 f = 0;
1080 } 1154 }
1081} 1155}
1082 1156
1083rxvt_fontprop 1157rxvt_fontprop
… …
1099 1173
1100 return p; 1174 return p;
1101} 1175}
1102 1176
1103bool 1177bool
1104rxvt_font_xft::load (const rxvt_fontprop &prop) 1178rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1105{ 1179{
1106 dTermDisplay; 1180 dTermDisplay;
1107 1181
1108 clear (); 1182 clear ();
1109 1183
… …
1118 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1192 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1119 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1193 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1120 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1194 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1121 1195
1122 if (prop.weight != rxvt_fontprop::unset 1196 if (prop.weight != rxvt_fontprop::unset
1123 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1197 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1124 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1198 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1125 1199
1126 if (prop.slant != rxvt_fontprop::unset 1200 if (prop.slant != rxvt_fontprop::unset
1127 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1201 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1128 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1202 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1129 1203
1130#if 0 // clipping unfortunately destroys our precious double-width-characters 1204#if 0 // clipping unfortunately destroys our precious double-width-characters
1131 // clip width, we can't do better, or can we? 1205 // clip width, we can't do better, or can we?
1132 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1206 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1133 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1207 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1134#endif 1208#endif
1135 1209
1136 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1210 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1137 FcPatternAddBool (p, FC_MINSPACE, 1); 1211 FcPatternAddBool (p, FC_MINSPACE, 1);
1138 1212
… …
1150 int ftheight = 0; 1224 int ftheight = 0;
1151 bool success = true; 1225 bool success = true;
1152 1226
1153 for (;;) 1227 for (;;)
1154 { 1228 {
1229 p = FcPatternDuplicate (match);
1155 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1230 f = XftFontOpenPattern (disp, p);
1156 1231
1157 if (!f) 1232 if (!f)
1158 { 1233 {
1234 FcPatternDestroy (p);
1159 success = false; 1235 success = false;
1160 break; 1236 break;
1161 } 1237 }
1162 1238
1163 FT_Face face = XftLockFace (f); 1239 FT_Face face = XftLockFace (f);
… …
1171 1247
1172 XftUnlockFace (f); 1248 XftUnlockFace (f);
1173 1249
1174 int glheight = height; 1250 int glheight = height;
1175 1251
1176 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1252 for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; )
1177 { 1253 {
1178 FcChar16 ch = *t; 1254 FcChar16 ch = *t;
1179 1255
1180 if (cs != CS_UNICODE 1256 if (cs != CS_UNICODE
1181 && ch > 0x100 1257 && ch > 0x100
… …
1190 XGlyphInfo g; 1266 XGlyphInfo g;
1191 XftTextExtents16 (disp, f, &ch, 1, &g); 1267 XftTextExtents16 (disp, f, &ch, 1, &g);
1192 1268
1193 g.width -= g.x; 1269 g.width -= g.x;
1194 1270
1195 int wcw = wcwidth (ch); 1271 int wcw = WCWIDTH (ch);
1196 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1272 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1197 1273
1198 if (width < g.width ) width = g.width; 1274 if (width < g.width ) width = g.width;
1199 if (height < g.height ) height = g.height; 1275 if (height < g.height ) height = g.height;
1200 if (glheight < g.height - g.y) glheight = g.height - g.y; 1276 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1250bool 1326bool
1251rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1327rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1252{ 1328{
1253 careful = false; 1329 careful = false;
1254 1330
1255 if (!XftCharExists (term->display->display, f, unicode)) 1331 if (!XftCharExists (term->dpy, f, unicode))
1256 return false; 1332 return false;
1257 1333
1258 if (!prop || prop->width == rxvt_fontprop::unset) 1334 if (!prop || prop->width == rxvt_fontprop::unset)
1259 return true; 1335 return true;
1260 1336
1261 // check character against base font bounding box 1337 // check character against base font bounding box
1262 FcChar32 ch = unicode; 1338 FcChar32 ch = unicode;
1263 XGlyphInfo g; 1339 XGlyphInfo g;
1264 XftTextExtents32 (term->display->display, f, &ch, 1, &g); 1340 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1265 1341
1266 int w = g.width - g.x; 1342 int w = g.width - g.x;
1267 int wcw = wcwidth (unicode); 1343 int wcw = max (WCWIDTH (unicode), 1);
1268 if (wcw > 0) w = (w + wcw - 1) / wcw;
1269 1344
1270 careful = w > prop->width; 1345 careful = g.x > 0 || w > prop->width * wcw;
1271 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1346
1347 if (careful && !OVERLAP_OK (w, wcw, prop))
1348 return false;
1349
1350 // this weeds out _totally_ broken fonts, or glyphs
1351 if (!OVERLAP_OK (g.xOff, wcw, prop))
1272 return false; 1352 return false;
1273 1353
1274 return true; 1354 return true;
1275} 1355}
1276 1356
1277void 1357void
1278rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1358rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1279 const text_t *text, int len, 1359 const text_t *text, int len,
1280 int fg, int bg) 1360 int fg, int bg)
1281{ 1361{
1282 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1283
1284 XGlyphInfo extents; 1362 XGlyphInfo extents;
1285 XftGlyphSpec *enc = (XftGlyphSpec *)get_enc_buf (len * sizeof (XftGlyphSpec)); 1363 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1286 XftGlyphSpec *ep = enc; 1364 XftGlyphSpec *ep = enc;
1287 1365
1288 dTermDisplay; 1366 dTermDisplay;
1289 dTermGC; 1367 dTermGC;
1368
1369 int w = term->fwidth * len;
1370 int h = term->fheight;
1371
1372 bool buffered = bg >= Color_transparent
1373 && term->option (Opt_buffered);
1290 1374
1291 // cut trailing spaces 1375 // cut trailing spaces
1292 while (len && text [len - 1] == ' ') 1376 while (len && text [len - 1] == ' ')
1293 len--; 1377 len--;
1294 1378
1379 int x_ = buffered ? 0 : x;
1380 int y_ = buffered ? 0 : y;
1381
1295 while (len) 1382 while (len)
1296 { 1383 {
1297 int cwidth = term->fwidth; 1384 int cwidth = term->fwidth;
1298 FcChar32 fc = *text++; len--; 1385 FcChar32 fc = *text++; len--;
1299 1386
1300 while (len && *text == NOCHAR) 1387 while (len && *text == NOCHAR)
1301 text++, len--, cwidth += term->fwidth; 1388 text++, len--, cwidth += term->fwidth;
1302 1389
1303 if (fc != ' ') // skip spaces 1390 if (fc != ' ') // skip spaces
1304 { 1391 {
1305 FT_UInt glyph = XftCharIndex (disp, f, fc); 1392 FT_UInt glyph = XftCharIndex (disp, f, fc);
1306 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1393 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1307 1394
1308 ep->glyph = glyph; 1395 ep->glyph = glyph;
1309 ep->x = x + (cwidth - extents.xOff >> 1); 1396 ep->x = x_ + (cwidth - extents.xOff >> 1);
1310 ep->y = y + ascent; 1397 ep->y = y_ + ascent;
1398
1399 if (extents.xOff == 0)
1400 ep->x = x_ + cwidth;
1401
1311 ep++; 1402 ep++;
1312 } 1403 }
1313 1404
1314 x += cwidth; 1405 x_ += cwidth;
1406 }
1407
1408 if (buffered)
1315 } 1409 {
1316
1317 if (ep != enc) 1410 if (ep != enc)
1411 {
1412 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1413
1414#ifdef HAVE_BG_PIXMAP
1415 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1416
1417 if (term->bg_pixmap
1418 && (bg == Color_transparent || bg == Color_bg
1419 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1420 {
1421 int src_x = x, src_y = y;
1422
1423 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1424 {
1425 src_x += term->window_vt_x;
1426 src_y += term->window_vt_y;
1427 }
1428
1429 if (term->bg_pmap_width >= src_x + w
1430 && term->bg_pmap_height >= src_y + h)
1431 {
1432 XCopyArea (disp, term->bg_pixmap, d2, gc,
1433 src_x, src_y, w, h, 0, 0);
1434 }
1435 else
1436 {
1437 XGCValues gcv;
1438
1439 gcv.fill_style = FillTiled;
1440 gcv.tile = term->bg_pixmap;
1441 gcv.ts_x_origin = -src_x;
1442 gcv.ts_y_origin = -src_y;
1443
1444 XChangeGC (disp, gc,
1445 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1446 &gcv);
1447
1448 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1449
1450 gcv.fill_style = FillSolid;
1451 XChangeGC (disp, gc, GCFillStyle, &gcv);
1452 }
1453
1454 if (dst)
1455 {
1456 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1457
1458 // dst can only be set when bg >= 0
1459 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1460 }
1461 }
1462 else
1463#endif
1464 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1465
1466 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1467 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1468 }
1469 else
1470 clear_rect (d, x, y, w, h, bg);
1471 }
1472 else
1473 {
1474 clear_rect (d, x, y, w, h, bg);
1318 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1475 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1476 }
1319} 1477}
1478
1320#endif 1479#endif
1321 1480
1322///////////////////////////////////////////////////////////////////////////// 1481/////////////////////////////////////////////////////////////////////////////
1323 1482
1324rxvt_fontset::rxvt_fontset (rxvt_term *term) 1483rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1335void 1494void
1336rxvt_fontset::clear () 1495rxvt_fontset::clear ()
1337{ 1496{
1338 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1497 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1339 = rxvt_fontprop::unset; 1498 = rxvt_fontprop::unset;
1499 force_prop = false;
1340 1500
1341 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1501 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1342 FONT_UNREF (*i); 1502 (*i)->unref ();
1343 1503
1344 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1504 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1345 delete *p; 1505 delete *p;
1346 1506
1347 free (fontdesc); fontdesc = 0; 1507 free (fontdesc); fontdesc = 0;
… …
1349 fonts.clear (); 1509 fonts.clear ();
1350 1510
1351 fallback = fallback_fonts; 1511 fallback = fallback_fonts;
1352} 1512}
1353 1513
1514void
1515rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1516{
1517 font->set_term (term);
1518
1519 font->cs = cs;
1520 font->loaded = false;
1521}
1522
1354rxvt_font * 1523rxvt_font *
1355rxvt_fontset::new_font (const char *name, codeset cs) 1524rxvt_fontset::new_font (const char *name, codeset cs)
1356{ 1525{
1357 rxvt_font *f; 1526 rxvt_font *f;
1358 1527
1359 if (!name || !*name) 1528 if (!name || !*name)
1360 { 1529 {
1361 name = ""; 1530 name = "";
1362 f = new rxvt_font_default (this); 1531 f = new rxvt_font_default (this);
1363 } 1532 }
… …
1374 f = new rxvt_font_x11; 1543 f = new rxvt_font_x11;
1375 } 1544 }
1376 else 1545 else
1377 f = new rxvt_font_x11; 1546 f = new rxvt_font_x11;
1378 1547
1379 f->set_term (term);
1380 f->set_name (strdup (name)); 1548 f->set_name (strdup (name));
1381 1549 prepare_font (f, cs);
1382 f->cs = cs;
1383 f->loaded = false;
1384 1550
1385 return f; 1551 return f;
1386} 1552}
1387 1553
1388///////////////////////////////////////////////////////////////////////////// 1554/////////////////////////////////////////////////////////////////////////////
1555
1556void
1557rxvt_fontset::push_font (rxvt_font *font)
1558{
1559 // the fontCount index is reserved for the overflow font, it is only
1560 // necessary when we get fontCount or more fonts, as they cannot be
1561 // represented in the rendition.
1562 if (fonts.size () == fontCount)
1563 {
1564 rxvt_font *f = new rxvt_font_overflow (this);
1565
1566 prepare_font (f, CS_UNICODE);
1567 fonts.push_back (f);
1568 }
1569
1570 fonts.push_back (font);
1571}
1389 1572
1390void 1573void
1391rxvt_fontset::add_fonts (const char *desc) 1574rxvt_fontset::add_fonts (const char *desc)
1392{ 1575{
1393 if (desc) 1576 if (desc)
… …
1431 if (!end) 1614 if (!end)
1432 end = desc + strlen (desc); 1615 end = desc + strlen (desc);
1433 1616
1434 if (end - desc < 511) 1617 if (end - desc < 511)
1435 { 1618 {
1436 strncpy (buf, desc, end - desc); 1619 memcpy (buf, desc, end - desc);
1437 buf[end - desc] = 0; 1620 buf[end - desc] = 0;
1438 1621
1439 fonts.push_back (new_font (buf, cs)); 1622 push_font (new_font (buf, cs));
1440 } 1623 }
1441 else 1624 else
1442 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1625 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1443 1626
1444 desc = end + 1; 1627 desc = end + 1;
1445 } 1628 }
1446 while (*end); 1629 while (*end);
1447 } 1630 }
… …
1456 if (fonts[i]->loaded) 1639 if (fonts[i]->loaded)
1457 return true; 1640 return true;
1458 1641
1459 fonts[i]->loaded = true; 1642 fonts[i]->loaded = true;
1460 1643
1461 if (!fonts[i]->load (prop)) 1644 if (!fonts[i]->load (prop, force_prop))
1462 { 1645 {
1463 fonts[i]->cs = CS_UNKNOWN; 1646 fonts[i]->cs = CS_UNKNOWN;
1464 return false; 1647 return false;
1465 } 1648 }
1466 1649
… …
1472{ 1655{
1473 clear (); 1656 clear ();
1474 1657
1475 fontdesc = strdup (desc); 1658 fontdesc = strdup (desc);
1476 1659
1477 fonts.push_back (new_font (0, CS_UNICODE)); 1660 push_font (new_font (0, CS_UNICODE));
1478 realize_font (0); 1661 realize_font (0);
1479 1662
1480 add_fonts (desc); 1663 add_fonts (desc);
1481 1664
1482 return true; 1665 return true;
… …
1491 1674
1492 return -1; 1675 return -1;
1493} 1676}
1494 1677
1495int 1678int
1496rxvt_fontset::find_font (unicode_t unicode) 1679rxvt_fontset::find_font_idx (unicode_t unicode)
1497{ 1680{
1498 if (unicode >= 1<<20) 1681 if (unicode >= 1<<20)
1499 return 0; 1682 return 0;
1500 1683
1501 unicode_t hi = unicode >> 8; 1684 unicode_t hi = unicode >> 8;
… …
1527 goto next_font; 1710 goto next_font;
1528 1711
1529 bool careful; 1712 bool careful;
1530 if (f->has_char (unicode, &prop, careful)) 1713 if (f->has_char (unicode, &prop, careful))
1531 { 1714 {
1532 if (careful) 1715 i = (i << 1) | careful;
1533 i |= 128;
1534 1716
1535 goto found; 1717 goto found;
1536 } 1718 }
1537 1719
1538 next_font: 1720 next_font:
1539 if (i == fonts.size () - 1) 1721 if (i == fonts.size () - 1)
1540 { 1722 {
1541 if (fallback->name) 1723 if (fallback->name)
1542 { 1724 {
1543 // search through the fallback list 1725 // search through the fallback list
1544 fonts.push_back (new_font (fallback->name, fallback->cs)); 1726 push_font (new_font (fallback->name, fallback->cs));
1545 fallback++; 1727 fallback++;
1546 } 1728 }
1547 else 1729 else
1548 { 1730 {
1549 // try to find a new font. 1731 // try to find a new font.
… …
1567 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1749 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1568 FcPatternAddBool (p, FC_MINSPACE, 1); 1750 FcPatternAddBool (p, FC_MINSPACE, 1);
1569 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1751 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1570 1752
1571 XftResult result; 1753 XftResult result;
1572 FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result); 1754 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1573 1755
1574 FcPatternDestroy (p); 1756 FcPatternDestroy (p);
1575 1757
1576 if (match) 1758 if (match)
1577 { 1759 {
… …
1580 FcPatternDestroy (match); 1762 FcPatternDestroy (match);
1581 1763
1582 if (find_font (font) < 0) 1764 if (find_font (font) < 0)
1583 { 1765 {
1584 char fontname[4096]; 1766 char fontname[4096];
1585 sprintf (fontname, "xft:%-.4090s", font); 1767 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1586 1768
1587 fonts.push_back (new_font (fontname, CS_UNICODE)); 1769 push_font (new_font (fontname, CS_UNICODE));
1588 } 1770 }
1589 1771
1590 free (font); 1772 free (font);
1591 } 1773 }
1592#endif 1774#endif
… …
1614 } 1796 }
1615 1797
1616 return i; 1798 return i;
1617} 1799}
1618 1800
1619
1620

Diff Legend

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