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.78 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.191 by sf-exg, Sun Jun 10 13:07:56 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
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 137 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
131 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
132 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
133 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
134 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
135#if XFT 138#if XFT
136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
138 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
139 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 142 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
140 143
141 // FreeMono is usually uglier than x fonts, so try last only. 144 // FreeMono is usually uglier than x fonts, so try after the others
142 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 145 { CS_UNICODE, "xft:FreeMono:autohint=true" },
143#endif 146#endif
144 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" },
145 { CS_UNKNOWN, 0 } 152 { CS_UNKNOWN, 0 }
146}; 153};
147 154
148// these characters are used to guess the font height and width 155// these characters are used to guess the font height and width
149// 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.
… …
151 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 158 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
152 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 159 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
153 0x304c, 0x672c, // が本 160 0x304c, 0x672c, // が本
154}; 161};
155 162
156#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 163#define dTermDisplay Display *disp = term->dpy
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) 232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
252{ 233{
253 if (color == Color_bg) 234 dTermDisplay;
254 XClearArea (d.display->display, d, x, y, w, h, FALSE); 235 dTermGC;
236
237 if (color == Color_bg || color == Color_transparent)
238 XClearArea (disp, d, x, y, w, h, false);
255 else if (color >= 0) 239 else if (color >= 0)
256 { 240 {
257#if XFT 241#if XFT
242 Picture dst;
243
244# ifdef HAVE_BG_PIXMAP
245 if (term->bg_img
246 && !term->pix_colors[color].is_opaque ()
247 && ((dst = XftDrawPicture (d))))
248 {
249 XClearArea (disp, d, x, y, w, h, false);
250
251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
252 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
253 }
254 else
255# endif
258 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
257
259#else 258#else
260 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
261 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
262#endif 261#endif
263 } 262 }
264} 263}
265 264
266#include "table/linedraw.h" 265/////////////////////////////////////////////////////////////////////////////
267 266
268struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font {
269 struct rxvt_fontset *fs; 268 struct rxvt_fontset *fs;
270 269
271 rxvt_font_default (rxvt_fontset *fs) 270 rxvt_font_default (rxvt_fontset *fs)
… …
284 p.slant = rxvt_fontprop::roman; 283 p.slant = rxvt_fontprop::roman;
285 284
286 return p; 285 return p;
287 } 286 }
288 287
289 bool load (const rxvt_fontprop &prop) 288 bool load (const rxvt_fontprop &prop, bool force_prop)
290 { 289 {
291 width = 1; height = 1; 290 width = 1; height = 1;
292 ascent = 1; descent = 0; 291 ascent = 1; descent = 0;
293 292
294 set_name (strdup ("built-in support font")); 293 set_name (strdup ("built-in support font"));
295 294
296 return true; 295 return true;
297 } 296 }
298 297
299 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 298 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
300 { 299 {
301 careful = false; 300 careful = false;
302 301
303 if (unicode <= 0x001f) 302 if (unicode <= 0x001f)
304 return true; 303 return true;
… …
307 return false; 306 return false;
308 307
309 if (unicode <= 0x009f) 308 if (unicode <= 0x009f)
310 return true; 309 return true;
311 310
311#ifdef BUILTIN_GLYPHS
312 if (unicode >= 0x2500 && unicode <= 0x259f && 312 if (unicode >= 0x2500 && unicode <= 0x259f &&
313 ! OPTION_R (Opt_skipBuiltinGlyphs)) 313 !term->option (Opt_skipBuiltinGlyphs))
314 return true; 314 return true;
315#endif
315 316
316 if (IS_COMPOSE (unicode)) 317 if (IS_COMPOSE (unicode))
317 return true; 318 return true;
318 319
319 switch (unicode) 320 switch (unicode)
… …
334void 335void
335rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 336rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
336 const text_t *text, int len, 337 const text_t *text, int len,
337 int fg, int bg) 338 int fg, int bg)
338{ 339{
339 Display *disp = d.display->display; 340 dTermDisplay;
341 dTermGC;
340 342
341 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 343 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
342 344
343 XSetForeground (disp, TGC, r->pix_colors[fg]); 345 XSetForeground (disp, gc, term->pix_colors[fg]);
344 346
345 while (len) 347 while (len)
346 { 348 {
347#if ENABLE_COMBINING 349#if ENABLE_COMBINING
348 compose_char *cc; 350 compose_char *cc;
… …
352 354
353 while (++text, --len && *text == NOCHAR) 355 while (++text, --len && *text == NOCHAR)
354 ; 356 ;
355 357
356 int width = text - tp; 358 int width = text - tp;
357 int fwidth = r->fwidth * width; 359 int fwidth = term->fwidth * width;
358 360
361#ifdef BUILTIN_GLYPHS
359 if (0x2500 <= t && t <= 0x259f && 362 if (0x2500 <= t && t <= 0x259f)
360 ! OPTION_R (Opt_skipBuiltinGlyphs))
361 { 363 {
364# include "table/linedraw.h"
362 uint16_t offs = linedraw_offs[t - 0x2500]; 365 uint16_t offs = linedraw_offs[t - 0x2500];
363 uint32_t *a = linedraw_command + (offs >> 4); 366 uint32_t *a = linedraw_command + (offs >> 4);
364 uint32_t *b = a + (offs & 15); 367 uint32_t *b = a + (offs & 15);
365 368
366 int W = fwidth; 369 int W = fwidth;
367 int H = r->fheight; 370 int H = term->fheight;
368 371
369 int x_[16]; 372 int x_[16];
370 int y_[16]; 373 int y_[16];
371 374
372 for (int i = 0; i <= 8; i++) 375 for (int i = 0; i <= 8; i++)
… …
380 383
381 XGCValues gcv; 384 XGCValues gcv;
382 385
383 gcv.cap_style = CapButt; 386 gcv.cap_style = CapButt;
384 gcv.line_width = 0; 387 gcv.line_width = 0;
385 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 388 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
386 389
387 while (a < b) 390 while (a < b)
388 { 391 {
389 uint32_t command = *a++; 392 uint32_t command = *a++;
390 393
… …
397 int y2 = y_[(command >> 0) & 15]; 400 int y2 = y_[(command >> 0) & 15];
398 401
399 switch (op) 402 switch (op)
400 { 403 {
401 case 0: // line 404 case 0: // line
402 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 405 XDrawLine (disp, d, gc, x1, y1, x2, y2);
403 break; 406 break;
404 407
405 case 1: // rectangle, possibly stippled 408 case 1: // rectangle, possibly stippled
406 if (a) 409 if (a)
407 { 410 {
408 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 411 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
409 412
410 gcv.fill_style = FillStippled; 413 gcv.fill_style = FillStippled;
411 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 414 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
412 gcv.ts_x_origin = x; 415 gcv.ts_x_origin = x;
413 gcv.ts_y_origin = y; 416 gcv.ts_y_origin = y;
414 417
415 XChangeGC (disp, TGC, 418 XChangeGC (disp, gc,
416 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 419 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
417 &gcv); 420 &gcv);
418 } 421 }
419 422
420 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 423 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
421 424
422 if (a) 425 if (a)
423 { 426 {
424 XFreePixmap (disp, gcv.stipple); 427 XFreePixmap (disp, gcv.stipple);
425 gcv.stipple = 0; 428 gcv.stipple = 0;
426 gcv.fill_style = FillSolid; 429 gcv.fill_style = FillSolid;
427 XChangeGC (disp, TGC, GCFillStyle, &gcv); 430 XChangeGC (disp, gc, GCFillStyle, &gcv);
428 } 431 }
429 break; 432 break;
430 case 2: // arc 433 case 2: // arc
431 XDrawArc (disp, d, TGC, 434 XDrawArc (disp, d, gc,
432 x1 - W/2, y1 - H/2, W-1, H-1, 435 x1 - W/2, y1 - H/2, W-1, H-1,
433 (a - 1) * 90*64, (b - 1) * 90*64); 436 (a - 1) * 90*64, (b - 1) * 90*64);
434 break; 437 break;
435 } 438 }
436 } 439 }
437 } 440 }
441#else
442 if (0)
443 ;
444#endif
438#if ENABLE_COMBINING 445#if ENABLE_COMBINING
439 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 446 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
440 { 447 {
448 min_it (width, 2); // we only support wcwidth up to 2
449
441 text_t chrs[2]; 450 text_t chrs[2];
442 width = min (2, width);
443 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
444 452
445 *chrs = cc->c1; 453 *chrs = cc->c1;
446 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
447 f1->draw (d, x, y, chrs, width, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
448 456
449 if (cc->c2 != NOCHAR) 457 if (cc->c2 != NOCHAR)
450 { 458 {
451 bool careful; 459 bool careful;
452 460
453 // prefer font of first character, for no good reasons 461 // prefer font of first character, for no good reasons
454 *chrs = cc->c2; 462 *chrs = cc->c2;
455 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
456 ? f1 464 ? f1
457 : (*fs)[fs->find_font (cc->c2)]; 465 : (*fs)[fs->find_font_idx (cc->c2)];
458 466
459 f2->draw (d, x, y, chrs, width, fg, -1); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
460 } 468 }
461 } 469 }
462#endif 470#endif
463 else 471 else
464 switch (t) 472 switch (t)
… …
467 case ZERO_WIDTH_CHAR: 475 case ZERO_WIDTH_CHAR:
468 case NOCHAR: 476 case NOCHAR:
469 break; 477 break;
470 478
471 default: 479 default:
472 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 480 XDrawRectangle (disp, d, gc, x + 2, y + 2,
473 fwidth - 4, r->fheight - 4); 481 fwidth - 4, term->fheight - 4);
474 } 482 }
475 483
476 x += fwidth; 484 x += fwidth;
477 } 485 }
478} 486}
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};
479 541
480///////////////////////////////////////////////////////////////////////////// 542/////////////////////////////////////////////////////////////////////////////
481 543
482struct rxvt_font_x11 : rxvt_font { 544struct rxvt_font_x11 : rxvt_font {
483 rxvt_font_x11 () { f = 0; } 545 rxvt_font_x11 () { f = 0; }
484 546
485 void clear (); 547 void clear ();
486 548
487 rxvt_fontprop properties (); 549 rxvt_fontprop properties ();
488 550
489 bool load (const rxvt_fontprop &prop); 551 bool load (const rxvt_fontprop &prop, bool force_prop);
490 552
491 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 553 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
492 554
493 void draw (rxvt_drawable &d, int x, int y, 555 void draw (rxvt_drawable &d, int x, int y,
494 const text_t *text, int len, 556 const text_t *text, int len,
495 int fg, int bg); 557 int fg, int bg);
496 558
497 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
498 XFontStruct *f; 560 XFontStruct *f;
499 codeset cs;
500 bool enc2b, encm; 561 bool enc2b, encm;
501 562
502 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 563 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
503 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);
504 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 565 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
505 bool set_properties (rxvt_fontprop &p, const char *name); 566 bool set_properties (rxvt_fontprop &p, const char *name);
506}; 567};
507 568
508char * 569char *
509rxvt_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
510{ 571{
511 unsigned long value; 572 unsigned long value;
512 573
513 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 574 if (XGetFontProperty (f, property, &value))
514 return XGetAtomName (DISPLAY, value); 575 return XGetAtomName (term->dpy, value);
515 else 576 else
516 return rxvt_strdup (repl); 577 return repl ? strdup (repl) : 0;
517} 578}
518 579
519rxvt_fontprop 580rxvt_fontprop
520rxvt_font_x11::properties () 581rxvt_font_x11::properties ()
521{ 582{
… …
525} 586}
526 587
527bool 588bool
528rxvt_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)
529{ 590{
530 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;
531 p.height = height; 594 p.height = height;
532 p.ascent = rxvt_fontprop::unset; 595 p.ascent = rxvt_fontprop::unset;
533 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;
534 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;
535 598
… …
540rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 603rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
541{ 604{
542 unsigned long height; 605 unsigned long height;
543 606
544#if 0 607#if 0
545 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 608 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
546 return false; 609 return false;
547#else 610#else
548 height = f->ascent + f->descent; 611 height = f->ascent + f->descent;
549#endif 612#endif
550 613
551 unsigned long avgwidth; 614 unsigned long avgwidth;
552 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 615 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
553 avgwidth = 0; 616 avgwidth = 0;
554 617
555 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 618 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
556 char *slant = get_property (f, "SLANT", "r"); 619 char *slant = get_property (f, term->xa [XA_SLANT], "r");
557 620
558 set_properties (p, height, weight, slant, avgwidth); 621 set_properties (p, height, weight, slant, avgwidth);
559 622
560 free (weight); 623 free (weight);
561 free (slant); 624 free (slant);
… …
566} 629}
567 630
568bool 631bool
569rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 632rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
570{ 633{
634 dTermDisplay;
571 int slashes = 0; 635 int slashes = 0;
572 const char *comp[13]; 636 const char *comp[13];
573 637
574 for (const char *c = name; *c; c++) 638 for (const char *c = name; *c; c++)
575 if (*c == '-') 639 if (*c == '-')
… …
583 if (slashes >= 13 647 if (slashes >= 13
584 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 648 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
585 && (*comp[11] >= '0' && *comp[11] <= '9')) 649 && (*comp[11] >= '0' && *comp[11] <= '9'))
586 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 650 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
587 651
588 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 652 XFontStruct *f = XLoadQueryFont (disp, name);
589 653
590 if (f) 654 if (f)
591 { 655 {
592 // the font should really exist now. if not, we have a problem 656 // the font should really exist now. if not, we have a problem
593 // (e.g. if the user did xset fp rehash just when we were searching fonts). 657 // (e.g. if the user did xset fp rehash just when we were searching fonts).
594 // in that case, just return garbage. 658 // in that case, just return garbage.
595 bool ret = set_properties (p, f); 659 bool ret = set_properties (p, f);
596 XFreeFont (DISPLAY, f); 660 XFreeFont (disp, f);
597 return ret; 661 return ret;
598 } 662 }
599 else 663 else
600 return false; 664 return false;
601} 665}
602 666
603// fix the size of scalable fonts 667// fix the size of scalable fonts
604static bool 668static bool
605replace_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)
606{ 670{
607 int slashes = 0; 671 int slashes = 0;
608 const char *field, *end; 672 const char *field, *end;
609 673
610 for (const char *c = name; *c; c++) 674 for (const char *c = name; *c; c++)
… …
620 break; 684 break;
621 } 685 }
622 686
623 if (slashes >= 13 && (!old || *field == old)) 687 if (slashes >= 13 && (!old || *field == old))
624 { 688 {
625 // TODO: check for overflow in font-name 689 size_t len = field - name;
626 strncpy (buf, name, field - name); 690 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
627 buf += field - name; 691 memcpy (*ptr, name, len);
628 strcpy (buf, replace); 692 strcpy (*ptr + len, replace);
629 strcat (buf, end); 693 strcat (*ptr, end);
630 694
631 return true; 695 return true;
632 } 696 }
633 else 697 else
634 { 698 {
635 strcpy (buf, name); 699 *ptr = strdup (name);
636 700
637 return false; 701 return false;
638 } 702 }
639} 703}
640 704
641bool 705bool
642rxvt_font_x11::load (const rxvt_fontprop &prop) 706rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
643{ 707{
644 Display *disp = DISPLAY; 708 dTermDisplay;
645 709
646 clear (); 710 clear ();
647 711
648 char field_str[64]; // enough for 128 bits 712 char field_str[64]; // enough for 128 bits
649 713
650 // first morph the font if required 714 // first morph the font if required
651 if (prop.weight != rxvt_fontprop::unset 715 if (force_prop)
652 || prop.slant != rxvt_fontprop::unset)
653 { 716 {
654 char fname[1024]; 717 char *fname;
655 718
656 if (name[0] != '-') 719 if (name[0] != '-')
657 { 720 {
658 f = XLoadQueryFont (disp, name); 721 f = XLoadQueryFont (disp, name);
659 722
660 if (!f) 723 if (!f)
661 return false; 724 return false;
662 725
663 char *new_name = get_property (f, "FONT", name); 726 char *new_name = get_property (f, XA_FONT, 0);
664 727
665 if (new_name) 728 if (new_name)
666 set_name (new_name); 729 set_name (new_name);
667 else 730 else
668 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 731 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
669 732
670 XFreeFont (disp, f); 733 XFreeFont (disp, f);
671 f = 0; 734 f = 0;
672 } 735 }
673 736
674 if (prop.weight != rxvt_fontprop::unset) 737 if (prop.weight != rxvt_fontprop::unset)
675 { 738 {
676 replace_field (fname, name, 2, 0, 739 replace_field (&fname, name, 2, 0,
677 prop.weight < rxvt_fontprop::bold 740 prop.weight < rxvt_fontprop::bold
678 ? "medium" : "bold"); 741 ? "medium" : "bold");
679 set_name (strdup (fname)); 742 set_name (fname);
680 } 743 }
681 744
682 if (prop.slant != rxvt_fontprop::unset) 745 if (prop.slant != rxvt_fontprop::unset)
683 { 746 {
684 replace_field (fname, name, 3, 0, 747 replace_field (&fname, name, 3, 0,
685 prop.slant < rxvt_fontprop::italic 748 prop.slant < rxvt_fontprop::italic
686 ? "r" : "i"); // TODO: handle "o"blique, too 749 ? "r" : "i"); // TODO: handle "o"blique, too
687 set_name (strdup (fname)); 750 set_name (fname);
688 } 751 }
689 } 752 }
690 753
691 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 754 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
692 ? 0 : prop.height); 755 ? 0 : prop.height);
… …
717 font_weight *fonts = new font_weight[count]; 780 font_weight *fonts = new font_weight[count];
718 781
719 for (int i = 0; i < count; i++) 782 for (int i = 0; i < count; i++)
720 { 783 {
721 rxvt_fontprop p; 784 rxvt_fontprop p;
722 char fname[1024]; 785 char *fname;
723 786
724 int diff = 0; 787 int diff = 0;
725 788
726 if (replace_field (fname, list[i], 6, '0', field_str)) 789 if (replace_field (&fname, list[i], 6, '0', field_str))
727 diff += 10; // slightly penalize scalable fonts 790 diff += 10; // slightly penalize scalable fonts
791 else
792 {
793 free (fname);
728 else if (replace_field (fname, list[i], 11, '0', "0")) 794 if (replace_field (&fname, list[i], 11, '0', "0"))
729 diff += 300; // more heavily penalize what looks like scaled bitmap fotns 795 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
796 }
730 797
731 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);
732 continue; 804 continue;
733 805 }
734 if (prop.height != rxvt_fontprop::unset
735 && p.height > prop.height) // weed out too large fonts
736 continue;
737 806
738 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;
739 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);
740 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);
741 //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);
742 811
743 fonts[i].name = strdup (fname); 812 fonts[i].name = fname;
744 fonts[i].diff = diff; 813 fonts[i].diff = diff;
745 } 814 }
746 815
747 XFreeFontNames (list); 816 XFreeFontNames (list);
748 817
749 // 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
750 for (;;) 819 for (;;)
751 { 820 {
752 font_weight *best = fonts + count - 1; 821 font_weight *best = fonts;
753 822
754 for (font_weight *w = best; w-- > fonts; ) 823 for (font_weight *w = fonts + 1; w < fonts + count; w++)
755 if (w->diff <= best->diff) 824 if (w->diff < best->diff)
756 best = w; 825 best = w;
757 826
758 if (!best->name 827 if (!best->name
759 || !(f = XLoadQueryFont (disp, best->name))) 828 || !(f = XLoadQueryFont (disp, best->name)))
760 break; 829 break;
… …
777 delete [] fonts; 846 delete [] fonts;
778 847
779 if (!f) 848 if (!f)
780 return false; 849 return false;
781 850
782 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 851 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
783 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;
784 855
785 if (registry && encoding) 856 if (registry && encoding)
786 { 857 {
787 char charset[64]; 858 char charset[64];
788 snprintf (charset, 64, "%s-%s", registry, encoding); 859 snprintf (charset, 64, "%s-%s", registry, encoding);
789 860
790 cs = codeset_from_name (charset); 861 cs = codeset_from_name (charset);
791 } 862
792 else 863 if (cs == CS_UNKNOWN)
864 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
793 { 865 }
866
867 free (registry);
868 free (encoding);
869
870 if (cs == CS_UNKNOWN)
871 {
794 const char *charset = get_property (f, "FONT", 0); 872 char *value = get_property (f, XA_FONT, 0);
873 const char *charset = value;
795 874
796 if (!charset) 875 if (!charset)
797 charset = name; 876 charset = name;
798 877
799 int count = 13; 878 int count = 13;
800 while (*charset) 879 while (*charset)
801 if (*charset++ == '-' && !--count) 880 if (*charset++ == '-' && !--count)
802 break; 881 break;
803 882
804 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)
805 } 891 {
806 892 clear ();
807 free (registry); 893 return false;
808 free (encoding); 894 }
809 895
810 if (cs == CS_UNICODE) 896 if (cs == CS_UNICODE)
811 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
812 898
813 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 899 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
814 enc2b = encm || f->max_char_or_byte2 > 255; 900 enc2b = encm || f->max_char_or_byte2 > 255;
815 901
816 slow = false; 902 slow = false;
817 903
818#if 1 // only used for slow detection, TODO optimize 904#if 1 // only used for slow detection, TODO optimize
819 if (f->min_bounds.width == f->max_bounds.width) 905 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
820 width = f->min_bounds.width;
821 else if (f->per_char == NULL)
822 width = f->max_bounds.width; 906 width = f->max_bounds.width;
823 else 907 else
824 { 908 {
825 slow = true; 909 slow = true;
826 910
827 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;
828 912
829 if (encm) 913 if (encm)
830 N += (f->max_byte1 - f->min_byte1) 914 N += (f->max_byte1 - f->min_byte1)
831 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 915 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
832 916
833 while (N) 917 while (N)
834 { 918 {
835 if (f->per_char[N].width > width) 919 if (f->per_char[N].width > width)
836 width = f->per_char[N].width; 920 width = f->per_char[N].width;
837 921
… …
840 } 924 }
841#endif 925#endif
842 926
843 width = 1; 927 width = 1;
844 928
845 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++)
846 { 930 {
847 if (cs != CS_UNICODE
848 && *t > 0x100
849 && FROM_UNICODE (cs, *t) == NOCHAR) 931 if (FROM_UNICODE (cs, *t) == NOCHAR)
850 continue; 932 continue;
851 933
852 // ignore characters we wouldn't use anyways 934 // ignore characters we wouldn't use anyways
853 bool careful; 935 bool careful;
854 if (!has_char (*t, &prop, careful)) 936 if (!has_char (*t, &prop, careful))
… …
858 940
859 XCharStruct g; 941 XCharStruct g;
860 int dir_ret, asc_ret, des_ret; 942 int dir_ret, asc_ret, des_ret;
861 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 943 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
862 944
945 int wcw = WCWIDTH (*t);
863 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;
864 947
865 if (width < g.width) width = g.width; 948 if (width < g.width) width = g.width;
866 }
867
868 if (cs == CS_UNKNOWN)
869 { 949 }
870 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
871 950
951#if 0 // do it per-character
952 if (prop && width > prop->width)
953 {
872 clear (); 954 clear ();
873 return false; 955 return false;
874 } 956 }
875
876#if 0 // do it per-character
877 if (prop && width > prop->width)
878 {
879 clear ();
880 return false;
881 }
882#endif 957#endif
883 958
884 return true; 959 return true;
885} 960}
886 961
887void 962void
888rxvt_font_x11::clear () 963rxvt_font_x11::clear ()
889{ 964{
890 if (f) 965 if (f)
891 { 966 {
892 XFreeFont (DISPLAY, f); 967 XFreeFont (term->dpy, f);
893 f = 0; 968 f = 0;
894 } 969 }
895} 970}
896 971
897bool 972bool
898rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 973rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
899{ 974{
975 careful = false;
976
900 uint32_t ch = FROM_UNICODE (cs, unicode); 977 uint32_t ch = FROM_UNICODE (cs, unicode);
901 978
902 if (ch == NOCHAR) 979 if (ch == NOCHAR)
903 return false; 980 return false;
904 981
905 /* check wether the character exists in _this_ font. horrible. */ 982 /* check whether the character exists in _this_ font. horrible. */
906 XCharStruct *xcs; 983 XCharStruct *xcs;
907 984
908 if (encm) 985 if (encm)
909 { 986 {
910 unsigned char byte1 = ch >> 8; 987 unsigned char byte1 = ch >> 8;
… …
940 return false; 1017 return false;
941 1018
942 if (!prop || prop->width == rxvt_fontprop::unset) 1019 if (!prop || prop->width == rxvt_fontprop::unset)
943 return true; 1020 return true;
944 1021
945 // check character against base font bounding box 1022 // check whether character overlaps previous/next character
946 int w = xcs->width; 1023 int w = xcs->rbearing - xcs->lbearing;
947 int wcw = wcwidth (unicode); 1024 int wcw = max (WCWIDTH (unicode), 1);
948 if (wcw > 0) w = (w + wcw - 1) / wcw;
949 1025
950 careful = w > prop->width; 1026 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
951 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1027
1028 if (careful && !OVERLAP_OK (w, wcw, prop))
952 return false; 1029 return false;
953 1030
954 return true; 1031 return true;
955} 1032}
956 1033
… …
962 // this looks like a mess /. 1039 // this looks like a mess /.
963 // and it is a mess /. 1040 // and it is a mess /.
964 // yet we are trying to be perfect /. 1041 // yet we are trying to be perfect /.
965 // but the result still isn't perfect /. 1042 // but the result still isn't perfect /.
966 1043
1044 dTermDisplay;
1045 dTermGC;
1046
967 bool slow = this->slow 1047 bool slow = this->slow
968 || width != r->fwidth 1048 || width != term->fwidth
969 || height != r->fheight; 1049 || height != term->fheight;
970 1050
971 int base = ascent; // sorry, incorrect: r->fbase; 1051 int base = ascent; // sorry, incorrect: term->fbase;
972 1052
973 XGCValues v; 1053 XGCValues v;
974 v.foreground = r->pix_colors[fg]; 1054 v.foreground = term->pix_colors[fg];
975 v.font = f->fid; 1055 v.font = f->fid;
976 1056
977 if (enc2b) 1057 if (enc2b)
978 { 1058 {
979 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 1059 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
980 1060
981 if (bg == Color_bg && !slow) 1061 if (bg == Color_bg && !slow)
982 { 1062 {
983 v.background = r->pix_colors[bg]; 1063 v.background = term->pix_colors[bg];
984 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1064 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
985 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 1065 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
986 } 1066 }
987 else 1067 else
988 { 1068 {
989 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1069 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
990 1070
991 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1071 XChangeGC (disp, gc, GCForeground | GCFont, &v);
992 1072
993 if (slow) 1073 if (slow)
994 { 1074 {
995 do 1075 do
996 { 1076 {
997 if (xc->byte1 || xc->byte2) 1077 if (xc->byte1 || xc->byte2)
998 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1078 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
999 1079
1000 x += r->fwidth; 1080 x += term->fwidth;
1001 xc++; len--; 1081 xc++; len--;
1002 } 1082 }
1003 while (len); 1083 while (len);
1004 } 1084 }
1005 else 1085 else
1006 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1086 XDrawString16 (disp, d, gc, x, y + base, xc, len);
1007 } 1087 }
1008 } 1088 }
1009 else 1089 else
1010 { 1090 {
1011 const char *xc = enc_char (text, len, cs, slow); 1091 const char *xc = enc_char (text, len, cs, slow);
1012 1092
1013 if (bg == Color_bg && !slow) 1093 if (bg == Color_bg && !slow)
1014 { 1094 {
1015 v.background = r->pix_colors[bg]; 1095 v.background = term->pix_colors[bg];
1016 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1096 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1017 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1097 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1018 } 1098 }
1019 else 1099 else
1020 { 1100 {
1021 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1101 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1022 1102
1023 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1103 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1024 1104
1025 if (slow) 1105 if (slow)
1026 { 1106 {
1027 do 1107 do
1028 { 1108 {
1029 if (*xc) 1109 if (*xc)
1030 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1110 XDrawString (disp, d, gc, x, y + base, xc, 1);
1031 1111
1032 x += r->fwidth; 1112 x += term->fwidth;
1033 xc++; len--; 1113 xc++; len--;
1034 } 1114 }
1035 while (len); 1115 while (len);
1036 } 1116 }
1037 else 1117 else
1038 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1118 XDrawString (disp, d, gc, x, y + base, xc, len);
1039 } 1119 }
1040 } 1120 }
1041} 1121}
1042 1122
1043///////////////////////////////////////////////////////////////////////////// 1123/////////////////////////////////////////////////////////////////////////////
… …
1049 1129
1050 void clear (); 1130 void clear ();
1051 1131
1052 rxvt_fontprop properties (); 1132 rxvt_fontprop properties ();
1053 1133
1054 bool load (const rxvt_fontprop &prop); 1134 bool load (const rxvt_fontprop &prop, bool force_prop);
1055 1135
1056 void draw (rxvt_drawable &d, int x, int y, 1136 void draw (rxvt_drawable &d, int x, int y,
1057 const text_t *text, int len, 1137 const text_t *text, int len,
1058 int fg, int bg); 1138 int fg, int bg);
1059 1139
1060 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1140 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1061 1141
1062protected: 1142protected:
1063 XftFont *f; 1143 XftFont *f;
1064}; 1144};
1065 1145
1066void 1146void
1067rxvt_font_xft::clear () 1147rxvt_font_xft::clear ()
1068{ 1148{
1069 if (f) 1149 if (f)
1070 { 1150 {
1071 XftFontClose (DISPLAY, f); 1151 XftFontClose (term->dpy, f);
1072 f = 0; 1152 f = 0;
1073 } 1153 }
1074} 1154}
1075 1155
1076rxvt_fontprop 1156rxvt_fontprop
… …
1092 1172
1093 return p; 1173 return p;
1094} 1174}
1095 1175
1096bool 1176bool
1097rxvt_font_xft::load (const rxvt_fontprop &prop) 1177rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1098{ 1178{
1099 Display *disp = DISPLAY; 1179 dTermDisplay;
1100 1180
1101 clear (); 1181 clear ();
1102 1182
1103 FcPattern *p = FcNameParse ((FcChar8 *) name); 1183 FcPattern *p = FcNameParse ((FcChar8 *) name);
1104 1184
… …
1111 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1191 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1112 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1192 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1113 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1193 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1114 1194
1115 if (prop.weight != rxvt_fontprop::unset 1195 if (prop.weight != rxvt_fontprop::unset
1116 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1196 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1117 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1197 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1118 1198
1119 if (prop.slant != rxvt_fontprop::unset 1199 if (prop.slant != rxvt_fontprop::unset
1120 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1200 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1121 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1201 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1122 1202
1123#if 0 // clipping unfortunately destroys our precious double-width-characters 1203#if 0 // clipping unfortunately destroys our precious double-width-characters
1124 // clip width, we can't do better, or can we? 1204 // clip width, we can't do better, or can we?
1125 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1205 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1126 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1206 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1127#endif 1207#endif
1128 1208
1129 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1209 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1130 FcPatternAddBool (p, FC_MINSPACE, 1); 1210 FcPatternAddBool (p, FC_MINSPACE, 1);
1131 1211
1132 // store generated name so iso14755 view gives better results 1212 // store generated name so iso14755 view gives better results
1133 set_name ((char *)FcNameUnparse (p)); 1213 set_name ((char *)FcNameUnparse (p));
1134 1214
1135 XftResult result; 1215 XftResult result;
1136 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1216 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1137 1217
1138 FcPatternDestroy (p); 1218 FcPatternDestroy (p);
1139 1219
1140 if (!match) 1220 if (!match)
1141 return false; 1221 return false;
… …
1143 int ftheight = 0; 1223 int ftheight = 0;
1144 bool success = true; 1224 bool success = true;
1145 1225
1146 for (;;) 1226 for (;;)
1147 { 1227 {
1228 p = FcPatternDuplicate (match);
1148 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1229 f = XftFontOpenPattern (disp, p);
1149 1230
1150 if (!f) 1231 if (!f)
1151 { 1232 {
1233 FcPatternDestroy (p);
1152 success = false; 1234 success = false;
1153 break; 1235 break;
1154 } 1236 }
1155 1237
1156 FT_Face face = XftLockFace (f); 1238 FT_Face face = XftLockFace (f);
… …
1164 1246
1165 XftUnlockFace (f); 1247 XftUnlockFace (f);
1166 1248
1167 int glheight = height; 1249 int glheight = height;
1168 1250
1169 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++)
1170 { 1252 {
1171 FcChar16 ch = *t; 1253 FcChar16 ch = *t;
1172 1254
1173 if (cs != CS_UNICODE 1255 if (cs != CS_UNICODE
1174 && ch > 0x100 1256 && ch > 0x100
… …
1183 XGlyphInfo g; 1265 XGlyphInfo g;
1184 XftTextExtents16 (disp, f, &ch, 1, &g); 1266 XftTextExtents16 (disp, f, &ch, 1, &g);
1185 1267
1186 g.width -= g.x; 1268 g.width -= g.x;
1187 1269
1188 int wcw = wcwidth (ch); 1270 int wcw = WCWIDTH (ch);
1189 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1271 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1190 1272
1191 if (width < g.width ) width = g.width; 1273 if (width < g.width ) width = g.width;
1192 if (height < g.height ) height = g.height; 1274 if (height < g.height ) height = g.height;
1193 if (glheight < g.height - g.y) glheight = g.height - g.y; 1275 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1239 1321
1240 return success; 1322 return success;
1241} 1323}
1242 1324
1243bool 1325bool
1244rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1326rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1245{ 1327{
1246 careful = false; 1328 careful = false;
1247 1329
1248 if (!XftCharExists (DISPLAY, f, unicode)) 1330 if (!XftCharExists (term->dpy, f, unicode))
1249 return false; 1331 return false;
1250 1332
1251 if (!prop || prop->width == rxvt_fontprop::unset) 1333 if (!prop || prop->width == rxvt_fontprop::unset)
1252 return true; 1334 return true;
1253 1335
1254 // check character against base font bounding box 1336 // check character against base font bounding box
1255 FcChar32 ch = unicode; 1337 FcChar32 ch = unicode;
1256 XGlyphInfo g; 1338 XGlyphInfo g;
1257 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1339 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1258 1340
1259 int w = g.width - g.x; 1341 int w = g.width - g.x;
1260 int wcw = wcwidth (unicode); 1342 int wcw = max (WCWIDTH (unicode), 1);
1261 if (wcw > 0) w = (w + wcw - 1) / wcw;
1262 1343
1263 careful = w > prop->width; 1344 careful = g.x > 0 || w > prop->width * wcw;
1264 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))
1265 return false; 1351 return false;
1266 1352
1267 return true; 1353 return true;
1268} 1354}
1269 1355
1270void 1356void
1271rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1357rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1272 const text_t *text, int len, 1358 const text_t *text, int len,
1273 int fg, int bg) 1359 int fg, int bg)
1274{ 1360{
1275 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
1276
1277 int base = ascent; // should be fbase, but that is incorrect
1278
1279 XGlyphInfo extents; 1361 XGlyphInfo extents;
1280 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1362 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1281 FcChar32 *ep = enc; 1363 XftGlyphSpec *ep = enc;
1282 int ewidth = 0; 1364
1365 dTermDisplay;
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);
1373
1374 // cut trailing spaces
1375 while (len && text [len - 1] == ' ')
1376 len--;
1377
1378 int x_ = buffered ? 0 : x;
1379 int y_ = buffered ? 0 : y;
1283 1380
1284 while (len) 1381 while (len)
1285 { 1382 {
1286 int cwidth = r->fwidth; 1383 int cwidth = term->fwidth;
1287 FcChar32 fc = *text++; len--; 1384 FcChar32 fc = *text++; len--;
1288 1385
1289 while (len && *text == NOCHAR) 1386 while (len && *text == NOCHAR)
1290 text++, len--, cwidth += r->fwidth; 1387 text++, len--, cwidth += term->fwidth;
1388
1389 if (fc != ' ') // skip spaces
1291 1390 {
1292 if (fc == ' ' && ep == enc) // skip leading spaces 1391 FT_UInt glyph = XftCharIndex (disp, f, fc);
1392 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1393
1394 ep->glyph = glyph;
1395 ep->x = x_ + (cwidth - extents.xOff >> 1);
1396 ep->y = y_ + ascent;
1397
1398 if (extents.xOff == 0)
1399 ep->x = x_ + cwidth;
1400
1401 ep++;
1402 }
1403
1293 x += cwidth; 1404 x_ += cwidth;
1294 else 1405 }
1295 {
1296 FT_UInt gl = XftCharIndex (d.display->display, f, fc);
1297 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1298 1406
1299 if (extents.xOff != cwidth) 1407 if (buffered)
1408 {
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_img
1417 && (bg == Color_transparent || bg == Color_bg
1418 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1300 { 1419 {
1301 if (ewidth) 1420 int src_x = x, src_y = y;
1421
1422 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1302 { 1423 {
1303 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1304 x, y + base, enc, ep - enc);
1305 x += ewidth; 1424 src_x += term->window_vt_x;
1306 1425 src_y += term->window_vt_y;
1307 ep = enc;
1308 ewidth = 0;
1309 } 1426 }
1310 1427
1311 if (extents.xOff > cwidth) 1428 if (term->bg_img->w >= src_x + w
1312 extents.xOff = cwidth; 1429 && term->bg_img->h >= src_y + h)
1430 {
1431 XCopyArea (disp, term->bg_img->pm, d2, gc,
1432 src_x, src_y, w, h, 0, 0);
1433 }
1434 else
1435 {
1436 XGCValues gcv;
1313 1437
1314 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1438 gcv.fill_style = FillTiled;
1315 x + (cwidth - extents.xOff >> 1), 1439 gcv.tile = term->bg_img->pm;
1440 gcv.ts_x_origin = -src_x;
1441 gcv.ts_y_origin = -src_y;
1442
1443 XChangeGC (disp, gc,
1444 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1316 y + base, &gl, 1); 1445 &gcv);
1317 x += cwidth; 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 }
1318 } 1460 }
1319 else 1461 else
1320 { 1462#endif
1321 *ep++ = gl; 1463 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1322 ewidth += cwidth; 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);
1323 } 1467 }
1324 } 1468 else
1469 clear_rect (d, x, y, w, h, bg);
1470 }
1471 else
1325 } 1472 {
1326 1473 clear_rect (d, x, y, w, h, bg);
1327 if (ep != enc)
1328 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1474 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1329 x, y + base, enc, ep - enc); 1475 }
1330} 1476}
1477
1331#endif 1478#endif
1332 1479
1333///////////////////////////////////////////////////////////////////////////// 1480/////////////////////////////////////////////////////////////////////////////
1334 1481
1335rxvt_fontset::rxvt_fontset (rxvt_t r) 1482rxvt_fontset::rxvt_fontset (rxvt_term *term)
1336: fontdesc (0), r (r) 1483: fontdesc (0), term (term)
1337{ 1484{
1338 clear (); 1485 clear ();
1339} 1486}
1340 1487
1341rxvt_fontset::~rxvt_fontset () 1488rxvt_fontset::~rxvt_fontset ()
… …
1346void 1493void
1347rxvt_fontset::clear () 1494rxvt_fontset::clear ()
1348{ 1495{
1349 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1496 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1350 = rxvt_fontprop::unset; 1497 = rxvt_fontprop::unset;
1498 force_prop = false;
1351 1499
1352 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1500 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1353 FONT_UNREF (*i); 1501 (*i)->unref ();
1354 1502
1355 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1503 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1356 delete *p; 1504 delete *p;
1357 1505
1358 free (fontdesc); fontdesc = 0; 1506 free (fontdesc); fontdesc = 0;
… …
1360 fonts.clear (); 1508 fonts.clear ();
1361 1509
1362 fallback = fallback_fonts; 1510 fallback = fallback_fonts;
1363} 1511}
1364 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;
1520}
1521
1365rxvt_font * 1522rxvt_font *
1366rxvt_fontset::new_font (const char *name, codeset cs) 1523rxvt_fontset::new_font (const char *name, codeset cs)
1367{ 1524{
1368 rxvt_font *f; 1525 rxvt_font *f;
1369 1526
1370 if (!name || !*name) 1527 if (!name || !*name)
1371 { 1528 {
1372 name = ""; 1529 name = "";
1373 f = new rxvt_font_default (this); 1530 f = new rxvt_font_default (this);
1374 } 1531 }
… …
1385 f = new rxvt_font_x11; 1542 f = new rxvt_font_x11;
1386 } 1543 }
1387 else 1544 else
1388 f = new rxvt_font_x11; 1545 f = new rxvt_font_x11;
1389 1546
1390 f->set_term (r);
1391 f->set_name (strdup (name)); 1547 f->set_name (strdup (name));
1392 1548 prepare_font (f, cs);
1393 f->cs = cs;
1394 f->loaded = false;
1395 1549
1396 return f; 1550 return f;
1397} 1551}
1398 1552
1399///////////////////////////////////////////////////////////////////////////// 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}
1400 1571
1401void 1572void
1402rxvt_fontset::add_fonts (const char *desc) 1573rxvt_fontset::add_fonts (const char *desc)
1403{ 1574{
1404 if (desc) 1575 if (desc)
… …
1442 if (!end) 1613 if (!end)
1443 end = desc + strlen (desc); 1614 end = desc + strlen (desc);
1444 1615
1445 if (end - desc < 511) 1616 if (end - desc < 511)
1446 { 1617 {
1447 strncpy (buf, desc, end - desc); 1618 memcpy (buf, desc, end - desc);
1448 buf[end - desc] = 0; 1619 buf[end - desc] = 0;
1449 1620
1450 fonts.push_back (new_font (buf, cs)); 1621 push_font (new_font (buf, cs));
1451 } 1622 }
1452 else 1623 else
1453 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1624 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1454 1625
1455 desc = end + 1; 1626 desc = end + 1;
1456 } 1627 }
1457 while (*end); 1628 while (*end);
1458 } 1629 }
… …
1467 if (fonts[i]->loaded) 1638 if (fonts[i]->loaded)
1468 return true; 1639 return true;
1469 1640
1470 fonts[i]->loaded = true; 1641 fonts[i]->loaded = true;
1471 1642
1472 if (!fonts[i]->load (prop)) 1643 if (!fonts[i]->load (prop, force_prop))
1473 { 1644 {
1474 fonts[i]->cs = CS_UNKNOWN; 1645 fonts[i]->cs = CS_UNKNOWN;
1475 return false; 1646 return false;
1476 } 1647 }
1477 1648
… …
1483{ 1654{
1484 clear (); 1655 clear ();
1485 1656
1486 fontdesc = strdup (desc); 1657 fontdesc = strdup (desc);
1487 1658
1488 fonts.push_back (new_font (0, CS_UNICODE)); 1659 push_font (new_font (0, CS_UNICODE));
1489 realize_font (0); 1660 realize_font (0);
1490 1661
1491 add_fonts (desc); 1662 add_fonts (desc);
1492 1663
1493 return true; 1664 return true;
… …
1502 1673
1503 return -1; 1674 return -1;
1504} 1675}
1505 1676
1506int 1677int
1507rxvt_fontset::find_font (unicode_t unicode) 1678rxvt_fontset::find_font_idx (unicode_t unicode)
1508{ 1679{
1509 if (unicode >= 1<<20) 1680 if (unicode >= 1<<20)
1510 return 0; 1681 return 0;
1511 1682
1512 unicode_t hi = unicode >> 8; 1683 unicode_t hi = unicode >> 8;
… …
1538 goto next_font; 1709 goto next_font;
1539 1710
1540 bool careful; 1711 bool careful;
1541 if (f->has_char (unicode, &prop, careful)) 1712 if (f->has_char (unicode, &prop, careful))
1542 { 1713 {
1543 if (careful) 1714 i = (i << 1) | careful;
1544 i |= 128;
1545 1715
1546 goto found; 1716 goto found;
1547 } 1717 }
1548 1718
1549 next_font: 1719 next_font:
1550 if (i == fonts.size () - 1) 1720 if (i == fonts.size () - 1)
1551 { 1721 {
1552 if (fallback->name) 1722 if (fallback->name)
1553 { 1723 {
1554 // search through the fallback list 1724 // search through the fallback list
1555 fonts.push_back (new_font (fallback->name, fallback->cs)); 1725 push_font (new_font (fallback->name, fallback->cs));
1556 fallback++; 1726 fallback++;
1557 } 1727 }
1558 else 1728 else
1559 { 1729 {
1560 // try to find a new font. 1730 // try to find a new font.
… …
1578 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1748 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1579 FcPatternAddBool (p, FC_MINSPACE, 1); 1749 FcPatternAddBool (p, FC_MINSPACE, 1);
1580 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1750 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1581 1751
1582 XftResult result; 1752 XftResult result;
1583 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1753 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1584 1754
1585 FcPatternDestroy (p); 1755 FcPatternDestroy (p);
1586 1756
1587 if (match) 1757 if (match)
1588 { 1758 {
… …
1591 FcPatternDestroy (match); 1761 FcPatternDestroy (match);
1592 1762
1593 if (find_font (font) < 0) 1763 if (find_font (font) < 0)
1594 { 1764 {
1595 char fontname[4096]; 1765 char fontname[4096];
1596 sprintf (fontname, "xft:%-.4090s", font); 1766 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1597 1767
1598 fonts.push_back (new_font (fontname, CS_UNICODE)); 1768 push_font (new_font (fontname, CS_UNICODE));
1599 } 1769 }
1600 1770
1601 free (font); 1771 free (font);
1602 } 1772 }
1603#endif 1773#endif
… …
1615 while (hi >= fmap.size ()) 1785 while (hi >= fmap.size ())
1616 fmap.push_back (0); 1786 fmap.push_back (0);
1617 1787
1618 if (!fmap[hi]) 1788 if (!fmap[hi])
1619 { 1789 {
1620 fmap[hi] = (pagemap *)new pagemap; 1790 fmap[hi] = new pagemap;
1621 memset (fmap[hi], 0xff, sizeof (pagemap)); 1791 memset (fmap[hi], 0xff, sizeof (pagemap));
1622 } 1792 }
1623 1793
1624 (*fmap[hi])[unicode & 0xff] = i; 1794 (*fmap[hi])[unicode & 0xff] = i;
1625 } 1795 }
1626 1796
1627 return i; 1797 return i;
1628} 1798}
1629 1799
1630
1631

Diff Legend

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