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

Diff Legend

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