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

Diff Legend

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