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.72 by root, Sat Jun 18 10:59:21 2005 UTC vs.
Revision 1.170 by sf-exg, Thu Dec 30 01:13:24 2010 UTC

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

Diff Legend

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