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.83 by root, Mon Jan 9 07:35:23 2006 UTC vs.
Revision 1.176 by sf-exg, Fri Jan 28 00:08:58 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 <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
25#include "rxvtutil.h" 24#include "rxvtutil.h"
26#include "rxvtfont.h" 25#include "rxvtfont.h"
27 26
28#include <cstdlib> 27#include <cstdlib>
29#include <wchar.h> 28
30#include <inttypes.h> 29#include <inttypes.h>
31 30
32#define DISPLAY r->display->display 31#if XFT
33#define TGC r->gc 32# include <fontconfig/fontconfig.h>
33#endif
34 34
35#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
36 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
37const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
38 codeset cs; 45 codeset cs;
39 const char *name; 46 const char *name;
40} fallback_fonts[] = { 47} fallback_fonts[] = {
41 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
42 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
43 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 50 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
44 51
45#if ENCODING_EU 52#if ENCODING_EU
46 // cyrillic 53 // cyrillic
47 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 54 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
48 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 55 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
49 56
50 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 57 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
51 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 58 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
52 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 59 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
53 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 60 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
54 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 61 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
60 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 67 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
61 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 68 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
62 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 69 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
63 70
64# if XFT 71# if XFT
65 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 72 { CS_KOI8_U, "xft::lang=ru" },
66 73
67 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 74 { CS_ISO8859_5, "xft::lang=ru" },
68 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 75 { CS_ISO8859_6, "xft::lang=ar" },
69 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 76 { CS_ISO8859_7, "xft::lang=el" },
70 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 77 { CS_ISO8859_8, "xft::lang=he" },
71 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 78 { CS_ISO8859_9, "xft::lang=tr" },
72 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 79 { CS_ISO8859_10, "xft::lang=se" },
73 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 80 { CS_ISO8859_11, "xft::lang=th" },
74# endif 81# endif
75#endif 82#endif
76 83
77 // japanese 84 // japanese
78#if ENCODING_JP || ENCODING_JP_EXT 85#if ENCODING_JP || ENCODING_JP_EXT
79# if XFT 86# if XFT
80 // prefer xft for complex scripts 87 // prefer xft for complex scripts
88 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
81 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 89 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
82 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
83 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 90 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
84 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 91 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
85# endif 92# endif
86 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
87 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
88 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 95 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
89 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 96 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
… …
93 100
94#if ENCODING_ZH || ENCODING_ZH_EXT 101#if ENCODING_ZH || ENCODING_ZH_EXT
95# if XFT 102# if XFT
96 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 103 { CS_GBK_0, "xft:AR PL KaitiM GB" },
97 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 104 { CS_GBK_0, "xft:AR PL SungtiL GB" },
98 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 105 { CS_GBK_0, "xft::lang=zh" },
99 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 106 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
100 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 107 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
101 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 108 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
102 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 109 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
103 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 110 { CS_GB2312_1980_0, "xft::lang=zh" },
104# endif 111# endif
105 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 112 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
106 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 113 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
107 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 114 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
108 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 115 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
121#if ENCODING_KR 128#if ENCODING_KR
122 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 129 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
123 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 130 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
124# if XFT 131# if XFT
125 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
126 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
127# endif 134# endif
128#endif 135#endif
129 136
130 // generic font fallback
131 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 137 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
132 { 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.
133 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
134 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
135#if XFT 139#if XFT
136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 141 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
138 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 142 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
139 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 143 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
140 144
141 // FreeMono is usually uglier than x fonts, so try last only. 145 // FreeMono is usually uglier than x fonts, so try after the others
142 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 146 { CS_UNICODE, "xft:FreeMono:autohint=true" },
143#endif 147#endif
144 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" },
145 { CS_UNKNOWN, 0 } 153 { CS_UNKNOWN, 0 }
146}; 154};
147 155
148// these characters are used to guess the font height and width 156// these characters are used to guess the font height and width
149// 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.
… …
151 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 159 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
152 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 160 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
153 0x304c, 0x672c, // が本 161 0x304c, 0x672c, // が本
154}; 162};
155 163
156#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 164#define dTermDisplay Display *disp = term->dpy
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) 233rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
252{ 234{
253 if (color == Color_bg) 235 dTermDisplay;
254 XClearArea (d.display->display, d, x, y, w, h, FALSE); 236 dTermGC;
237
238 if (color == Color_bg || color == Color_transparent)
239 XClearArea (disp, d, x, y, w, h, false);
255 else if (color >= 0) 240 else if (color >= 0)
256 { 241 {
257#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
258 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258
259#else 259#else
260 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 260 XSetForeground (disp, gc, term->pix_colors[color]);
261 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 261 XFillRectangle (disp, d, gc, x, y, w, h);
262#endif 262#endif
263 } 263 }
264} 264}
265 265
266#include "table/linedraw.h" 266/////////////////////////////////////////////////////////////////////////////
267 267
268struct rxvt_font_default : rxvt_font { 268struct rxvt_font_default : rxvt_font {
269 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
270 270
271 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
… …
284 p.slant = rxvt_fontprop::roman; 284 p.slant = rxvt_fontprop::roman;
285 285
286 return p; 286 return p;
287 } 287 }
288 288
289 bool load (const rxvt_fontprop &prop) 289 bool load (const rxvt_fontprop &prop, bool force_prop)
290 { 290 {
291 width = 1; height = 1; 291 width = 1; height = 1;
292 ascent = 1; descent = 0; 292 ascent = 1; descent = 0;
293 293
294 set_name (strdup ("built-in support font")); 294 set_name (strdup ("built-in support font"));
295 295
296 return true; 296 return true;
297 } 297 }
298 298
299 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 299 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
300 { 300 {
301 careful = false; 301 careful = false;
302 302
303 if (unicode <= 0x001f) 303 if (unicode <= 0x001f)
304 return true; 304 return true;
… …
307 return false; 307 return false;
308 308
309 if (unicode <= 0x009f) 309 if (unicode <= 0x009f)
310 return true; 310 return true;
311 311
312#ifdef BUILTIN_GLYPHS
312 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
313 !r->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
314 return true; 315 return true;
316#endif
315 317
316 if (IS_COMPOSE (unicode)) 318 if (IS_COMPOSE (unicode))
317 return true; 319 return true;
318 320
319 switch (unicode) 321 switch (unicode)
… …
334void 336void
335rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 337rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
336 const text_t *text, int len, 338 const text_t *text, int len,
337 int fg, int bg) 339 int fg, int bg)
338{ 340{
339 Display *disp = d.display->display; 341 dTermDisplay;
342 dTermGC;
340 343
341 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 344 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
342 345
343 XSetForeground (disp, TGC, r->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
344 347
345 while (len) 348 while (len)
346 { 349 {
347#if ENABLE_COMBINING 350#if ENABLE_COMBINING
348 compose_char *cc; 351 compose_char *cc;
… …
352 355
353 while (++text, --len && *text == NOCHAR) 356 while (++text, --len && *text == NOCHAR)
354 ; 357 ;
355 358
356 int width = text - tp; 359 int width = text - tp;
357 int fwidth = r->fwidth * width; 360 int fwidth = term->fwidth * width;
358 361
362#ifdef BUILTIN_GLYPHS
359 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
360 { 364 {
365# include "table/linedraw.h"
361 uint16_t offs = linedraw_offs[t - 0x2500]; 366 uint16_t offs = linedraw_offs[t - 0x2500];
362 uint32_t *a = linedraw_command + (offs >> 4); 367 uint32_t *a = linedraw_command + (offs >> 4);
363 uint32_t *b = a + (offs & 15); 368 uint32_t *b = a + (offs & 15);
364 369
365 int W = fwidth; 370 int W = fwidth;
366 int H = r->fheight; 371 int H = term->fheight;
367 372
368 int x_[16]; 373 int x_[16];
369 int y_[16]; 374 int y_[16];
370 375
371 for (int i = 0; i <= 8; i++) 376 for (int i = 0; i <= 8; i++)
… …
379 384
380 XGCValues gcv; 385 XGCValues gcv;
381 386
382 gcv.cap_style = CapButt; 387 gcv.cap_style = CapButt;
383 gcv.line_width = 0; 388 gcv.line_width = 0;
384 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 389 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
385 390
386 while (a < b) 391 while (a < b)
387 { 392 {
388 uint32_t command = *a++; 393 uint32_t command = *a++;
389 394
… …
396 int y2 = y_[(command >> 0) & 15]; 401 int y2 = y_[(command >> 0) & 15];
397 402
398 switch (op) 403 switch (op)
399 { 404 {
400 case 0: // line 405 case 0: // line
401 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 406 XDrawLine (disp, d, gc, x1, y1, x2, y2);
402 break; 407 break;
403 408
404 case 1: // rectangle, possibly stippled 409 case 1: // rectangle, possibly stippled
405 if (a) 410 if (a)
406 { 411 {
407 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 412 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
408 413
409 gcv.fill_style = FillStippled; 414 gcv.fill_style = FillStippled;
410 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
411 gcv.ts_x_origin = x; 416 gcv.ts_x_origin = x;
412 gcv.ts_y_origin = y; 417 gcv.ts_y_origin = y;
413 418
414 XChangeGC (disp, TGC, 419 XChangeGC (disp, gc,
415 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 420 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
416 &gcv); 421 &gcv);
417 } 422 }
418 423
419 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 424 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
420 425
421 if (a) 426 if (a)
422 { 427 {
423 XFreePixmap (disp, gcv.stipple); 428 XFreePixmap (disp, gcv.stipple);
424 gcv.stipple = 0; 429 gcv.stipple = 0;
425 gcv.fill_style = FillSolid; 430 gcv.fill_style = FillSolid;
426 XChangeGC (disp, TGC, GCFillStyle, &gcv); 431 XChangeGC (disp, gc, GCFillStyle, &gcv);
427 } 432 }
428 break; 433 break;
429 case 2: // arc 434 case 2: // arc
430 XDrawArc (disp, d, TGC, 435 XDrawArc (disp, d, gc,
431 x1 - W/2, y1 - H/2, W-1, H-1, 436 x1 - W/2, y1 - H/2, W-1, H-1,
432 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
433 break; 438 break;
434 } 439 }
435 } 440 }
436 } 441 }
442#else
443 if (0)
444 ;
445#endif
437#if ENABLE_COMBINING 446#if ENABLE_COMBINING
438 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
439 { 448 {
449 min_it (width, 2); // we only support wcwidth up to 2
450
440 text_t chrs[2]; 451 text_t chrs[2];
441 width = min (2, width);
442 chrs [1] = NOCHAR; 452 chrs [1] = NOCHAR;
443 453
444 *chrs = cc->c1; 454 *chrs = cc->c1;
445 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
446 f1->draw (d, x, y, chrs, width, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
447 457
448 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
449 { 459 {
450 bool careful; 460 bool careful;
451 461
452 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
453 *chrs = cc->c2; 463 *chrs = cc->c2;
454 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
455 ? f1 465 ? f1
456 : (*fs)[fs->find_font (cc->c2)]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
457 467
458 f2->draw (d, x, y, chrs, width, fg, -1); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
459 } 469 }
460 } 470 }
461#endif 471#endif
462 else 472 else
463 switch (t) 473 switch (t)
… …
466 case ZERO_WIDTH_CHAR: 476 case ZERO_WIDTH_CHAR:
467 case NOCHAR: 477 case NOCHAR:
468 break; 478 break;
469 479
470 default: 480 default:
471 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 481 XDrawRectangle (disp, d, gc, x + 2, y + 2,
472 fwidth - 4, r->fheight - 4); 482 fwidth - 4, term->fheight - 4);
473 } 483 }
474 484
475 x += fwidth; 485 x += fwidth;
476 } 486 }
477} 487}
488
489struct rxvt_font_overflow : rxvt_font {
490 struct rxvt_fontset *fs;
491
492 rxvt_font_overflow (rxvt_fontset *fs)
493 : rxvt_font ()
494 {
495 this->fs = fs;
496 }
497
498 rxvt_fontprop properties ()
499 {
500 rxvt_fontprop p;
501
502 p.width = p.height = 1;
503 p.ascent = rxvt_fontprop::unset;
504 p.weight = rxvt_fontprop::medium;
505 p.slant = rxvt_fontprop::roman;
506
507 return p;
508 }
509
510 bool load (const rxvt_fontprop &prop, bool force_prop)
511 {
512 width = 1; height = 1;
513 ascent = 1; descent = 0;
514
515 set_name (strdup ("built-in rendition overflow font"));
516
517 return true;
518 }
519
520 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
521 {
522 return false;
523 }
524
525 void draw (rxvt_drawable &d, int x, int y,
526 const text_t *text, int len,
527 int fg, int bg)
528 {
529 while (len--)
530 {
531 int fid = fs->find_font_idx (*text);
532 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
533 ++text;
534 x += term->fwidth;
535 }
536 }
537};
478 538
479///////////////////////////////////////////////////////////////////////////// 539/////////////////////////////////////////////////////////////////////////////
480 540
481struct rxvt_font_x11 : rxvt_font { 541struct rxvt_font_x11 : rxvt_font {
482 rxvt_font_x11 () { f = 0; } 542 rxvt_font_x11 () { f = 0; }
483 543
484 void clear (); 544 void clear ();
485 545
486 rxvt_fontprop properties (); 546 rxvt_fontprop properties ();
487 547
488 bool load (const rxvt_fontprop &prop); 548 bool load (const rxvt_fontprop &prop, bool force_prop);
489 549
490 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 550 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
491 551
492 void draw (rxvt_drawable &d, int x, int y, 552 void draw (rxvt_drawable &d, int x, int y,
493 const text_t *text, int len, 553 const text_t *text, int len,
494 int fg, int bg); 554 int fg, int bg);
495 555
496 bool slow; // wether this is a proportional font or has other funny characteristics 556 bool slow; // whether this is a proportional font or has other funny characteristics
497 XFontStruct *f; 557 XFontStruct *f;
498 codeset cs;
499 bool enc2b, encm; 558 bool enc2b, encm;
500 559
501 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 560 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
502 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 561 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
503 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 562 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
504 bool set_properties (rxvt_fontprop &p, const char *name); 563 bool set_properties (rxvt_fontprop &p, const char *name);
505}; 564};
506 565
507char * 566char *
508rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 567rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
509{ 568{
510 unsigned long value; 569 unsigned long value;
511 570
512 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 571 if (XGetFontProperty (f, property, &value))
513 return XGetAtomName (DISPLAY, value); 572 return XGetAtomName (term->dpy, value);
514 else 573 else
515 return rxvt_strdup (repl); 574 return repl ? strdup (repl) : 0;
516} 575}
517 576
518rxvt_fontprop 577rxvt_fontprop
519rxvt_font_x11::properties () 578rxvt_font_x11::properties ()
520{ 579{
… …
524} 583}
525 584
526bool 585bool
527rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 586rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
528{ 587{
529 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 588 p.width = width != rxvt_fontprop::unset ? width
589 : avgwidth ? (avgwidth + 1) / 10
590 : (height + 1) / 2;
530 p.height = height; 591 p.height = height;
531 p.ascent = rxvt_fontprop::unset; 592 p.ascent = rxvt_fontprop::unset;
532 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 593 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
533 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 594 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
534 595
… …
539rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 600rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
540{ 601{
541 unsigned long height; 602 unsigned long height;
542 603
543#if 0 604#if 0
544 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 605 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
545 return false; 606 return false;
546#else 607#else
547 height = f->ascent + f->descent; 608 height = f->ascent + f->descent;
548#endif 609#endif
549 610
550 unsigned long avgwidth; 611 unsigned long avgwidth;
551 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 612 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
552 avgwidth = 0; 613 avgwidth = 0;
553 614
554 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 615 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
555 char *slant = get_property (f, "SLANT", "r"); 616 char *slant = get_property (f, term->xa [XA_SLANT], "r");
556 617
557 set_properties (p, height, weight, slant, avgwidth); 618 set_properties (p, height, weight, slant, avgwidth);
558 619
559 free (weight); 620 free (weight);
560 free (slant); 621 free (slant);
… …
565} 626}
566 627
567bool 628bool
568rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 629rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
569{ 630{
631 dTermDisplay;
570 int slashes = 0; 632 int slashes = 0;
571 const char *comp[13]; 633 const char *comp[13];
572 634
573 for (const char *c = name; *c; c++) 635 for (const char *c = name; *c; c++)
574 if (*c == '-') 636 if (*c == '-')
… …
582 if (slashes >= 13 644 if (slashes >= 13
583 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 645 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
584 && (*comp[11] >= '0' && *comp[11] <= '9')) 646 && (*comp[11] >= '0' && *comp[11] <= '9'))
585 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 647 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
586 648
587 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 649 XFontStruct *f = XLoadQueryFont (disp, name);
588 650
589 if (f) 651 if (f)
590 { 652 {
591 // the font should really exist now. if not, we have a problem 653 // the font should really exist now. if not, we have a problem
592 // (e.g. if the user did xset fp rehash just when we were searching fonts). 654 // (e.g. if the user did xset fp rehash just when we were searching fonts).
593 // in that case, just return garbage. 655 // in that case, just return garbage.
594 bool ret = set_properties (p, f); 656 bool ret = set_properties (p, f);
595 XFreeFont (DISPLAY, f); 657 XFreeFont (disp, f);
596 return ret; 658 return ret;
597 } 659 }
598 else 660 else
599 return false; 661 return false;
600} 662}
601 663
602// fix the size of scalable fonts 664// fix the size of scalable fonts
603static bool 665static bool
604replace_field (char *buf, const char *name, int index, const char old, const char *replace) 666replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
605{ 667{
606 int slashes = 0; 668 int slashes = 0;
607 const char *field, *end; 669 const char *field, *end;
608 670
609 for (const char *c = name; *c; c++) 671 for (const char *c = name; *c; c++)
… …
619 break; 681 break;
620 } 682 }
621 683
622 if (slashes >= 13 && (!old || *field == old)) 684 if (slashes >= 13 && (!old || *field == old))
623 { 685 {
624 // TODO: check for overflow in font-name 686 size_t len = field - name;
625 strncpy (buf, name, field - name); 687 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
626 buf += field - name; 688 memcpy (*ptr, name, len);
627 strcpy (buf, replace); 689 strcpy (*ptr + len, replace);
628 strcat (buf, end); 690 strcat (*ptr, end);
629 691
630 return true; 692 return true;
631 } 693 }
632 else 694 else
633 { 695 {
634 strcpy (buf, name); 696 *ptr = strdup (name);
635 697
636 return false; 698 return false;
637 } 699 }
638} 700}
639 701
640bool 702bool
641rxvt_font_x11::load (const rxvt_fontprop &prop) 703rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
642{ 704{
643 Display *disp = DISPLAY; 705 dTermDisplay;
644 706
645 clear (); 707 clear ();
646 708
647 char field_str[64]; // enough for 128 bits 709 char field_str[64]; // enough for 128 bits
648 710
649 // first morph the font if required 711 // first morph the font if required
650 if (prop.weight != rxvt_fontprop::unset 712 if (force_prop)
651 || prop.slant != rxvt_fontprop::unset)
652 { 713 {
653 char fname[1024]; 714 char *fname;
654 715
655 if (name[0] != '-') 716 if (name[0] != '-')
656 { 717 {
657 f = XLoadQueryFont (disp, name); 718 f = XLoadQueryFont (disp, name);
658 719
659 if (!f) 720 if (!f)
660 return false; 721 return false;
661 722
662 char *new_name = get_property (f, "FONT", name); 723 char *new_name = get_property (f, XA_FONT, 0);
663 724
664 if (new_name) 725 if (new_name)
665 set_name (new_name); 726 set_name (new_name);
666 else 727 else
667 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 728 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
668 729
669 XFreeFont (disp, f); 730 XFreeFont (disp, f);
670 f = 0; 731 f = 0;
671 } 732 }
672 733
673 if (prop.weight != rxvt_fontprop::unset) 734 if (prop.weight != rxvt_fontprop::unset)
674 { 735 {
675 replace_field (fname, name, 2, 0, 736 replace_field (&fname, name, 2, 0,
676 prop.weight < rxvt_fontprop::bold 737 prop.weight < rxvt_fontprop::bold
677 ? "medium" : "bold"); 738 ? "medium" : "bold");
678 set_name (strdup (fname)); 739 set_name (fname);
679 } 740 }
680 741
681 if (prop.slant != rxvt_fontprop::unset) 742 if (prop.slant != rxvt_fontprop::unset)
682 { 743 {
683 replace_field (fname, name, 3, 0, 744 replace_field (&fname, name, 3, 0,
684 prop.slant < rxvt_fontprop::italic 745 prop.slant < rxvt_fontprop::italic
685 ? "r" : "i"); // TODO: handle "o"blique, too 746 ? "r" : "i"); // TODO: handle "o"blique, too
686 set_name (strdup (fname)); 747 set_name (fname);
687 } 748 }
688 } 749 }
689 750
690 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 751 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
691 ? 0 : prop.height); 752 ? 0 : prop.height);
… …
716 font_weight *fonts = new font_weight[count]; 777 font_weight *fonts = new font_weight[count];
717 778
718 for (int i = 0; i < count; i++) 779 for (int i = 0; i < count; i++)
719 { 780 {
720 rxvt_fontprop p; 781 rxvt_fontprop p;
721 char fname[1024]; 782 char *fname;
722 783
723 int diff = 0; 784 int diff = 0;
724 785
725 if (replace_field (fname, list[i], 6, '0', field_str)) 786 if (replace_field (&fname, list[i], 6, '0', field_str))
726 diff += 10; // slightly penalize scalable fonts 787 diff += 10; // slightly penalize scalable fonts
788 else
789 {
790 free (fname);
727 else if (replace_field (fname, list[i], 11, '0', "0")) 791 if (replace_field (&fname, list[i], 11, '0', "0"))
728 diff += 300; // more heavily penalize what looks like scaled bitmap fotns 792 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
793 }
729 794
730 if (!set_properties (p, fname)) 795 if (!set_properties (p, fname)
796 // also weed out too large fonts
797 || (prop.height != rxvt_fontprop::unset
798 && p.height > prop.height))
799 {
800 free (fname);
731 continue; 801 continue;
732 802 }
733 if (prop.height != rxvt_fontprop::unset
734 && p.height > prop.height) // weed out too large fonts
735 continue;
736 803
737 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 804 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
738 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 805 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
739 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 806 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
740 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 807 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
741 808
742 fonts[i].name = strdup (fname); 809 fonts[i].name = fname;
743 fonts[i].diff = diff; 810 fonts[i].diff = diff;
744 } 811 }
745 812
746 XFreeFontNames (list); 813 XFreeFontNames (list);
747 814
… …
776 delete [] fonts; 843 delete [] fonts;
777 844
778 if (!f) 845 if (!f)
779 return false; 846 return false;
780 847
781 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 848 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
782 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 849 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
850
851 cs = CS_UNKNOWN;
783 852
784 if (registry && encoding) 853 if (registry && encoding)
785 { 854 {
786 char charset[64]; 855 char charset[64];
787 snprintf (charset, 64, "%s-%s", registry, encoding); 856 snprintf (charset, 64, "%s-%s", registry, encoding);
788 857
789 cs = codeset_from_name (charset); 858 cs = codeset_from_name (charset);
790 } 859
791 else 860 if (cs == CS_UNKNOWN)
861 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
792 { 862 }
863
864 free (registry);
865 free (encoding);
866
867 if (cs == CS_UNKNOWN)
868 {
793 const char *charset = get_property (f, "FONT", 0); 869 char *value = get_property (f, XA_FONT, 0);
870 const char *charset = value;
794 871
795 if (!charset) 872 if (!charset)
796 charset = name; 873 charset = name;
797 874
798 int count = 13; 875 int count = 13;
799 while (*charset) 876 while (*charset)
800 if (*charset++ == '-' && !--count) 877 if (*charset++ == '-' && !--count)
801 break; 878 break;
802 879
803 cs = codeset_from_name (charset); 880 cs = codeset_from_name (charset);
881 if (cs == CS_UNKNOWN)
882 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
883
884 free (value);
885 }
886
887 if (cs == CS_UNKNOWN)
804 } 888 {
805 889 clear ();
806 free (registry); 890 return false;
807 free (encoding); 891 }
808 892
809 if (cs == CS_UNICODE) 893 if (cs == CS_UNICODE)
810 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 894 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
811 895
812 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 896 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
813 enc2b = encm || f->max_char_or_byte2 > 255; 897 enc2b = encm || f->max_char_or_byte2 > 255;
814 898
815 slow = false; 899 slow = false;
816 900
817#if 1 // only used for slow detection, TODO optimize 901#if 1 // only used for slow detection, TODO optimize
818 if (f->min_bounds.width == f->max_bounds.width) 902 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
819 width = f->min_bounds.width;
820 else if (f->per_char == NULL)
821 width = f->max_bounds.width; 903 width = f->max_bounds.width;
822 else 904 else
823 { 905 {
824 slow = true; 906 slow = true;
825 907
826 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 908 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
827 909
828 if (encm) 910 if (encm)
829 N += (f->max_byte1 - f->min_byte1) 911 N += (f->max_byte1 - f->min_byte1)
830 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 912 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
831 913
832 while (N) 914 while (N)
833 { 915 {
834 if (f->per_char[N].width > width) 916 if (f->per_char[N].width > width)
835 width = f->per_char[N].width; 917 width = f->per_char[N].width;
836 918
… …
839 } 921 }
840#endif 922#endif
841 923
842 width = 1; 924 width = 1;
843 925
844 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 926 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
845 { 927 {
846 if (cs != CS_UNICODE
847 && *t > 0x100
848 && FROM_UNICODE (cs, *t) == NOCHAR) 928 if (FROM_UNICODE (cs, *t) == NOCHAR)
849 continue; 929 continue;
850 930
851 // ignore characters we wouldn't use anyways 931 // ignore characters we wouldn't use anyways
852 bool careful; 932 bool careful;
853 if (!has_char (*t, &prop, careful)) 933 if (!has_char (*t, &prop, careful))
… …
857 937
858 XCharStruct g; 938 XCharStruct g;
859 int dir_ret, asc_ret, des_ret; 939 int dir_ret, asc_ret, des_ret;
860 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 940 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
861 941
942 int wcw = WCWIDTH (*t);
862 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 943 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
863 944
864 if (width < g.width) width = g.width; 945 if (width < g.width) width = g.width;
865 }
866
867 if (cs == CS_UNKNOWN)
868 { 946 }
869 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
870 947
948#if 0 // do it per-character
949 if (prop && width > prop->width)
950 {
871 clear (); 951 clear ();
872 return false; 952 return false;
873 } 953 }
874
875#if 0 // do it per-character
876 if (prop && width > prop->width)
877 {
878 clear ();
879 return false;
880 }
881#endif 954#endif
882 955
883 return true; 956 return true;
884} 957}
885 958
886void 959void
887rxvt_font_x11::clear () 960rxvt_font_x11::clear ()
888{ 961{
889 if (f) 962 if (f)
890 { 963 {
891 XFreeFont (DISPLAY, f); 964 XFreeFont (term->dpy, f);
892 f = 0; 965 f = 0;
893 } 966 }
894} 967}
895 968
896bool 969bool
897rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 970rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
898{ 971{
899 uint32_t ch = FROM_UNICODE (cs, unicode); 972 uint32_t ch = FROM_UNICODE (cs, unicode);
900 973
901 if (ch == NOCHAR) 974 if (ch == NOCHAR)
902 return false; 975 return false;
903 976
904 /* check wether the character exists in _this_ font. horrible. */ 977 /* check whether the character exists in _this_ font. horrible. */
905 XCharStruct *xcs; 978 XCharStruct *xcs;
906 979
907 if (encm) 980 if (encm)
908 { 981 {
909 unsigned char byte1 = ch >> 8; 982 unsigned char byte1 = ch >> 8;
… …
939 return false; 1012 return false;
940 1013
941 if (!prop || prop->width == rxvt_fontprop::unset) 1014 if (!prop || prop->width == rxvt_fontprop::unset)
942 return true; 1015 return true;
943 1016
944 // check character against base font bounding box 1017 // check whether character overlaps previous/next character
945 int w = xcs->width; 1018 int w = xcs->rbearing - xcs->lbearing;
946 int wcw = wcwidth (unicode); 1019 int wcw = max (WCWIDTH (unicode), 1);
947 if (wcw > 0) w = (w + wcw - 1) / wcw;
948 1020
949 careful = w > prop->width; 1021 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
950 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1022
1023 if (careful && !OVERLAP_OK (w, wcw, prop))
951 return false; 1024 return false;
952 1025
953 return true; 1026 return true;
954} 1027}
955 1028
… …
961 // this looks like a mess /. 1034 // this looks like a mess /.
962 // and it is a mess /. 1035 // and it is a mess /.
963 // yet we are trying to be perfect /. 1036 // yet we are trying to be perfect /.
964 // but the result still isn't perfect /. 1037 // but the result still isn't perfect /.
965 1038
1039 dTermDisplay;
1040 dTermGC;
1041
966 bool slow = this->slow 1042 bool slow = this->slow
967 || width != r->fwidth 1043 || width != term->fwidth
968 || height != r->fheight; 1044 || height != term->fheight;
969 1045
970 int base = ascent; // sorry, incorrect: r->fbase; 1046 int base = ascent; // sorry, incorrect: term->fbase;
971 1047
972 XGCValues v; 1048 XGCValues v;
973 v.foreground = r->pix_colors[fg]; 1049 v.foreground = term->pix_colors[fg];
974 v.font = f->fid; 1050 v.font = f->fid;
975 1051
976 if (enc2b) 1052 if (enc2b)
977 { 1053 {
978 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 1054 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
979 1055
980 if (bg == Color_bg && !slow) 1056 if (bg == Color_bg && !slow)
981 { 1057 {
982 v.background = r->pix_colors[bg]; 1058 v.background = term->pix_colors[bg];
983 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1059 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
984 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 1060 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
985 } 1061 }
986 else 1062 else
987 { 1063 {
988 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1064 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
989 1065
990 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1066 XChangeGC (disp, gc, GCForeground | GCFont, &v);
991 1067
992 if (slow) 1068 if (slow)
993 { 1069 {
994 do 1070 do
995 { 1071 {
996 if (xc->byte1 || xc->byte2) 1072 if (xc->byte1 || xc->byte2)
997 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1073 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
998 1074
999 x += r->fwidth; 1075 x += term->fwidth;
1000 xc++; len--; 1076 xc++; len--;
1001 } 1077 }
1002 while (len); 1078 while (len);
1003 } 1079 }
1004 else 1080 else
1005 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1081 XDrawString16 (disp, d, gc, x, y + base, xc, len);
1006 } 1082 }
1007 } 1083 }
1008 else 1084 else
1009 { 1085 {
1010 const char *xc = enc_char (text, len, cs, slow); 1086 const char *xc = enc_char (text, len, cs, slow);
1011 1087
1012 if (bg == Color_bg && !slow) 1088 if (bg == Color_bg && !slow)
1013 { 1089 {
1014 v.background = r->pix_colors[bg]; 1090 v.background = term->pix_colors[bg];
1015 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1091 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1016 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1092 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1017 } 1093 }
1018 else 1094 else
1019 { 1095 {
1020 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1096 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1021 1097
1022 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1098 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1023 1099
1024 if (slow) 1100 if (slow)
1025 { 1101 {
1026 do 1102 do
1027 { 1103 {
1028 if (*xc) 1104 if (*xc)
1029 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1105 XDrawString (disp, d, gc, x, y + base, xc, 1);
1030 1106
1031 x += r->fwidth; 1107 x += term->fwidth;
1032 xc++; len--; 1108 xc++; len--;
1033 } 1109 }
1034 while (len); 1110 while (len);
1035 } 1111 }
1036 else 1112 else
1037 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1113 XDrawString (disp, d, gc, x, y + base, xc, len);
1038 } 1114 }
1039 } 1115 }
1040} 1116}
1041 1117
1042///////////////////////////////////////////////////////////////////////////// 1118/////////////////////////////////////////////////////////////////////////////
… …
1048 1124
1049 void clear (); 1125 void clear ();
1050 1126
1051 rxvt_fontprop properties (); 1127 rxvt_fontprop properties ();
1052 1128
1053 bool load (const rxvt_fontprop &prop); 1129 bool load (const rxvt_fontprop &prop, bool force_prop);
1054 1130
1055 void draw (rxvt_drawable &d, int x, int y, 1131 void draw (rxvt_drawable &d, int x, int y,
1056 const text_t *text, int len, 1132 const text_t *text, int len,
1057 int fg, int bg); 1133 int fg, int bg);
1058 1134
1059 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1135 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1060 1136
1061protected: 1137protected:
1062 XftFont *f; 1138 XftFont *f;
1063}; 1139};
1064 1140
1065void 1141void
1066rxvt_font_xft::clear () 1142rxvt_font_xft::clear ()
1067{ 1143{
1068 if (f) 1144 if (f)
1069 { 1145 {
1070 XftFontClose (DISPLAY, f); 1146 XftFontClose (term->dpy, f);
1071 f = 0; 1147 f = 0;
1072 } 1148 }
1073} 1149}
1074 1150
1075rxvt_fontprop 1151rxvt_fontprop
… …
1091 1167
1092 return p; 1168 return p;
1093} 1169}
1094 1170
1095bool 1171bool
1096rxvt_font_xft::load (const rxvt_fontprop &prop) 1172rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1097{ 1173{
1098 Display *disp = DISPLAY; 1174 dTermDisplay;
1099 1175
1100 clear (); 1176 clear ();
1101 1177
1102 FcPattern *p = FcNameParse ((FcChar8 *) name); 1178 FcPattern *p = FcNameParse ((FcChar8 *) name);
1103 1179
… …
1110 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1186 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1111 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1187 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1112 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1188 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1113 1189
1114 if (prop.weight != rxvt_fontprop::unset 1190 if (prop.weight != rxvt_fontprop::unset
1115 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1191 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1116 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1192 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1117 1193
1118 if (prop.slant != rxvt_fontprop::unset 1194 if (prop.slant != rxvt_fontprop::unset
1119 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1195 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1120 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1196 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1121 1197
1122#if 0 // clipping unfortunately destroys our precious double-width-characters 1198#if 0 // clipping unfortunately destroys our precious double-width-characters
1123 // clip width, we can't do better, or can we? 1199 // clip width, we can't do better, or can we?
1124 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1200 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1125 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1201 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1126#endif 1202#endif
1127 1203
1128 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1204 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1129 FcPatternAddBool (p, FC_MINSPACE, 1); 1205 FcPatternAddBool (p, FC_MINSPACE, 1);
1130 1206
1131 // store generated name so iso14755 view gives better results 1207 // store generated name so iso14755 view gives better results
1132 set_name ((char *)FcNameUnparse (p)); 1208 set_name ((char *)FcNameUnparse (p));
1133 1209
1134 XftResult result; 1210 XftResult result;
1135 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1211 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1136 1212
1137 FcPatternDestroy (p); 1213 FcPatternDestroy (p);
1138 1214
1139 if (!match) 1215 if (!match)
1140 return false; 1216 return false;
… …
1142 int ftheight = 0; 1218 int ftheight = 0;
1143 bool success = true; 1219 bool success = true;
1144 1220
1145 for (;;) 1221 for (;;)
1146 { 1222 {
1223 p = FcPatternDuplicate (match);
1147 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1224 f = XftFontOpenPattern (disp, p);
1148 1225
1149 if (!f) 1226 if (!f)
1150 { 1227 {
1228 FcPatternDestroy (p);
1151 success = false; 1229 success = false;
1152 break; 1230 break;
1153 } 1231 }
1154 1232
1155 FT_Face face = XftLockFace (f); 1233 FT_Face face = XftLockFace (f);
… …
1163 1241
1164 XftUnlockFace (f); 1242 XftUnlockFace (f);
1165 1243
1166 int glheight = height; 1244 int glheight = height;
1167 1245
1168 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1246 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1169 { 1247 {
1170 FcChar16 ch = *t; 1248 FcChar16 ch = *t;
1171 1249
1172 if (cs != CS_UNICODE 1250 if (cs != CS_UNICODE
1173 && ch > 0x100 1251 && ch > 0x100
… …
1182 XGlyphInfo g; 1260 XGlyphInfo g;
1183 XftTextExtents16 (disp, f, &ch, 1, &g); 1261 XftTextExtents16 (disp, f, &ch, 1, &g);
1184 1262
1185 g.width -= g.x; 1263 g.width -= g.x;
1186 1264
1187 int wcw = wcwidth (ch); 1265 int wcw = WCWIDTH (ch);
1188 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1266 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1189 1267
1190 if (width < g.width ) width = g.width; 1268 if (width < g.width ) width = g.width;
1191 if (height < g.height ) height = g.height; 1269 if (height < g.height ) height = g.height;
1192 if (glheight < g.height - g.y) glheight = g.height - g.y; 1270 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1238 1316
1239 return success; 1317 return success;
1240} 1318}
1241 1319
1242bool 1320bool
1243rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1321rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1244{ 1322{
1245 careful = false; 1323 careful = false;
1246 1324
1247 if (!XftCharExists (DISPLAY, f, unicode)) 1325 if (!XftCharExists (term->dpy, f, unicode))
1248 return false; 1326 return false;
1249 1327
1250 if (!prop || prop->width == rxvt_fontprop::unset) 1328 if (!prop || prop->width == rxvt_fontprop::unset)
1251 return true; 1329 return true;
1252 1330
1253 // check character against base font bounding box 1331 // check character against base font bounding box
1254 FcChar32 ch = unicode; 1332 FcChar32 ch = unicode;
1255 XGlyphInfo g; 1333 XGlyphInfo g;
1256 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1334 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1257 1335
1258 int w = g.width - g.x; 1336 int w = g.width - g.x;
1259 int wcw = wcwidth (unicode); 1337 int wcw = max (WCWIDTH (unicode), 1);
1260 if (wcw > 0) w = (w + wcw - 1) / wcw;
1261 1338
1262 careful = w > prop->width; 1339 careful = g.x > 0 || w > prop->width * wcw;
1263 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1340
1341 if (careful && !OVERLAP_OK (w, wcw, prop))
1342 return false;
1343
1344 // this weeds out _totally_ broken fonts, or glyphs
1345 if (!OVERLAP_OK (g.xOff, wcw, prop))
1264 return false; 1346 return false;
1265 1347
1266 return true; 1348 return true;
1267} 1349}
1268 1350
… …
1270rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1352rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1271 const text_t *text, int len, 1353 const text_t *text, int len,
1272 int fg, int bg) 1354 int fg, int bg)
1273{ 1355{
1274 XGlyphInfo extents; 1356 XGlyphInfo extents;
1275 XftGlyphSpec *enc = (XftGlyphSpec *)get_enc_buf (len * sizeof (XftGlyphSpec)); 1357 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1276 XftGlyphSpec *ep = enc; 1358 XftGlyphSpec *ep = enc;
1277 1359
1278 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1360 dTermDisplay;
1361 dTermGC;
1362
1363 int w = term->fwidth * len;
1364 int h = term->fheight;
1365
1366 bool buffered = bg >= Color_transparent
1367 && term->option (Opt_buffered);
1279 1368
1280 // cut trailing spaces 1369 // cut trailing spaces
1281 while (len && text [len - 1] == ' ') 1370 while (len && text [len - 1] == ' ')
1282 len--; 1371 len--;
1283 1372
1373 int x_ = buffered ? 0 : x;
1374 int y_ = buffered ? 0 : y;
1375
1284 while (len) 1376 while (len)
1285 { 1377 {
1286 int cwidth = r->fwidth; 1378 int cwidth = term->fwidth;
1287 FcChar32 fc = *text++; len--; 1379 FcChar32 fc = *text++; len--;
1288 1380
1289 while (len && *text == NOCHAR) 1381 while (len && *text == NOCHAR)
1290 text++, len--, cwidth += r->fwidth; 1382 text++, len--, cwidth += term->fwidth;
1291 1383
1292 if (fc != ' ') // skip spaces 1384 if (fc != ' ') // skip spaces
1293 { 1385 {
1294 FT_UInt glyph = XftCharIndex (d.display->display, f, fc); 1386 FT_UInt glyph = XftCharIndex (disp, f, fc);
1295 XftGlyphExtents (d.display->display, f, &glyph, 1, &extents); 1387 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1296 1388
1297 ep->glyph = glyph; 1389 ep->glyph = glyph;
1298 ep->x = x + (cwidth - extents.xOff >> 1); 1390 ep->x = x_ + (cwidth - extents.xOff >> 1);
1299 ep->y = y + ascent; 1391 ep->y = y_ + ascent;
1392
1393 if (extents.xOff == 0)
1394 ep->x = x_ + cwidth;
1395
1300 ep++; 1396 ep++;
1301 } 1397 }
1302 1398
1303 x += cwidth; 1399 x_ += cwidth;
1400 }
1401
1402 if (buffered)
1304 } 1403 {
1305
1306 if (ep != enc) 1404 if (ep != enc)
1405 {
1406 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1407
1408#ifdef HAVE_BG_PIXMAP
1409 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1410
1411 if (term->bg_pixmap
1412 && (bg == Color_transparent || bg == Color_bg
1413 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1414 {
1415 int src_x = x, src_y = y;
1416
1417 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1418 {
1419 src_x += term->window_vt_x;
1420 src_y += term->window_vt_y;
1421 }
1422
1423 if (term->bg_pmap_width >= src_x + w
1424 && term->bg_pmap_height >= src_y + h)
1425 {
1426 XCopyArea (disp, term->bg_pixmap, d2, gc,
1427 src_x, src_y, w, h, 0, 0);
1428 }
1429 else
1430 {
1431 XGCValues gcv;
1432
1433 gcv.fill_style = FillTiled;
1434 gcv.tile = term->bg_pixmap;
1435 gcv.ts_x_origin = -src_x;
1436 gcv.ts_y_origin = -src_y;
1437
1438 XChangeGC (disp, gc,
1439 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1440 &gcv);
1441
1442 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1443
1444 gcv.fill_style = FillSolid;
1445 XChangeGC (disp, gc, GCFillStyle, &gcv);
1446 }
1447
1448 if (dst)
1449 {
1450 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1451
1452 // dst can only be set when bg >= 0
1453 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1454 }
1455 }
1456 else
1457#endif
1458 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1459
1460 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1461 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1462 }
1463 else
1464 clear_rect (d, x, y, w, h, bg);
1465 }
1466 else
1467 {
1468 clear_rect (d, x, y, w, h, bg);
1307 XftDrawGlyphSpec (d, &r->pix_colors[fg].c, f, enc, ep - enc); 1469 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1470 }
1308} 1471}
1472
1309#endif 1473#endif
1310 1474
1311///////////////////////////////////////////////////////////////////////////// 1475/////////////////////////////////////////////////////////////////////////////
1312 1476
1313rxvt_fontset::rxvt_fontset (rxvt_t r) 1477rxvt_fontset::rxvt_fontset (rxvt_term *term)
1314: fontdesc (0), r (r) 1478: fontdesc (0), term (term)
1315{ 1479{
1316 clear (); 1480 clear ();
1317} 1481}
1318 1482
1319rxvt_fontset::~rxvt_fontset () 1483rxvt_fontset::~rxvt_fontset ()
… …
1324void 1488void
1325rxvt_fontset::clear () 1489rxvt_fontset::clear ()
1326{ 1490{
1327 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1491 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1328 = rxvt_fontprop::unset; 1492 = rxvt_fontprop::unset;
1493 force_prop = false;
1329 1494
1330 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1495 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1331 FONT_UNREF (*i); 1496 (*i)->unref ();
1332 1497
1333 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1498 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1334 delete *p; 1499 delete *p;
1335 1500
1336 free (fontdesc); fontdesc = 0; 1501 free (fontdesc); fontdesc = 0;
… …
1338 fonts.clear (); 1503 fonts.clear ();
1339 1504
1340 fallback = fallback_fonts; 1505 fallback = fallback_fonts;
1341} 1506}
1342 1507
1508void
1509rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1510{
1511 font->set_term (term);
1512
1513 font->cs = cs;
1514 font->loaded = false;
1515}
1516
1343rxvt_font * 1517rxvt_font *
1344rxvt_fontset::new_font (const char *name, codeset cs) 1518rxvt_fontset::new_font (const char *name, codeset cs)
1345{ 1519{
1346 rxvt_font *f; 1520 rxvt_font *f;
1347 1521
1348 if (!name || !*name) 1522 if (!name || !*name)
1349 { 1523 {
1350 name = ""; 1524 name = "";
1351 f = new rxvt_font_default (this); 1525 f = new rxvt_font_default (this);
1352 } 1526 }
… …
1363 f = new rxvt_font_x11; 1537 f = new rxvt_font_x11;
1364 } 1538 }
1365 else 1539 else
1366 f = new rxvt_font_x11; 1540 f = new rxvt_font_x11;
1367 1541
1368 f->set_term (r);
1369 f->set_name (strdup (name)); 1542 f->set_name (strdup (name));
1370 1543 prepare_font (f, cs);
1371 f->cs = cs;
1372 f->loaded = false;
1373 1544
1374 return f; 1545 return f;
1375} 1546}
1376 1547
1377///////////////////////////////////////////////////////////////////////////// 1548/////////////////////////////////////////////////////////////////////////////
1549
1550void
1551rxvt_fontset::push_font (rxvt_font *font)
1552{
1553 // the fontCount index is reserved for the overflow font, it is only
1554 // necessary when we get fontCount or more fonts, as they cannot be
1555 // represented in the rendition.
1556 if (fonts.size () == fontCount)
1557 {
1558 rxvt_font *f = new rxvt_font_overflow (this);
1559
1560 prepare_font (f, CS_UNICODE);
1561 fonts.push_back (f);
1562 }
1563
1564 fonts.push_back (font);
1565}
1378 1566
1379void 1567void
1380rxvt_fontset::add_fonts (const char *desc) 1568rxvt_fontset::add_fonts (const char *desc)
1381{ 1569{
1382 if (desc) 1570 if (desc)
… …
1420 if (!end) 1608 if (!end)
1421 end = desc + strlen (desc); 1609 end = desc + strlen (desc);
1422 1610
1423 if (end - desc < 511) 1611 if (end - desc < 511)
1424 { 1612 {
1425 strncpy (buf, desc, end - desc); 1613 memcpy (buf, desc, end - desc);
1426 buf[end - desc] = 0; 1614 buf[end - desc] = 0;
1427 1615
1428 fonts.push_back (new_font (buf, cs)); 1616 push_font (new_font (buf, cs));
1429 } 1617 }
1430 else 1618 else
1431 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1619 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1432 1620
1433 desc = end + 1; 1621 desc = end + 1;
1434 } 1622 }
1435 while (*end); 1623 while (*end);
1436 } 1624 }
… …
1445 if (fonts[i]->loaded) 1633 if (fonts[i]->loaded)
1446 return true; 1634 return true;
1447 1635
1448 fonts[i]->loaded = true; 1636 fonts[i]->loaded = true;
1449 1637
1450 if (!fonts[i]->load (prop)) 1638 if (!fonts[i]->load (prop, force_prop))
1451 { 1639 {
1452 fonts[i]->cs = CS_UNKNOWN; 1640 fonts[i]->cs = CS_UNKNOWN;
1453 return false; 1641 return false;
1454 } 1642 }
1455 1643
… …
1461{ 1649{
1462 clear (); 1650 clear ();
1463 1651
1464 fontdesc = strdup (desc); 1652 fontdesc = strdup (desc);
1465 1653
1466 fonts.push_back (new_font (0, CS_UNICODE)); 1654 push_font (new_font (0, CS_UNICODE));
1467 realize_font (0); 1655 realize_font (0);
1468 1656
1469 add_fonts (desc); 1657 add_fonts (desc);
1470 1658
1471 return true; 1659 return true;
… …
1480 1668
1481 return -1; 1669 return -1;
1482} 1670}
1483 1671
1484int 1672int
1485rxvt_fontset::find_font (unicode_t unicode) 1673rxvt_fontset::find_font_idx (unicode_t unicode)
1486{ 1674{
1487 if (unicode >= 1<<20) 1675 if (unicode >= 1<<20)
1488 return 0; 1676 return 0;
1489 1677
1490 unicode_t hi = unicode >> 8; 1678 unicode_t hi = unicode >> 8;
… …
1516 goto next_font; 1704 goto next_font;
1517 1705
1518 bool careful; 1706 bool careful;
1519 if (f->has_char (unicode, &prop, careful)) 1707 if (f->has_char (unicode, &prop, careful))
1520 { 1708 {
1521 if (careful) 1709 i = (i << 1) | careful;
1522 i |= 128;
1523 1710
1524 goto found; 1711 goto found;
1525 } 1712 }
1526 1713
1527 next_font: 1714 next_font:
1528 if (i == fonts.size () - 1) 1715 if (i == fonts.size () - 1)
1529 { 1716 {
1530 if (fallback->name) 1717 if (fallback->name)
1531 { 1718 {
1532 // search through the fallback list 1719 // search through the fallback list
1533 fonts.push_back (new_font (fallback->name, fallback->cs)); 1720 push_font (new_font (fallback->name, fallback->cs));
1534 fallback++; 1721 fallback++;
1535 } 1722 }
1536 else 1723 else
1537 { 1724 {
1538 // try to find a new font. 1725 // try to find a new font.
… …
1556 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1743 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1557 FcPatternAddBool (p, FC_MINSPACE, 1); 1744 FcPatternAddBool (p, FC_MINSPACE, 1);
1558 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1745 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1559 1746
1560 XftResult result; 1747 XftResult result;
1561 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1748 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1562 1749
1563 FcPatternDestroy (p); 1750 FcPatternDestroy (p);
1564 1751
1565 if (match) 1752 if (match)
1566 { 1753 {
… …
1569 FcPatternDestroy (match); 1756 FcPatternDestroy (match);
1570 1757
1571 if (find_font (font) < 0) 1758 if (find_font (font) < 0)
1572 { 1759 {
1573 char fontname[4096]; 1760 char fontname[4096];
1574 sprintf (fontname, "xft:%-.4090s", font); 1761 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1575 1762
1576 fonts.push_back (new_font (fontname, CS_UNICODE)); 1763 push_font (new_font (fontname, CS_UNICODE));
1577 } 1764 }
1578 1765
1579 free (font); 1766 free (font);
1580 } 1767 }
1581#endif 1768#endif
… …
1603 } 1790 }
1604 1791
1605 return i; 1792 return i;
1606} 1793}
1607 1794
1608
1609

Diff Legend

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