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.56 by root, Fri Dec 10 19:55:55 2004 UTC vs.
Revision 1.124 by ayin, Sat Nov 24 11:41:11 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: defaultfont.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
… …
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 15 * GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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" }, 139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
138 { CS_UNICODE, "xft:Arial Unicode MS:antialias=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 eosn't trust the font either. 154// pango uses a similar algorithm and doesn't trust the font either.
149static uint16_t extent_test_chars[] = { 155static uint16_t extent_test_chars[] = {
150 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 156 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
151 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 157 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
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{
340 dTermDisplay;
341 dTermGC;
342
336 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);
337 344
338 XSetForeground (d.display->display, TGC, r->pix_colors[fg]); 345 XSetForeground (disp, gc, term->pix_colors[fg]);
339 346
340 while (len) 347 while (len)
341 { 348 {
342#if ENABLE_COMBINING 349#if ENABLE_COMBINING
343 compose_char *cc; 350 compose_char *cc;
… …
347 354
348 while (++text, --len && *text == NOCHAR) 355 while (++text, --len && *text == NOCHAR)
349 ; 356 ;
350 357
351 int width = text - tp; 358 int width = text - tp;
352 int fwidth = r->TermWin.fwidth * width; 359 int fwidth = term->fwidth * width;
353 360
361#ifdef BUILTIN_GLYPHS
354 if (0x2500 <= t && t <= 0x259f) 362 if (0x2500 <= t && t <= 0x259f)
355 { 363 {
364# include "table/linedraw.h"
356 uint16_t offs = linedraw_offs[t - 0x2500]; 365 uint16_t offs = linedraw_offs[t - 0x2500];
357 uint32_t *a = linedraw_command + (offs >> 4); 366 uint32_t *a = linedraw_command + (offs >> 4);
358 uint32_t *b = a + (offs & 15); 367 uint32_t *b = a + (offs & 15);
359 368
360 int W = fwidth; 369 int W = fwidth;
361 int H = r->TermWin.fheight; 370 int H = term->fheight;
362 371
363 int x_[16]; 372 int x_[16];
364 int y_[16]; 373 int y_[16];
365 374
366 for (int i = 0; i <= 8; i++) 375 for (int i = 0; i <= 8; i++)
… …
374 383
375 XGCValues gcv; 384 XGCValues gcv;
376 385
377 gcv.cap_style = CapButt; 386 gcv.cap_style = CapButt;
378 gcv.line_width = 0; 387 gcv.line_width = 0;
379 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 388 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
380 389
381 while (a < b) 390 while (a < b)
382 { 391 {
383 uint32_t command = *a++; 392 uint32_t command = *a++;
384 393
… …
391 int y2 = y_[(command >> 0) & 15]; 400 int y2 = y_[(command >> 0) & 15];
392 401
393 switch (op) 402 switch (op)
394 { 403 {
395 case 0: // line 404 case 0: // line
396 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 405 XDrawLine (disp, d, gc, x1, y1, x2, y2);
397 break; 406 break;
398 407
399 case 1: // rectangle, possibly stippled 408 case 1: // rectangle, possibly stippled
400 if (a) 409 if (a)
401 { 410 {
402 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 411 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
403 412
404 gcv.fill_style = FillStippled; 413 gcv.fill_style = FillStippled;
405 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 414 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
406 gcv.ts_x_origin = x; 415 gcv.ts_x_origin = x;
407 gcv.ts_y_origin = y; 416 gcv.ts_y_origin = y;
408 417
409 XChangeGC (d.display->display, TGC, 418 XChangeGC (disp, gc,
410 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 419 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
411 &gcv); 420 &gcv);
412 } 421 }
413 422
414 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 423 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
415 424
416 if (a) 425 if (a)
417 { 426 {
418 XFreePixmap (d.display->display, gcv.stipple); 427 XFreePixmap (disp, gcv.stipple);
419 gcv.stipple = 0; 428 gcv.stipple = 0;
420 gcv.fill_style = FillSolid; 429 gcv.fill_style = FillSolid;
421 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 430 XChangeGC (disp, gc, GCFillStyle, &gcv);
422 } 431 }
423 break; 432 break;
424 case 2: // arc 433 case 2: // arc
425 XDrawArc (d.display->display, d, TGC, 434 XDrawArc (disp, d, gc,
426 x1 - W/2, y1 - H/2, W-1, H-1, 435 x1 - W/2, y1 - H/2, W-1, H-1,
427 (a - 1) * 90*64, (b - 1) * 90*64); 436 (a - 1) * 90*64, (b - 1) * 90*64);
428 break; 437 break;
429 } 438 }
430 } 439 }
431 } 440 }
441#else
442 if (0)
443 ;
444#endif
432#if ENABLE_COMBINING 445#if ENABLE_COMBINING
433 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 446 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
434 { 447 {
448 min_it (width, 2); // we only support wcwidth up to 2
449
435 text_t chrs[2]; 450 text_t chrs[2];
436 width = min (2, width);
437 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
438 452
439 *chrs = cc->c1; 453 *chrs = cc->c1;
440 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
441 f1->draw (d, x, y, chrs, width, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
… …
448 *chrs = cc->c2; 462 *chrs = cc->c2;
449 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
450 ? f1 464 ? f1
451 : (*fs)[fs->find_font (cc->c2)]; 465 : (*fs)[fs->find_font (cc->c2)];
452 466
453 f2->draw (d, x, y, chrs, width, fg, -1); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
454 } 468 }
455 } 469 }
456#endif 470#endif
457 else 471 else
458 switch (t) 472 switch (t)
… …
461 case ZERO_WIDTH_CHAR: 475 case ZERO_WIDTH_CHAR:
462 case NOCHAR: 476 case NOCHAR:
463 break; 477 break;
464 478
465 default: 479 default:
466 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, 480 XDrawRectangle (disp, d, gc, x + 2, y + 2,
467 fwidth - 4, r->TermWin.fheight - 4); 481 fwidth - 4, term->fheight - 4);
468 } 482 }
469 483
470 x += fwidth; 484 x += fwidth;
471 } 485 }
472} 486}
… …
478 492
479 void clear (); 493 void clear ();
480 494
481 rxvt_fontprop properties (); 495 rxvt_fontprop properties ();
482 496
483 bool load (const rxvt_fontprop &prop); 497 bool load (const rxvt_fontprop &prop, bool force_prop);
484 498
485 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;
486 500
487 void draw (rxvt_drawable &d, int x, int y, 501 void draw (rxvt_drawable &d, int x, int y,
488 const text_t *text, int len, 502 const text_t *text, int len,
489 int fg, int bg); 503 int fg, int bg);
490 504
491 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
492 XFontStruct *f; 506 XFontStruct *f;
493 codeset cs;
494 bool enc2b, encm; 507 bool enc2b, encm;
495 508
496 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 509 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
497 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);
498 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 511 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
499 bool set_properties (rxvt_fontprop &p, const char *name); 512 bool set_properties (rxvt_fontprop &p, const char *name);
500}; 513};
501 514
502char * 515char *
503rxvt_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
504{ 517{
505 unsigned long value; 518 unsigned long value;
506 519
507 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 520 if (XGetFontProperty (f, property, &value))
508 return XGetAtomName (DISPLAY, value); 521 return XGetAtomName (term->dpy, value);
509 else 522 else
510 return rxvt_strdup (repl); 523 return repl ? strdup (repl) : 0;
511} 524}
512 525
513rxvt_fontprop 526rxvt_fontprop
514rxvt_font_x11::properties () 527rxvt_font_x11::properties ()
515{ 528{
… …
519} 532}
520 533
521bool 534bool
522rxvt_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)
523{ 536{
524 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;
525 p.height = height; 540 p.height = height;
541 p.ascent = rxvt_fontprop::unset;
526 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;
527 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;
528 544
529 return true; 545 return true;
530} 546}
531 547
532bool 548bool
533rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 549rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
534{ 550{
535 unsigned long height; 551 unsigned long height;
552
553#if 0
536 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 554 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
537 return false; 555 return false;
556#else
557 height = f->ascent + f->descent;
558#endif
538 559
539 unsigned long avgwidth; 560 unsigned long avgwidth;
540 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 561 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
541 avgwidth = 0; 562 avgwidth = 0;
542 563
543 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 564 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
544 char *slant = get_property (f, "SLANT", "r"); 565 char *slant = get_property (f, term->xa [XA_SLANT], "r");
545 566
546 set_properties (p, height, weight, slant, avgwidth); 567 set_properties (p, height, weight, slant, avgwidth);
547 568
548 free (weight); 569 free (weight);
549 free (slant); 570 free (slant);
550 571
572 p.ascent = f->ascent;
573
551 return true; 574 return true;
552} 575}
553 576
554bool 577bool
555rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 578rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
556{ 579{
580 dTermDisplay;
557 int slashes = 0; 581 int slashes = 0;
558 const char *comp[13]; 582 const char *comp[13];
559 583
560 for (const char *c = name; *c; c++) 584 for (const char *c = name; *c; c++)
561 if (*c == '-') 585 if (*c == '-')
… …
569 if (slashes >= 13 593 if (slashes >= 13
570 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 594 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
571 && (*comp[11] >= '0' && *comp[11] <= '9')) 595 && (*comp[11] >= '0' && *comp[11] <= '9'))
572 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]));
573 597
574 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 598 XFontStruct *f = XLoadQueryFont (disp, name);
575 599
576 if (f) 600 if (f)
577 { 601 {
578 // 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
579 // (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).
580 // in that case, just return garbage. 604 // in that case, just return garbage.
581 bool ret = set_properties (p, f); 605 bool ret = set_properties (p, f);
582 XFreeFont (DISPLAY, f); 606 XFreeFont (disp, f);
583 return ret; 607 return ret;
584 } 608 }
585 else 609 else
586 return false; 610 return false;
587} 611}
… …
623 return false; 647 return false;
624 } 648 }
625} 649}
626 650
627bool 651bool
628rxvt_font_x11::load (const rxvt_fontprop &prop) 652rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
629{ 653{
654 dTermDisplay;
655
630 clear (); 656 clear ();
631 657
632 char field_str[64]; // enough for 128 bits 658 char field_str[64]; // enough for 128 bits
633 659
634 // first morph the font if required 660 // first morph the font if required
635 if (prop.weight != rxvt_fontprop::unset 661 if (force_prop)
636 || prop.slant != rxvt_fontprop::unset)
637 { 662 {
638 char fname[1024]; 663 char fname[1024];
639 664
640 if (name[0] != '-') 665 if (name[0] != '-')
641 { 666 {
642 f = XLoadQueryFont (DISPLAY, name); 667 f = XLoadQueryFont (disp, name);
643 668
644 if (!f) 669 if (!f)
645 return false; 670 return false;
646 671
647 char *new_name = get_property (f, "FONT", name); 672 char *new_name = get_property (f, XA_FONT, name);
648 673
649 if (new_name) 674 if (new_name)
650 set_name (new_name); 675 set_name (new_name);
651 else 676 else
652 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 677 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
653 678
654 XFreeFont (DISPLAY, f); 679 XFreeFont (disp, f);
655 f = 0; 680 f = 0;
656 } 681 }
657 682
658 if (prop.weight != rxvt_fontprop::unset) 683 if (prop.weight != rxvt_fontprop::unset)
659 { 684 {
660 replace_field (fname, name, 2, 0, 685 replace_field (fname, name, 2, 0,
661 prop.weight < rxvt_fontprop::bold 686 prop.weight < rxvt_fontprop::bold
662 ? "medium" : "bold"); 687 ? "medium" : "bold");
663 set_name (strdup (fname)); 688 set_name (strdup (fname));
664 } 689 }
665 690
… …
670 ? "r" : "i"); // TODO: handle "o"blique, too 695 ? "r" : "i"); // TODO: handle "o"blique, too
671 set_name (strdup (fname)); 696 set_name (strdup (fname));
672 } 697 }
673 } 698 }
674 699
700 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
701 ? 0 : prop.height);
702
703 struct font_weight {
704 char *name;
705 int diff;
706
707 void clear ()
708 {
709 name = 0;
710 diff = 0x7fffffff;
711 }
712
713 font_weight () { clear (); }
714 ~font_weight () { free (name); }
715 };
716
675 char **list; 717 char **list;
676 int count; 718 int count;
677 list = XListFonts (DISPLAY, name, 1024, &count); 719 list = XListFonts (disp, name, 4000, &count);
678 720
679 set_name (0); 721 set_name (0);
680 722
681 if (!list) 723 if (!list)
682 return false; 724 return false;
683 725
684 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 726 font_weight *fonts = new font_weight[count];
685 ? 0 : prop.height);
686 727
687 int bestdiff = 0x7fffffff;
688 for (int i = 0; i < count; i++) 728 for (int i = 0; i < count; i++)
689 { 729 {
690 rxvt_fontprop p; 730 rxvt_fontprop p;
691 char fname[1024]; 731 char fname[1024];
692 732
693 int diff = 0; 733 int diff = 0;
694 734
695 if (replace_field (fname, list[i], 6, '0', field_str)) 735 if (replace_field (fname, list[i], 6, '0', field_str))
696 diff += 10; // slightly penalize scalable fonts 736 diff += 10; // slightly penalize scalable fonts
737 else if (replace_field (fname, list[i], 11, '0', "0"))
738 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
697 739
698 if (!set_properties (p, fname)) 740 if (!set_properties (p, fname))
699 continue; 741 continue;
700 742
701 if (prop.height != rxvt_fontprop::unset 743 if (prop.height != rxvt_fontprop::unset
… …
705 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 747 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
706 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 748 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
707 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 749 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
708 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 750 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
709 751
710 if (!name // compare against best found so far 752 fonts[i].name = strdup (fname);
711 || diff < bestdiff) 753 fonts[i].diff = diff;
712 {
713 set_name (strdup (fname));
714 bestdiff = diff;
715 }
716 } 754 }
717 755
718 XFreeFontNames (list); 756 XFreeFontNames (list);
719 757
720 if (!name) 758 // this loop only iterates when the guessed font-size is too small
721 return false; 759 for (;;)
760 {
761 font_weight *best = fonts + count - 1;
722 762
723 f = XLoadQueryFont (DISPLAY, name); 763 for (font_weight *w = best; w-- > fonts; )
764 if (w->diff <= best->diff)
765 best = w;
766
767 if (!best->name
768 || !(f = XLoadQueryFont (disp, best->name)))
769 break;
770
771 set_name (best->name);
772 best->clear ();
773
774 ascent = f->ascent;
775 descent = f->descent;
776 height = ascent + descent;
777
778 if (prop.height == rxvt_fontprop::unset
779 || height <= prop.height)
780 break; // font is ready for use
781
782 // PIXEL_SIZE small enough, but real height too large
783 clear ();
784 }
785
786 delete [] fonts;
724 787
725 if (!f) 788 if (!f)
726 return false; 789 return false;
727 790
728 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 791 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
729 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 792 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
730 793
731 if (registry && encoding) 794 if (registry && encoding)
732 { 795 {
733 char charset[64]; 796 char charset[64];
734 snprintf (charset, 64, "%s-%s", registry, encoding); 797 snprintf (charset, 64, "%s-%s", registry, encoding);
735 798
736 cs = codeset_from_name (charset); 799 cs = codeset_from_name (charset);
737 } 800 }
738 else 801 else
739 { 802 {
740 const char *charset = get_property (f, "FONT", 0); 803 const char *charset = get_property (f, XA_FONT, 0);
741 804
742 if (!charset) 805 if (!charset)
743 charset = name; 806 charset = name;
744 807
745 int count = 13; 808 int count = 13;
… …
757 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 820 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
758 821
759 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 822 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
760 enc2b = encm || f->max_char_or_byte2 > 255; 823 enc2b = encm || f->max_char_or_byte2 > 255;
761 824
762 ascent = f->ascent;
763 descent = f->descent;
764 height = ascent + descent;
765
766 slow = false; 825 slow = false;
767 826
768#if 1 // only used for slow detection, TODO optimize 827#if 1 // only used for slow detection, TODO optimize
769 if (f->min_bounds.width == f->max_bounds.width) 828 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
770 width = f->min_bounds.width;
771 else if (f->per_char == NULL)
772 width = f->max_bounds.width; 829 width = f->max_bounds.width;
773 else 830 else
774 { 831 {
775 slow = true; 832 slow = true;
776 833
777 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 834 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
778 835
779 if (encm) 836 if (encm)
780 N += (f->max_byte1 - f->min_byte1) 837 N += (f->max_byte1 - f->min_byte1)
781 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 838 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
782 839
783 while (N) 840 while (N)
784 { 841 {
785 if (f->per_char[N].width > width) 842 if (f->per_char[N].width > width)
786 width = f->per_char[N].width; 843 width = f->per_char[N].width;
787 844
… …
792 849
793 width = 1; 850 width = 1;
794 851
795 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 852 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
796 { 853 {
797 if (cs != CS_UNICODE
798 && *t > 0x100
799 && FROM_UNICODE (cs, *t) == NOCHAR) 854 if (FROM_UNICODE (cs, *t) == NOCHAR)
800 continue; 855 continue;
801 856
802 // ignore characters we wouldn't use anyways 857 // ignore characters we wouldn't use anyways
803 bool careful; 858 bool careful;
804 if (!has_char (*t, &prop, careful)) 859 if (!has_char (*t, &prop, careful))
… …
808 863
809 XCharStruct g; 864 XCharStruct g;
810 int dir_ret, asc_ret, des_ret; 865 int dir_ret, asc_ret, des_ret;
811 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 866 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
812 867
813 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 868 int wcw = WCWIDTH (*t);
869 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
814 870
815 if (width < g.width) width = g.width; 871 if (width < g.width) width = g.width;
816 } 872 }
817 873
818 if (cs == CS_UNKNOWN) 874 if (cs == CS_UNKNOWN)
819 { 875 {
820 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 876 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
837void 893void
838rxvt_font_x11::clear () 894rxvt_font_x11::clear ()
839{ 895{
840 if (f) 896 if (f)
841 { 897 {
842 XFreeFont (DISPLAY, f); 898 XFreeFont (term->dpy, f);
843 f = 0; 899 f = 0;
844 } 900 }
845} 901}
846 902
847bool 903bool
848rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 904rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
849{ 905{
850 uint32_t ch = FROM_UNICODE (cs, unicode); 906 uint32_t ch = FROM_UNICODE (cs, unicode);
851 907
852 if (ch == NOCHAR) 908 if (ch == NOCHAR)
853 return false; 909 return false;
… …
890 return false; 946 return false;
891 947
892 if (!prop || prop->width == rxvt_fontprop::unset) 948 if (!prop || prop->width == rxvt_fontprop::unset)
893 return true; 949 return true;
894 950
895 // check character against base font bounding box 951 // check wether character overlaps previous/next character
896 int w = xcs->width; 952 int w = xcs->rbearing - xcs->lbearing;
897 int wcw = wcwidth (unicode); 953 int wcw = max (WCWIDTH (unicode), 1);
898 if (wcw > 0) w /= wcw;
899 954
900 careful = w > prop->width; 955 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
901 if (careful && w > prop->width * MAX_OVERLAP >> 2) 956
957 if (careful && !OVERLAP_OK (w, wcw, prop))
902 return false; 958 return false;
903 959
904 return true; 960 return true;
905} 961}
906 962
… …
912 // this looks like a mess /. 968 // this looks like a mess /.
913 // and it is a mess /. 969 // and it is a mess /.
914 // yet we are trying to be perfect /. 970 // yet we are trying to be perfect /.
915 // but the result still isn't perfect /. 971 // but the result still isn't perfect /.
916 972
973 dTermDisplay;
974 dTermGC;
975
917 bool slow = this->slow 976 bool slow = this->slow
918 || width != r->TermWin.fwidth 977 || width != term->fwidth
919 || height != r->TermWin.fheight; 978 || height != term->fheight;
920 979
921 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 980 int base = ascent; // sorry, incorrect: term->fbase;
922 981
923 XGCValues v; 982 XGCValues v;
924 v.foreground = r->pix_colors[fg]; 983 v.foreground = term->pix_colors[fg];
925 v.font = f->fid; 984 v.font = f->fid;
926 985
927 if (enc2b) 986 if (enc2b)
928 { 987 {
929 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 988 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
930 989
931 if (bg == Color_bg && !slow) 990 if (bg == Color_bg && !slow)
932 { 991 {
933 v.background = r->pix_colors[bg]; 992 v.background = term->pix_colors[bg];
934 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 993 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
935 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 994 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
936 } 995 }
937 else 996 else
938 { 997 {
939 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 998 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
940 999
941 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1000 XChangeGC (disp, gc, GCForeground | GCFont, &v);
942 1001
943 if (slow) 1002 if (slow)
944 { 1003 {
945 do 1004 do
946 { 1005 {
947 if (xc->byte1 || xc->byte2) 1006 if (xc->byte1 || xc->byte2)
948 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1007 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
949 1008
950 x += r->TermWin.fwidth; 1009 x += term->fwidth;
951 xc++; len--; 1010 xc++; len--;
952 } 1011 }
953 while (len); 1012 while (len);
954 } 1013 }
955 else 1014 else
956 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1015 XDrawString16 (disp, d, gc, x, y + base, xc, len);
957 } 1016 }
958 } 1017 }
959 else 1018 else
960 { 1019 {
961 const char *xc = enc_char (text, len, cs, slow); 1020 const char *xc = enc_char (text, len, cs, slow);
962 1021
963 if (bg == Color_bg && !slow) 1022 if (bg == Color_bg && !slow)
964 { 1023 {
965 v.background = r->pix_colors[bg]; 1024 v.background = term->pix_colors[bg];
966 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1025 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
967 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1026 XDrawImageString (disp, d, gc, x, y + base, xc, len);
968 } 1027 }
969 else 1028 else
970 { 1029 {
971 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1030 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
972 1031
973 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1032 XChangeGC (disp, gc, GCForeground | GCFont, &v);
974 1033
975 if (slow) 1034 if (slow)
976 { 1035 {
977 do 1036 do
978 { 1037 {
979 if (*xc) 1038 if (*xc)
980 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1039 XDrawString (disp, d, gc, x, y + base, xc, 1);
981 1040
982 x += r->TermWin.fwidth; 1041 x += term->fwidth;
983 xc++; len--; 1042 xc++; len--;
984 } 1043 }
985 while (len); 1044 while (len);
986 } 1045 }
987 else 1046 else
988 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1047 XDrawString (disp, d, gc, x, y + base, xc, len);
989 } 1048 }
990 } 1049 }
991} 1050}
992 1051
993///////////////////////////////////////////////////////////////////////////// 1052/////////////////////////////////////////////////////////////////////////////
… …
999 1058
1000 void clear (); 1059 void clear ();
1001 1060
1002 rxvt_fontprop properties (); 1061 rxvt_fontprop properties ();
1003 1062
1004 bool load (const rxvt_fontprop &prop); 1063 bool load (const rxvt_fontprop &prop, bool force_prop);
1005 1064
1006 void draw (rxvt_drawable &d, int x, int y, 1065 void draw (rxvt_drawable &d, int x, int y,
1007 const text_t *text, int len, 1066 const text_t *text, int len,
1008 int fg, int bg); 1067 int fg, int bg);
1009 1068
1010 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1069 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1011 1070
1012protected: 1071protected:
1013 XftFont *f; 1072 XftFont *f;
1014}; 1073};
1015 1074
1016void 1075void
1017rxvt_font_xft::clear () 1076rxvt_font_xft::clear ()
1018{ 1077{
1019 if (f) 1078 if (f)
1020 { 1079 {
1021 XftFontClose (DISPLAY, f); 1080 XftFontClose (term->dpy, f);
1022 f = 0; 1081 f = 0;
1023 } 1082 }
1024} 1083}
1025 1084
1026rxvt_fontprop 1085rxvt_fontprop
… …
1030 1089
1031 FT_Face face = XftLockFace (f); 1090 FT_Face face = XftLockFace (f);
1032 1091
1033 p.width = width; 1092 p.width = width;
1034 p.height = height; 1093 p.height = height;
1094 p.ascent = ascent;
1035 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1095 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1036 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1096 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1037 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1097 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1038 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1098 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1039 1099
… …
1041 1101
1042 return p; 1102 return p;
1043} 1103}
1044 1104
1045bool 1105bool
1046rxvt_font_xft::load (const rxvt_fontprop &prop) 1106rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1047{ 1107{
1108 dTermDisplay;
1109
1048 clear (); 1110 clear ();
1049 1111
1050 FcPattern *p = FcNameParse ((FcChar8 *) name); 1112 FcPattern *p = FcNameParse ((FcChar8 *) name);
1051 1113
1052 if (!p) 1114 if (!p)
1053 return false; 1115 return false;
1054 1116
1055 FcValue v; 1117 FcValue v;
1056 1118
1057 if (prop.height != rxvt_fontprop::unset 1119 if (prop.height != rxvt_fontprop::unset
1058 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1120 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1059 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1121 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1060 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1122 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1061 1123
1062 if (prop.weight != rxvt_fontprop::unset 1124 if (prop.weight != rxvt_fontprop::unset
1063 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1125 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1064 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1126 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1065 1127
1066 if (prop.slant != rxvt_fontprop::unset 1128 if (prop.slant != rxvt_fontprop::unset
1067 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1129 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1068 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1130 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1069 1131
1070#if 0 // clipping unfortunately destroys our precious double-width-characters 1132#if 0 // clipping unfortunately destroys our precious double-width-characters
1071 // clip width, we can't do better, or can we? 1133 // clip width, we can't do better, or can we?
1072 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1134 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1078 1140
1079 // store generated name so iso14755 view gives better results 1141 // store generated name so iso14755 view gives better results
1080 set_name ((char *)FcNameUnparse (p)); 1142 set_name ((char *)FcNameUnparse (p));
1081 1143
1082 XftResult result; 1144 XftResult result;
1083 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1145 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1084 1146
1085 FcPatternDestroy (p); 1147 FcPatternDestroy (p);
1086 1148
1087 if (!match) 1149 if (!match)
1088 return false; 1150 return false;
… …
1090 int ftheight = 0; 1152 int ftheight = 0;
1091 bool success = true; 1153 bool success = true;
1092 1154
1093 for (;;) 1155 for (;;)
1094 { 1156 {
1095 f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); 1157 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
1096 1158
1097 if (!f) 1159 if (!f)
1098 { 1160 {
1099 success = false; 1161 success = false;
1100 break; 1162 break;
… …
1109 1171
1110 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1172 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1111 1173
1112 XftUnlockFace (f); 1174 XftUnlockFace (f);
1113 1175
1176 int glheight = height;
1177
1114 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1178 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1115 { 1179 {
1116 FcChar16 ch = *t; 1180 FcChar16 ch = *t;
1117 1181
1118 if (cs != CS_UNICODE 1182 if (cs != CS_UNICODE
… …
1124 bool careful; 1188 bool careful;
1125 if (!has_char (*t, &prop, careful)) 1189 if (!has_char (*t, &prop, careful))
1126 continue; 1190 continue;
1127 1191
1128 XGlyphInfo g; 1192 XGlyphInfo g;
1129 XftTextExtents16 (DISPLAY, f, &ch, 1, &g); 1193 XftTextExtents16 (disp, f, &ch, 1, &g);
1130 1194
1195 g.width -= g.x;
1196
1131 int wcw = wcwidth (ch); 1197 int wcw = WCWIDTH (ch);
1132 if (wcw > 0) g.width = g.width / wcw; 1198 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1133 1199
1134 if (width < g.width) width = g.width; 1200 if (width < g.width ) width = g.width;
1135 if (height < g.height) height = g.height; 1201 if (height < g.height ) height = g.height;
1202 if (glheight < g.height - g.y) glheight = g.height - g.y;
1203 }
1204
1205 if (!width)
1206 {
1207 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1208
1209 XftFontClose (disp, f);
1210 f = 0;
1211
1212 success = false;
1213 break;
1136 } 1214 }
1137 1215
1138 if (prop.height == rxvt_fontprop::unset 1216 if (prop.height == rxvt_fontprop::unset
1139 || height <= prop.height 1217 || (height <= prop.height && glheight <= prop.height)
1140 || height <= 2 1218 || height <= 2
1141 || !scalable) 1219 || !scalable)
1142 break; 1220 break;
1143 1221
1144 if (ftheight) 1222 if (ftheight)
… …
1151 ftheight -= height - prop.height; 1229 ftheight -= height - prop.height;
1152 } 1230 }
1153 else 1231 else
1154 ftheight = prop.height - 1; 1232 ftheight = prop.height - 1;
1155 1233
1156 XftFontClose (DISPLAY, f); 1234 XftFontClose (disp, f);
1157 FcPatternDel (match, FC_PIXEL_SIZE); 1235 FcPatternDel (match, FC_PIXEL_SIZE);
1158 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1236 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1159 } 1237 }
1160 1238
1161 FcPatternDestroy (match); 1239 FcPatternDestroy (match);
1162 1240
1163#if 0 // do it per-character 1241#if 0 // do it per-character
… …
1170 1248
1171 return success; 1249 return success;
1172} 1250}
1173 1251
1174bool 1252bool
1175rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1253rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1176{ 1254{
1177 careful = false; 1255 careful = false;
1178 1256
1179 if (!XftCharExists (DISPLAY, f, unicode)) 1257 if (!XftCharExists (term->dpy, f, unicode))
1180 return false; 1258 return false;
1181 1259
1182 if (!prop || prop->width == rxvt_fontprop::unset) 1260 if (!prop || prop->width == rxvt_fontprop::unset)
1183 return true; 1261 return true;
1184 1262
1185 // check character against base font bounding box 1263 // check character against base font bounding box
1186 FcChar32 ch = unicode; 1264 FcChar32 ch = unicode;
1187 XGlyphInfo g; 1265 XGlyphInfo g;
1188 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1266 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1189 1267
1190 int w = g.width; 1268 int w = g.width - g.x;
1191 int wcw = wcwidth (unicode); 1269 int wcw = max (WCWIDTH (unicode), 1);
1192 if (wcw > 0) w /= wcw;
1193 1270
1194 careful = w > prop->width; 1271 careful = g.x > 0 || w > prop->width * wcw;
1195 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1272
1273 if (careful && !OVERLAP_OK (w, wcw, prop))
1274 return false;
1275
1276 // this weeds out _totally_ broken fonts, or glyphs
1277 if (!OVERLAP_OK (g.xOff, wcw, prop))
1196 return false; 1278 return false;
1197 1279
1198 return true; 1280 return true;
1199} 1281}
1200 1282
1201void 1283void
1202rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1284rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1203 const text_t *text, int len, 1285 const text_t *text, int len,
1204 int fg, int bg) 1286 int fg, int bg)
1205{ 1287{
1206 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
1207
1208 int base = ascent; // should be fbase, but that is incorrect
1209
1210 XGlyphInfo extents; 1288 XGlyphInfo extents;
1211 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1289 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1212 FcChar32 *ep = enc; 1290 XftGlyphSpec *ep = enc;
1213 int ewidth = 0; 1291
1214 int xoff = 0; 1292 dTermDisplay;
1293 dTermGC;
1294
1295 int w = term->fwidth * len;
1296 int h = term->fheight;
1297
1298 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
1299 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1300 * good idea from the perspective of packaging for wide variety of user configs.
1301 */
1302 bool buffered = true
1303#ifdef FORCE_UNBUFFERED_XFT
1304 && bg >= 0
1305#endif
1306 ;
1307 // cut trailing spaces
1308 while (len && text [len - 1] == ' ')
1309 len--;
1310
1311 int x_ = buffered ? 0 : x;
1312 int y_ = buffered ? 0 : y;
1215 1313
1216 while (len) 1314 while (len)
1217 { 1315 {
1218 int cwidth = r->TermWin.fwidth; 1316 int cwidth = term->fwidth;
1219 FcChar32 fc = *text++; len--; 1317 FcChar32 fc = *text++; len--;
1220 FT_UInt gl;
1221 1318
1222 while (len && *text == NOCHAR) 1319 while (len && *text == NOCHAR)
1223 text++, len--, cwidth += r->TermWin.fwidth; 1320 text++, len--, cwidth += term->fwidth;
1224
1225 gl = XftCharIndex (d.display->display, f, fc);
1226 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1227 1321
1228 if (extents.xOff != cwidth && ep != enc) 1322 if (fc != ' ') // skip spaces
1229 {
1230 if (xoff > ewidth) xoff = ewidth;
1231 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1232 x + (ewidth - xoff >> 1),
1233 y + base, enc, ep - enc);
1234 x += ewidth;
1235
1236 ep = enc;
1237 ewidth = 0;
1238 xoff = 0;
1239 } 1323 {
1324 FT_UInt glyph = XftCharIndex (disp, f, fc);
1325 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1240 1326
1241 if (fc == ' ' && ep == enc) // skip leading spaces 1327 ep->glyph = glyph;
1328 ep->x = x_ + (cwidth - extents.xOff >> 1);
1329 ep->y = y_ + ascent;
1330
1331 if (extents.xOff == 0)
1332 ep->x = x_ + cwidth;
1333
1334 ep++;
1242 { 1335 }
1336
1243 x += cwidth; 1337 x_ += cwidth;
1244 continue; 1338 }
1339
1340 if (buffered)
1341 {
1342 bool back_rendered = false;
1343 if (ep != enc)
1245 } 1344 {
1345 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1246 1346
1347#ifdef HAVE_BG_PIXMAP
1348 if (term->bgPixmap.pixmap)
1349 {
1350 Picture dst = 0;
1351
1352 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
1353 dst = XftDrawPicture (d2);
1354
1355 if (bg < 0 || dst != 0)
1356 {
1357 int src_x = x, src_y = y ;
1358
1359 if (term->bgPixmap.is_parentOrigin ())
1360 {
1361 src_x += term->window_vt_x;
1362 src_y += term->window_vt_y;
1363 }
1364
1365 if (term->bgPixmap.pmap_width >= src_x+w
1366 && term->bgPixmap.pmap_height >= src_y+h)
1367 {
1368 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1369 src_x, src_y, w, h, 0, 0);
1370 }
1371 else
1372 {
1373 XGCValues gcv;
1374
1375 gcv.fill_style = FillTiled;
1376 gcv.tile = term->bgPixmap.pixmap;
1377 gcv.ts_x_origin = -src_x;
1378 gcv.ts_y_origin = -src_y;
1379
1380 XChangeGC (disp, gc,
1381 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1382 &gcv);
1383
1384 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1385
1386 gcv.fill_style = FillSolid;
1387 XChangeGC (disp, gc, GCFillStyle, &gcv);
1388 }
1389
1390 if (bg >= 0)
1391 {
1392 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1393 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1394 }
1395
1396 back_rendered = true;
1397 }
1398 }
1399#endif
1400
1401 if (bg >= 0 && !back_rendered)
1402 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1403
1404 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1405 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1406 }
1247 else 1407 else
1248 { 1408 clear_rect (d, x, y, w, h, bg);
1249 *ep++ = gl;
1250 ewidth += cwidth;
1251 xoff += extents.xOff;
1252 }
1253 }
1254
1255 if (ep != enc)
1256 { 1409 }
1257 if (xoff > ewidth) xoff = ewidth; 1410 else
1258 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1259 x + (ewidth - xoff >> 1),
1260 y + base, enc, ep - enc);
1261 } 1411 {
1412 clear_rect (d, x, y, w, h, bg);
1413 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1414 }
1262} 1415}
1416
1263#endif 1417#endif
1264 1418
1265///////////////////////////////////////////////////////////////////////////// 1419/////////////////////////////////////////////////////////////////////////////
1266 1420
1267rxvt_fontset::rxvt_fontset (rxvt_t r) 1421rxvt_fontset::rxvt_fontset (rxvt_term *term)
1268: r (r), fontdesc (0) 1422: fontdesc (0), term (term)
1269{ 1423{
1270 clear (); 1424 clear ();
1271} 1425}
1272 1426
1273rxvt_fontset::~rxvt_fontset () 1427rxvt_fontset::~rxvt_fontset ()
… …
1276} 1430}
1277 1431
1278void 1432void
1279rxvt_fontset::clear () 1433rxvt_fontset::clear ()
1280{ 1434{
1281 prop.width = prop.height = prop.weight = prop.slant 1435 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1282 = rxvt_fontprop::unset; 1436 = rxvt_fontprop::unset;
1437 force_prop = false;
1283 1438
1284 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1439 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1285 FONT_UNREF (*i); 1440 FONT_UNREF (*i);
1286 1441
1287 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1442 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1296 1451
1297rxvt_font * 1452rxvt_font *
1298rxvt_fontset::new_font (const char *name, codeset cs) 1453rxvt_fontset::new_font (const char *name, codeset cs)
1299{ 1454{
1300 rxvt_font *f; 1455 rxvt_font *f;
1301 1456
1302 if (!name || !*name) 1457 if (!name || !*name)
1303 { 1458 {
1304 name = ""; 1459 name = "";
1305 f = new rxvt_font_default (this); 1460 f = new rxvt_font_default (this);
1306 } 1461 }
… …
1317 f = new rxvt_font_x11; 1472 f = new rxvt_font_x11;
1318 } 1473 }
1319 else 1474 else
1320 f = new rxvt_font_x11; 1475 f = new rxvt_font_x11;
1321 1476
1322 f->set_term (r); 1477 f->set_term (term);
1323 f->set_name (strdup (name)); 1478 f->set_name (strdup (name));
1324 1479
1325 f->cs = cs; 1480 f->cs = cs;
1326 f->loaded = false; 1481 f->loaded = false;
1327 1482
… …
1338 char buf[512]; 1493 char buf[512];
1339 const char *end; 1494 const char *end;
1340 1495
1341 do 1496 do
1342 { 1497 {
1343 while (*desc <= ' ') desc++; 1498 while (*desc && *desc <= ' ')
1499 desc++;
1344 1500
1345 codeset cs = CS_UNICODE; 1501 codeset cs = CS_UNICODE;
1346 1502
1347 if (*desc == '[') 1503 if (*desc == '[')
1348 { 1504 {
… …
1398 if (fonts[i]->loaded) 1554 if (fonts[i]->loaded)
1399 return true; 1555 return true;
1400 1556
1401 fonts[i]->loaded = true; 1557 fonts[i]->loaded = true;
1402 1558
1403 if (!fonts[i]->load (prop)) 1559 if (!fonts[i]->load (prop, force_prop))
1404 { 1560 {
1405 fonts[i]->cs = CS_UNKNOWN; 1561 fonts[i]->cs = CS_UNKNOWN;
1406 return false; 1562 return false;
1407 } 1563 }
1408 1564
… …
1458 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1614 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1459 goto next_font; 1615 goto next_font;
1460 1616
1461 if (!realize_font (i)) 1617 if (!realize_font (i))
1462 goto next_font; 1618 goto next_font;
1619
1620 if (prop.ascent != rxvt_fontprop::unset)
1621 max_it (f->ascent, prop.ascent);
1463 } 1622 }
1464 1623
1465 if (f->cs == CS_UNKNOWN) 1624 if (f->cs == CS_UNKNOWN)
1466 goto next_font; 1625 goto next_font;
1467 1626
… …
1506 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1665 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1507 FcPatternAddBool (p, FC_MINSPACE, 1); 1666 FcPatternAddBool (p, FC_MINSPACE, 1);
1508 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1667 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1509 1668
1510 XftResult result; 1669 XftResult result;
1511 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1670 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1512 1671
1513 FcPatternDestroy (p); 1672 FcPatternDestroy (p);
1514 1673
1515 if (match) 1674 if (match)
1516 { 1675 {
… …
1521 if (find_font (font) < 0) 1680 if (find_font (font) < 0)
1522 { 1681 {
1523 char fontname[4096]; 1682 char fontname[4096];
1524 sprintf (fontname, "xft:%-.4090s", font); 1683 sprintf (fontname, "xft:%-.4090s", font);
1525 1684
1526 fonts.push_back (new_font (fontname, CS_UNICODE)); 1685 fonts.push_back (new_font (fontname, CS_UNICODE));
1527 } 1686 }
1528 1687
1529 free (font); 1688 free (font);
1530 } 1689 }
1531#endif 1690#endif

Diff Legend

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