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

Diff Legend

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