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.133 by root, Wed Jan 23 06:49:30 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
243# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && !term->pix_colors[color].is_opaque ())
245 {
246 Picture dst = XftDrawPicture (d);
247
248 if (dst != 0)
249 {
250 XClearArea (disp, d, x, y, w, h, false);
251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
252 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
253 done = true;
254 }
255 }
256# endif
257 if (!done)
252 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 258 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
259
253#else 260#else
254 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 261 XSetForeground (disp, gc, term->pix_colors[color]);
255 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 262 XFillRectangle (disp, d, gc, x, y, w, h);
256#endif 263#endif
257 } 264 }
258} 265}
259 266
260#include "table/linedraw.h" 267/////////////////////////////////////////////////////////////////////////////
261 268
262struct rxvt_font_default : rxvt_font { 269struct rxvt_font_default : rxvt_font {
263 struct rxvt_fontset *fs; 270 struct rxvt_fontset *fs;
264 271
265 rxvt_font_default (rxvt_fontset *fs) 272 rxvt_font_default (rxvt_fontset *fs)
… …
271 rxvt_fontprop properties () 278 rxvt_fontprop properties ()
272 { 279 {
273 rxvt_fontprop p; 280 rxvt_fontprop p;
274 281
275 p.width = p.height = 1; 282 p.width = p.height = 1;
283 p.ascent = rxvt_fontprop::unset;
276 p.weight = rxvt_fontprop::medium; 284 p.weight = rxvt_fontprop::medium;
277 p.slant = rxvt_fontprop::roman; 285 p.slant = rxvt_fontprop::roman;
278 286
279 return p; 287 return p;
280 } 288 }
281 289
282 bool load (const rxvt_fontprop &prop) 290 bool load (const rxvt_fontprop &prop, bool force_prop)
283 { 291 {
284 width = 1; height = 1; 292 width = 1; height = 1;
285 ascent = 1; descent = 0; 293 ascent = 1; descent = 0;
286 294
287 set_name (strdup ("built-in support font")); 295 set_name (strdup ("built-in support font"));
288 296
289 return true; 297 return true;
290 } 298 }
291 299
292 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 300 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
293 { 301 {
294 careful = false; 302 careful = false;
295 303
296 if (unicode <= 0x001f) 304 if (unicode <= 0x001f)
297 return true; 305 return true;
… …
300 return false; 308 return false;
301 309
302 if (unicode <= 0x009f) 310 if (unicode <= 0x009f)
303 return true; 311 return true;
304 312
313#ifdef BUILTIN_GLYPHS
305 if (unicode >= 0x2500 && unicode <= 0x259f) 314 if (unicode >= 0x2500 && unicode <= 0x259f &&
315 !term->option (Opt_skipBuiltinGlyphs))
306 return true; 316 return true;
317#endif
307 318
308 if (IS_COMPOSE (unicode)) 319 if (IS_COMPOSE (unicode))
309 return true; 320 return true;
310 321
311 switch (unicode) 322 switch (unicode)
… …
326void 337void
327rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 338rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
328 const text_t *text, int len, 339 const text_t *text, int len,
329 int fg, int bg) 340 int fg, int bg)
330{ 341{
342 dTermDisplay;
343 dTermGC;
344
331 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 345 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
332 346
333 XSetForeground (d.display->display, TGC, r->pix_colors[fg]); 347 XSetForeground (disp, gc, term->pix_colors[fg]);
334 348
335 while (len--) 349 while (len)
336 { 350 {
337#if ENABLE_COMBINING 351#if ENABLE_COMBINING
338 compose_char *cc; 352 compose_char *cc;
339#endif 353#endif
354 const text_t *tp = text;
340 text_t t = *text++; 355 text_t t = *tp;
341 356
357 while (++text, --len && *text == NOCHAR)
358 ;
359
360 int width = text - tp;
361 int fwidth = term->fwidth * width;
362
363#ifdef BUILTIN_GLYPHS
342 if (0x2500 <= t && t <= 0x259f) 364 if (0x2500 <= t && t <= 0x259f)
343 { 365 {
366# include "table/linedraw.h"
344 uint16_t offs = linedraw_offs[t - 0x2500]; 367 uint16_t offs = linedraw_offs[t - 0x2500];
345 uint32_t *a = linedraw_command + (offs >> 4); 368 uint32_t *a = linedraw_command + (offs >> 4);
346 uint32_t *b = a + (offs & 15); 369 uint32_t *b = a + (offs & 15);
347 370
348 int W = r->TermWin.fwidth; 371 int W = fwidth;
349 int H = r->TermWin.fheight; 372 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 373
356 int x_[16]; 374 int x_[16];
357 int y_[16]; 375 int y_[16];
358 376
359 for (int i = 0; i <= 8; i++) 377 for (int i = 0; i <= 8; i++)
… …
367 385
368 XGCValues gcv; 386 XGCValues gcv;
369 387
370 gcv.cap_style = CapButt; 388 gcv.cap_style = CapButt;
371 gcv.line_width = 0; 389 gcv.line_width = 0;
372 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 390 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
373 391
374 while (a < b) 392 while (a < b)
375 { 393 {
376 uint32_t command = *a++; 394 uint32_t command = *a++;
377 395
… …
384 int y2 = y_[(command >> 0) & 15]; 402 int y2 = y_[(command >> 0) & 15];
385 403
386 switch (op) 404 switch (op)
387 { 405 {
388 case 0: // line 406 case 0: // line
389 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 407 XDrawLine (disp, d, gc, x1, y1, x2, y2);
390 break; 408 break;
391 409
392 case 1: // rectangle, possibly stippled 410 case 1: // rectangle, possibly stippled
393 if (a) 411 if (a)
394 { 412 {
395 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 413 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
396 414
397 gcv.fill_style = FillStippled; 415 gcv.fill_style = FillStippled;
398 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 416 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
399 gcv.ts_x_origin = x; 417 gcv.ts_x_origin = x;
400 gcv.ts_y_origin = y; 418 gcv.ts_y_origin = y;
401 419
402 XChangeGC (d.display->display, TGC, 420 XChangeGC (disp, gc,
403 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 421 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
404 &gcv); 422 &gcv);
405 } 423 }
406 424
407 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 425 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
408 426
409 if (a) 427 if (a)
410 { 428 {
411 XFreePixmap (d.display->display, gcv.stipple); 429 XFreePixmap (disp, gcv.stipple);
412 gcv.stipple = 0; 430 gcv.stipple = 0;
413 gcv.fill_style = FillSolid; 431 gcv.fill_style = FillSolid;
414 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 432 XChangeGC (disp, gc, GCFillStyle, &gcv);
415 } 433 }
416 break; 434 break;
417 case 2: // arc 435 case 2: // arc
418 XDrawArc (d.display->display, d, TGC, 436 XDrawArc (disp, d, gc,
419 x1 - W/2, y1 - H/2, W-1, H-1, 437 x1 - W/2, y1 - H/2, W-1, H-1,
420 (a - 1) * 90*64, (b - 1) * 90*64); 438 (a - 1) * 90*64, (b - 1) * 90*64);
421 break; 439 break;
422 } 440 }
423 } 441 }
424 } 442 }
443#else
444 if (0)
445 ;
446#endif
425#if ENABLE_COMBINING 447#if ENABLE_COMBINING
426 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 448 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
427 { 449 {
450 min_it (width, 2); // we only support wcwidth up to 2
451
428 text_t c2[2]; 452 text_t chrs[2];
429 int len2 = 1; 453 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 454
438 c2[0] = cc->c1; 455 *chrs = cc->c1;
439 rxvt_font *f1 = (*fs)[fs->find_font (c2[0])]; 456 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
440 f1->draw (d, x, y, c2, len2, fg, bg); 457 f1->draw (d, x, y, chrs, width, fg, bg);
441 458
442 if (cc->c2 != NOCHAR) 459 if (cc->c2 != NOCHAR)
443 { 460 {
444 bool careful; 461 bool careful;
445 462
446 // prefer font of first character, for no good reasons 463 // prefer font of first character, for no good reasons
447 c2[0] = cc->c2; 464 *chrs = cc->c2;
448 rxvt_font *f2 = (f1->has_char (c2[0], 0, careful) && !careful) 465 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
449 ? f1 466 ? f1
450 : (*fs)[fs->find_font (c2[0])]; 467 : (*fs)[fs->find_font (cc->c2)];
451 468
452 f2->draw (d, x, y, c2, len2, fg, -1); 469 f2->draw (d, x, y, chrs, width, fg, Color_none);
453 } 470 }
454 } 471 }
455#endif 472#endif
456 else 473 else
457 switch (t) 474 switch (t)
… …
460 case ZERO_WIDTH_CHAR: 477 case ZERO_WIDTH_CHAR:
461 case NOCHAR: 478 case NOCHAR:
462 break; 479 break;
463 480
464 default: 481 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, 482 XDrawRectangle (disp, d, gc, x + 2, y + 2,
474 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); 483 fwidth - 4, term->fheight - 4);
475 x += w;
476 } 484 }
477 485
478 x += r->TermWin.fwidth; 486 x += fwidth;
479 } 487 }
480} 488}
481 489
482///////////////////////////////////////////////////////////////////////////// 490/////////////////////////////////////////////////////////////////////////////
483 491
… …
486 494
487 void clear (); 495 void clear ();
488 496
489 rxvt_fontprop properties (); 497 rxvt_fontprop properties ();
490 498
491 bool load (const rxvt_fontprop &prop); 499 bool load (const rxvt_fontprop &prop, bool force_prop);
492 500
493 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 501 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
494 502
495 void draw (rxvt_drawable &d, int x, int y, 503 void draw (rxvt_drawable &d, int x, int y,
496 const text_t *text, int len, 504 const text_t *text, int len,
497 int fg, int bg); 505 int fg, int bg);
498 506
499 bool slow; // wether this is a proportional font or has other funny characteristics 507 bool slow; // wether this is a proportional font or has other funny characteristics
500 XFontStruct *f; 508 XFontStruct *f;
501 codeset cs;
502 bool enc2b, encm; 509 bool enc2b, encm;
503 510
504 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 511 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); 512 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); 513 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
507 bool set_properties (rxvt_fontprop &p, const char *name); 514 bool set_properties (rxvt_fontprop &p, const char *name);
508}; 515};
509 516
510char * 517char *
511rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 518rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
512{ 519{
513 unsigned long value; 520 unsigned long value;
514 521
515 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 522 if (XGetFontProperty (f, property, &value))
516 return XGetAtomName (DISPLAY, value); 523 return XGetAtomName (term->dpy, value);
517 else 524 else
518 return rxvt_strdup (repl); 525 return repl ? strdup (repl) : 0;
519} 526}
520 527
521rxvt_fontprop 528rxvt_fontprop
522rxvt_font_x11::properties () 529rxvt_font_x11::properties ()
523{ 530{
… …
527} 534}
528 535
529bool 536bool
530rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 537rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
531{ 538{
532 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 539 p.width = width != rxvt_fontprop::unset ? width
540 : avgwidth ? (avgwidth + 1) / 10
541 : (height + 1) / 2;
533 p.height = height; 542 p.height = height;
543 p.ascent = rxvt_fontprop::unset;
534 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 544 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; 545 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
536 546
537 return true; 547 return true;
538} 548}
539 549
540bool 550bool
541rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 551rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
542{ 552{
543 unsigned long height; 553 unsigned long height;
554
555#if 0
544 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 556 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
545 return false; 557 return false;
558#else
559 height = f->ascent + f->descent;
560#endif
546 561
547 unsigned long avgwidth; 562 unsigned long avgwidth;
548 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 563 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
549 avgwidth = 0; 564 avgwidth = 0;
550 565
551 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 566 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
552 char *slant = get_property (f, "SLANT", "r"); 567 char *slant = get_property (f, term->xa [XA_SLANT], "r");
553 568
554 set_properties (p, height, weight, slant, avgwidth); 569 set_properties (p, height, weight, slant, avgwidth);
555 570
556 free (weight); 571 free (weight);
557 free (slant); 572 free (slant);
558 573
574 p.ascent = f->ascent;
575
559 return true; 576 return true;
560} 577}
561 578
562bool 579bool
563rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 580rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
564{ 581{
582 dTermDisplay;
565 int slashes = 0; 583 int slashes = 0;
566 const char *comp[13]; 584 const char *comp[13];
567 585
568 for (const char *c = name; *c; c++) 586 for (const char *c = name; *c; c++)
569 if (*c == '-') 587 if (*c == '-')
… …
577 if (slashes >= 13 595 if (slashes >= 13
578 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 596 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
579 && (*comp[11] >= '0' && *comp[11] <= '9')) 597 && (*comp[11] >= '0' && *comp[11] <= '9'))
580 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 598 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
581 599
582 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 600 XFontStruct *f = XLoadQueryFont (disp, name);
583 601
584 if (f) 602 if (f)
585 { 603 {
586 // the font should really exist now. if not, we have a problem 604 // 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). 605 // (e.g. if the user did xset fp rehash just when we were searching fonts).
588 // in that case, just return garbage. 606 // in that case, just return garbage.
589 bool ret = set_properties (p, f); 607 bool ret = set_properties (p, f);
590 XFreeFont (DISPLAY, f); 608 XFreeFont (disp, f);
591 return ret; 609 return ret;
592 } 610 }
593 else 611 else
594 return false; 612 return false;
595} 613}
596 614
597// fix the size of scalable fonts 615// fix the size of scalable fonts
598static bool 616static bool
599replace_field (char *buf, const char *name, int index, const char old, const char *replace) 617replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
600{ 618{
601 int slashes = 0; 619 int slashes = 0;
602 const char *field, *end; 620 const char *field, *end;
603 621
604 for (const char *c = name; *c; c++) 622 for (const char *c = name; *c; c++)
… …
614 break; 632 break;
615 } 633 }
616 634
617 if (slashes >= 13 && (!old || *field == old)) 635 if (slashes >= 13 && (!old || *field == old))
618 { 636 {
619 // TODO: check for overflow in font-name 637 size_t len = field - name;
620 strncpy (buf, name, field - name); 638 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
621 buf += field - name; 639 memcpy (*ptr, name, len);
622 strcpy (buf, replace); 640 strcpy (*ptr + len, replace);
623 strcat (buf, end); 641 strcat (*ptr, end);
624 642
625 return true; 643 return true;
626 } 644 }
627 else 645 else
628 { 646 {
629 strcpy (buf, name); 647 *ptr = strdup (name);
630 648
631 return false; 649 return false;
632 } 650 }
633} 651}
634 652
635bool 653bool
636rxvt_font_x11::load (const rxvt_fontprop &prop) 654rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
637{ 655{
656 dTermDisplay;
657
638 clear (); 658 clear ();
639 659
640 char field_str[64]; // enough for 128 bits 660 char field_str[64]; // enough for 128 bits
641 661
642 // first morph the font if required 662 // first morph the font if required
643 if (prop.weight != rxvt_fontprop::unset 663 if (force_prop)
644 || prop.slant != rxvt_fontprop::unset)
645 { 664 {
646 char fname[1024]; 665 char *fname;
647 666
648 if (name[0] != '-') 667 if (name[0] != '-')
649 { 668 {
650 f = XLoadQueryFont (DISPLAY, name); 669 f = XLoadQueryFont (disp, name);
651 670
652 if (!f) 671 if (!f)
653 return false; 672 return false;
654 673
655 char *new_name = get_property (f, "FONT", name); 674 char *new_name = get_property (f, XA_FONT, name);
656 675
657 if (new_name) 676 if (new_name)
658 set_name (new_name); 677 set_name (new_name);
659 else 678 else
660 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 679 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
661 680
662 XFreeFont (DISPLAY, f); 681 XFreeFont (disp, f);
663 f = 0; 682 f = 0;
664 } 683 }
665 684
666 if (prop.weight != rxvt_fontprop::unset) 685 if (prop.weight != rxvt_fontprop::unset)
667 { 686 {
668 replace_field (fname, name, 2, 0, 687 replace_field (&fname, name, 2, 0,
669 prop.weight < rxvt_fontprop::bold 688 prop.weight < rxvt_fontprop::bold
670 ? "medium" : "bold"); 689 ? "medium" : "bold");
671 set_name (strdup (fname)); 690 set_name (fname);
672 } 691 }
673 692
674 if (prop.slant != rxvt_fontprop::unset) 693 if (prop.slant != rxvt_fontprop::unset)
675 { 694 {
676 replace_field (fname, name, 3, 0, 695 replace_field (&fname, name, 3, 0,
677 prop.slant < rxvt_fontprop::italic 696 prop.slant < rxvt_fontprop::italic
678 ? "r" : "i"); // TODO: handle "o"blique, too 697 ? "r" : "i"); // TODO: handle "o"blique, too
679 set_name (strdup (fname)); 698 set_name (fname);
680 } 699 }
700 }
701
702 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
703 ? 0 : prop.height);
704
705 struct font_weight {
706 char *name;
707 int diff;
708
709 void clear ()
681 } 710 {
711 name = 0;
712 diff = 0x7fffffff;
713 }
714
715 font_weight () { clear (); }
716 ~font_weight () { free (name); }
717 };
682 718
683 char **list; 719 char **list;
684 int count; 720 int count;
685 list = XListFonts (DISPLAY, name, 1024, &count); 721 list = XListFonts (disp, name, 4000, &count);
686 722
687 set_name (0); 723 set_name (0);
688 724
689 if (!list) 725 if (!list)
690 return false; 726 return false;
691 727
692 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 728 font_weight *fonts = new font_weight[count];
693 ? 0 : prop.height);
694 729
695 int bestdiff = 0x7fffffff;
696 for (int i = 0; i < count; i++) 730 for (int i = 0; i < count; i++)
697 { 731 {
698 rxvt_fontprop p; 732 rxvt_fontprop p;
699 char fname[1024]; 733 char *fname;
700 734
701 int diff = 0; 735 int diff = 0;
702 736
703 if (replace_field (fname, list[i], 6, '0', field_str)) 737 if (replace_field (&fname, list[i], 6, '0', field_str))
704 diff += 10; // slightly penalize scalable fonts 738 diff += 10; // slightly penalize scalable fonts
739 else
740 {
741 free (fname);
742 if (replace_field (&fname, list[i], 11, '0', "0"))
743 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
744 }
705 745
706 if (!set_properties (p, fname)) 746 if (!set_properties (p, fname))
707 continue; 747 continue;
708 748
709 if (prop.height != rxvt_fontprop::unset 749 if (prop.height != rxvt_fontprop::unset
… …
713 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 753 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); 754 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); 755 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); 756 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
717 757
718 if (!name // compare against best found so far 758 fonts[i].name = fname;
719 || diff < bestdiff) 759 fonts[i].diff = diff;
720 {
721 set_name (strdup (fname));
722 bestdiff = diff;
723 }
724 } 760 }
725 761
726 XFreeFontNames (list); 762 XFreeFontNames (list);
727 763
728 if (!name) 764 // this loop only iterates when the guessed font-size is too small
729 return false; 765 for (;;)
766 {
767 font_weight *best = fonts + count - 1;
730 768
731 f = XLoadQueryFont (DISPLAY, name); 769 for (font_weight *w = best; w-- > fonts; )
770 if (w->diff <= best->diff)
771 best = w;
772
773 if (!best->name
774 || !(f = XLoadQueryFont (disp, best->name)))
775 break;
776
777 set_name (best->name);
778 best->clear ();
779
780 ascent = f->ascent;
781 descent = f->descent;
782 height = ascent + descent;
783
784 if (prop.height == rxvt_fontprop::unset
785 || height <= prop.height)
786 break; // font is ready for use
787
788 // PIXEL_SIZE small enough, but real height too large
789 clear ();
790 }
791
792 delete [] fonts;
732 793
733 if (!f) 794 if (!f)
734 return false; 795 return false;
735 796
736 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 797 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
737 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 798 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
738 799
739 if (registry && encoding) 800 if (registry && encoding)
740 { 801 {
741 char charset[64]; 802 char charset[64];
742 snprintf (charset, 64, "%s-%s", registry, encoding); 803 snprintf (charset, 64, "%s-%s", registry, encoding);
743 804
744 cs = codeset_from_name (charset); 805 cs = codeset_from_name (charset);
745 } 806 }
746 else 807 else
747 { 808 {
748 const char *charset = get_property (f, "FONT", 0); 809 const char *charset = get_property (f, XA_FONT, 0);
749 810
750 if (!charset) 811 if (!charset)
751 charset = name; 812 charset = name;
752 813
753 int count = 13; 814 int count = 13;
… …
765 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 826 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
766 827
767 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 828 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
768 enc2b = encm || f->max_char_or_byte2 > 255; 829 enc2b = encm || f->max_char_or_byte2 > 255;
769 830
770 ascent = f->ascent;
771 descent = f->descent;
772 height = ascent + descent;
773
774 slow = false; 831 slow = false;
775 832
776#if 1 // only used for slow detection, TODO optimize 833#if 1 // only used for slow detection, TODO optimize
777 if (f->min_bounds.width == f->max_bounds.width) 834 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; 835 width = f->max_bounds.width;
781 else 836 else
782 { 837 {
783 slow = true; 838 slow = true;
784 839
785 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 840 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
786 841
787 if (encm) 842 if (encm)
788 N += (f->max_byte1 - f->min_byte1) 843 N += (f->max_byte1 - f->min_byte1)
789 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 844 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
790 845
791 while (N) 846 while (N)
792 { 847 {
793 if (f->per_char[N].width > width) 848 if (f->per_char[N].width > width)
794 width = f->per_char[N].width; 849 width = f->per_char[N].width;
795 850
… …
800 855
801 width = 1; 856 width = 1;
802 857
803 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 858 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
804 { 859 {
805 if (cs != CS_UNICODE
806 && *t > 0x100
807 && FROM_UNICODE (cs, *t) == NOCHAR) 860 if (FROM_UNICODE (cs, *t) == NOCHAR)
808 continue; 861 continue;
809 862
810 // ignore characters we wouldn't use anyways 863 // ignore characters we wouldn't use anyways
811 bool careful; 864 bool careful;
812 if (!has_char (*t, &prop, careful)) 865 if (!has_char (*t, &prop, careful))
… …
816 869
817 XCharStruct g; 870 XCharStruct g;
818 int dir_ret, asc_ret, des_ret; 871 int dir_ret, asc_ret, des_ret;
819 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 872 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
820 873
821 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 874 int wcw = WCWIDTH (*t);
875 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
822 876
823 if (width < g.width) width = g.width; 877 if (width < g.width) width = g.width;
824 } 878 }
825 879
826 if (cs == CS_UNKNOWN) 880 if (cs == CS_UNKNOWN)
827 { 881 {
828 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 882 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
845void 899void
846rxvt_font_x11::clear () 900rxvt_font_x11::clear ()
847{ 901{
848 if (f) 902 if (f)
849 { 903 {
850 XFreeFont (DISPLAY, f); 904 XFreeFont (term->dpy, f);
851 f = 0; 905 f = 0;
852 } 906 }
853} 907}
854 908
855bool 909bool
856rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 910rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
857{ 911{
858 uint32_t ch = FROM_UNICODE (cs, unicode); 912 uint32_t ch = FROM_UNICODE (cs, unicode);
859 913
860 if (ch == NOCHAR) 914 if (ch == NOCHAR)
861 return false; 915 return false;
… …
898 return false; 952 return false;
899 953
900 if (!prop || prop->width == rxvt_fontprop::unset) 954 if (!prop || prop->width == rxvt_fontprop::unset)
901 return true; 955 return true;
902 956
903 // check character against base font bounding box 957 // check wether character overlaps previous/next character
904 int w = xcs->width; 958 int w = xcs->rbearing - xcs->lbearing;
905 int wcw = wcwidth (unicode); 959 int wcw = max (WCWIDTH (unicode), 1);
906 if (wcw > 0) w /= wcw;
907 960
908 careful = w > prop->width; 961 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
909 if (careful && w > prop->width * MAX_OVERLAP >> 2) 962
963 if (careful && !OVERLAP_OK (w, wcw, prop))
910 return false; 964 return false;
911 965
912 return true; 966 return true;
913} 967}
914 968
… …
920 // this looks like a mess /. 974 // this looks like a mess /.
921 // and it is a mess /. 975 // and it is a mess /.
922 // yet we are trying to be perfect /. 976 // yet we are trying to be perfect /.
923 // but the result still isn't perfect /. 977 // but the result still isn't perfect /.
924 978
979 dTermDisplay;
980 dTermGC;
981
925 bool slow = this->slow 982 bool slow = this->slow
926 || width != r->TermWin.fwidth 983 || width != term->fwidth
927 || height != r->TermWin.fheight; 984 || height != term->fheight;
928 985
929 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 986 int base = ascent; // sorry, incorrect: term->fbase;
930 987
931 XGCValues v; 988 XGCValues v;
932 v.foreground = r->pix_colors[fg]; 989 v.foreground = term->pix_colors[fg];
933 v.font = f->fid; 990 v.font = f->fid;
934 991
935 if (enc2b) 992 if (enc2b)
936 { 993 {
937 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 994 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
938 995
939 if (bg == Color_bg && !slow) 996 if (bg == Color_bg && !slow)
940 { 997 {
941 v.background = r->pix_colors[bg]; 998 v.background = term->pix_colors[bg];
942 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 999 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
943 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 1000 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
944 } 1001 }
945 else 1002 else
946 { 1003 {
947 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1004 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
948 1005
949 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1006 XChangeGC (disp, gc, GCForeground | GCFont, &v);
950 1007
951 if (slow) 1008 if (slow)
952 { 1009 {
953 do 1010 do
954 { 1011 {
955 if (xc->byte1 || xc->byte2) 1012 if (xc->byte1 || xc->byte2)
956 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1013 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
957 1014
958 x += r->TermWin.fwidth; 1015 x += term->fwidth;
959 xc++; len--; 1016 xc++; len--;
960 } 1017 }
961 while (len); 1018 while (len);
962 } 1019 }
963 else 1020 else
964 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1021 XDrawString16 (disp, d, gc, x, y + base, xc, len);
965 } 1022 }
966 } 1023 }
967 else 1024 else
968 { 1025 {
969 const char *xc = enc_char (text, len, cs, slow); 1026 const char *xc = enc_char (text, len, cs, slow);
970 1027
971 if (bg == Color_bg && !slow) 1028 if (bg == Color_bg && !slow)
972 { 1029 {
973 v.background = r->pix_colors[bg]; 1030 v.background = term->pix_colors[bg];
974 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1031 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
975 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1032 XDrawImageString (disp, d, gc, x, y + base, xc, len);
976 } 1033 }
977 else 1034 else
978 { 1035 {
979 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1036 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
980 1037
981 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1038 XChangeGC (disp, gc, GCForeground | GCFont, &v);
982 1039
983 if (slow) 1040 if (slow)
984 { 1041 {
985 do 1042 do
986 { 1043 {
987 if (*xc) 1044 if (*xc)
988 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1045 XDrawString (disp, d, gc, x, y + base, xc, 1);
989 1046
990 x += r->TermWin.fwidth; 1047 x += term->fwidth;
991 xc++; len--; 1048 xc++; len--;
992 } 1049 }
993 while (len); 1050 while (len);
994 } 1051 }
995 else 1052 else
996 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1053 XDrawString (disp, d, gc, x, y + base, xc, len);
997 } 1054 }
998 } 1055 }
999} 1056}
1000 1057
1001///////////////////////////////////////////////////////////////////////////// 1058/////////////////////////////////////////////////////////////////////////////
… …
1007 1064
1008 void clear (); 1065 void clear ();
1009 1066
1010 rxvt_fontprop properties (); 1067 rxvt_fontprop properties ();
1011 1068
1012 bool load (const rxvt_fontprop &prop); 1069 bool load (const rxvt_fontprop &prop, bool force_prop);
1013 1070
1014 void draw (rxvt_drawable &d, int x, int y, 1071 void draw (rxvt_drawable &d, int x, int y,
1015 const text_t *text, int len, 1072 const text_t *text, int len,
1016 int fg, int bg); 1073 int fg, int bg);
1017 1074
1018 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1075 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1019 1076
1020protected: 1077protected:
1021 XftFont *f; 1078 XftFont *f;
1022}; 1079};
1023 1080
1024void 1081void
1025rxvt_font_xft::clear () 1082rxvt_font_xft::clear ()
1026{ 1083{
1027 if (f) 1084 if (f)
1028 { 1085 {
1029 XftFontClose (DISPLAY, f); 1086 XftFontClose (term->dpy, f);
1030 f = 0; 1087 f = 0;
1031 } 1088 }
1032} 1089}
1033 1090
1034rxvt_fontprop 1091rxvt_fontprop
… …
1038 1095
1039 FT_Face face = XftLockFace (f); 1096 FT_Face face = XftLockFace (f);
1040 1097
1041 p.width = width; 1098 p.width = width;
1042 p.height = height; 1099 p.height = height;
1100 p.ascent = ascent;
1043 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1101 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1044 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1102 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1045 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1103 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1046 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1104 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1047 1105
… …
1049 1107
1050 return p; 1108 return p;
1051} 1109}
1052 1110
1053bool 1111bool
1054rxvt_font_xft::load (const rxvt_fontprop &prop) 1112rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1055{ 1113{
1114 dTermDisplay;
1115
1056 clear (); 1116 clear ();
1057 1117
1058 FcPattern *p = FcNameParse ((FcChar8 *) name); 1118 FcPattern *p = FcNameParse ((FcChar8 *) name);
1059 1119
1060 if (!p) 1120 if (!p)
1061 return false; 1121 return false;
1062 1122
1063 FcValue v; 1123 FcValue v;
1064 1124
1065 if (prop.height != rxvt_fontprop::unset 1125 if (prop.height != rxvt_fontprop::unset
1066 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1126 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1067 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1127 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1068 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1128 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1069 1129
1070 if (prop.weight != rxvt_fontprop::unset 1130 if (prop.weight != rxvt_fontprop::unset
1071 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1131 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1072 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1132 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1073 1133
1074 if (prop.slant != rxvt_fontprop::unset 1134 if (prop.slant != rxvt_fontprop::unset
1075 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1135 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1076 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1136 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1077 1137
1078#if 0 // clipping unfortunately destroys our precious double-width-characters 1138#if 0 // clipping unfortunately destroys our precious double-width-characters
1079 // clip width, we can't do better, or can we? 1139 // clip width, we can't do better, or can we?
1080 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1140 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1086 1146
1087 // store generated name so iso14755 view gives better results 1147 // store generated name so iso14755 view gives better results
1088 set_name ((char *)FcNameUnparse (p)); 1148 set_name ((char *)FcNameUnparse (p));
1089 1149
1090 XftResult result; 1150 XftResult result;
1091 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1151 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1092 1152
1093 FcPatternDestroy (p); 1153 FcPatternDestroy (p);
1094 1154
1095 if (!match) 1155 if (!match)
1096 return false; 1156 return false;
… …
1098 int ftheight = 0; 1158 int ftheight = 0;
1099 bool success = true; 1159 bool success = true;
1100 1160
1101 for (;;) 1161 for (;;)
1102 { 1162 {
1103 f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); 1163 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
1104 1164
1105 if (!f) 1165 if (!f)
1106 { 1166 {
1107 success = false; 1167 success = false;
1108 break; 1168 break;
… …
1117 1177
1118 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1178 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1119 1179
1120 XftUnlockFace (f); 1180 XftUnlockFace (f);
1121 1181
1182 int glheight = height;
1183
1122 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1184 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1123 { 1185 {
1124 FcChar16 ch = *t; 1186 FcChar16 ch = *t;
1125 1187
1126 if (cs != CS_UNICODE 1188 if (cs != CS_UNICODE
… …
1132 bool careful; 1194 bool careful;
1133 if (!has_char (*t, &prop, careful)) 1195 if (!has_char (*t, &prop, careful))
1134 continue; 1196 continue;
1135 1197
1136 XGlyphInfo g; 1198 XGlyphInfo g;
1137 XftTextExtents16 (DISPLAY, f, &ch, 1, &g); 1199 XftTextExtents16 (disp, f, &ch, 1, &g);
1138 1200
1201 g.width -= g.x;
1202
1139 int wcw = wcwidth (ch); 1203 int wcw = WCWIDTH (ch);
1140 if (wcw > 0) g.width = g.width / wcw; 1204 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1141 1205
1142 if (width < g.width) width = g.width; 1206 if (width < g.width ) width = g.width;
1143 if (height < g.height) height = g.height; 1207 if (height < g.height ) height = g.height;
1208 if (glheight < g.height - g.y) glheight = g.height - g.y;
1209 }
1210
1211 if (!width)
1212 {
1213 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1214
1215 XftFontClose (disp, f);
1216 f = 0;
1217
1218 success = false;
1219 break;
1144 } 1220 }
1145 1221
1146 if (prop.height == rxvt_fontprop::unset 1222 if (prop.height == rxvt_fontprop::unset
1147 || height <= prop.height 1223 || (height <= prop.height && glheight <= prop.height)
1148 || height <= 2 1224 || height <= 2
1149 || !scalable) 1225 || !scalable)
1150 break; 1226 break;
1151 1227
1152 if (ftheight) 1228 if (ftheight)
… …
1159 ftheight -= height - prop.height; 1235 ftheight -= height - prop.height;
1160 } 1236 }
1161 else 1237 else
1162 ftheight = prop.height - 1; 1238 ftheight = prop.height - 1;
1163 1239
1164 XftFontClose (DISPLAY, f); 1240 XftFontClose (disp, f);
1165 FcPatternDel (match, FC_PIXEL_SIZE); 1241 FcPatternDel (match, FC_PIXEL_SIZE);
1166 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1242 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1167 } 1243 }
1168 1244
1169 FcPatternDestroy (match); 1245 FcPatternDestroy (match);
1170 1246
1171#if 0 // do it per-character 1247#if 0 // do it per-character
… …
1178 1254
1179 return success; 1255 return success;
1180} 1256}
1181 1257
1182bool 1258bool
1183rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1259rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1184{ 1260{
1185 careful = false; 1261 careful = false;
1186 1262
1187 if (!XftCharExists (DISPLAY, f, unicode)) 1263 if (!XftCharExists (term->dpy, f, unicode))
1188 return false; 1264 return false;
1189 1265
1190 if (!prop || prop->width == rxvt_fontprop::unset) 1266 if (!prop || prop->width == rxvt_fontprop::unset)
1191 return true; 1267 return true;
1192 1268
1193 // check character against base font bounding box 1269 // check character against base font bounding box
1194 FcChar32 ch = unicode; 1270 FcChar32 ch = unicode;
1195 XGlyphInfo g; 1271 XGlyphInfo g;
1196 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1272 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1197 1273
1198 int w = g.width; 1274 int w = g.width - g.x;
1199 int wcw = wcwidth (unicode); 1275 int wcw = max (WCWIDTH (unicode), 1);
1200 if (wcw > 0) w /= wcw;
1201 1276
1202 careful = w > prop->width; 1277 careful = g.x > 0 || w > prop->width * wcw;
1203 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1278
1279 if (careful && !OVERLAP_OK (w, wcw, prop))
1280 return false;
1281
1282 // this weeds out _totally_ broken fonts, or glyphs
1283 if (!OVERLAP_OK (g.xOff, wcw, prop))
1204 return false; 1284 return false;
1205 1285
1206 return true; 1286 return true;
1207} 1287}
1208 1288
1209void 1289void
1210rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1290rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1211 const text_t *text, int len, 1291 const text_t *text, int len,
1212 int fg, int bg) 1292 int fg, int bg)
1213{ 1293{
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; 1294 XGlyphInfo extents;
1219 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1295 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1220 FcChar32 *ep = enc; 1296 XftGlyphSpec *ep = enc;
1221 int ewidth = 0; 1297
1222 int xoff = 0; 1298 dTermDisplay;
1299 dTermGC;
1300
1301 int w = term->fwidth * len;
1302 int h = term->fheight;
1303
1304 /*
1305 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1306 * good idea from the perspective of packaging for wide variety of user configs.
1307 */
1308 bool buffered = bg >= Color_transparent;
1309#ifdef FORCE_UNBUFFERED_XFT
1310 buffered = false;
1311#endif
1312
1313 // cut trailing spaces
1314 while (len && text [len - 1] == ' ')
1315 len--;
1316
1317 int x_ = buffered ? 0 : x;
1318 int y_ = buffered ? 0 : y;
1223 1319
1224 while (len) 1320 while (len)
1225 { 1321 {
1226 int cwidth = r->TermWin.fwidth; 1322 int cwidth = term->fwidth;
1227 FcChar32 fc = *text++; len--; 1323 FcChar32 fc = *text++; len--;
1228 FT_UInt gl;
1229 1324
1230 while (len && *text == NOCHAR) 1325 while (len && *text == NOCHAR)
1231 text++, len--, cwidth += r->TermWin.fwidth; 1326 text++, len--, cwidth += term->fwidth;
1232
1233 gl = XftCharIndex (d.display->display, f, fc);
1234 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1235 1327
1236 if (extents.xOff != cwidth && ep != enc) 1328 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 } 1329 {
1330 FT_UInt glyph = XftCharIndex (disp, f, fc);
1331 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1248 1332
1249 if (fc == ' ' && ep == enc) // skip leading spaces 1333 ep->glyph = glyph;
1334 ep->x = x_ + (cwidth - extents.xOff >> 1);
1335 ep->y = y_ + ascent;
1336
1337 if (extents.xOff == 0)
1338 ep->x = x_ + cwidth;
1339
1340 ep++;
1250 { 1341 }
1342
1251 x += cwidth; 1343 x_ += cwidth;
1252 continue; 1344 }
1345
1346 if (buffered)
1347 {
1348 if (ep != enc)
1253 } 1349 {
1350 bool back_rendered = false;
1351 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1254 1352
1353#ifdef HAVE_BG_PIXMAP
1354 if (term->bgPixmap.pixmap)
1355 {
1356 Picture dst = 0;
1357
1358 if (bg >= 0 && term->pix_colors[bg].is_opaque ())
1359 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1360 else
1361 dst = XftDrawPicture (d2);
1362
1363 if (dst)
1364 {
1365 int src_x = x, src_y = y;
1366
1367 if (term->bgPixmap.is_parentOrigin ())
1368 {
1369 src_x += term->window_vt_x;
1370 src_y += term->window_vt_y;
1371 }
1372
1373 if (term->bgPixmap.pmap_width >= src_x+w
1374 && term->bgPixmap.pmap_height >= src_y+h)
1375 {
1376 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1377 src_x, src_y, w, h, 0, 0);
1378 }
1379 else
1380 {
1381 XGCValues gcv;
1382
1383 gcv.fill_style = FillTiled;
1384 gcv.tile = term->bgPixmap.pixmap;
1385 gcv.ts_x_origin = -src_x;
1386 gcv.ts_y_origin = -src_y;
1387
1388 XChangeGC (disp, gc,
1389 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1390 &gcv);
1391
1392 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1393
1394 gcv.fill_style = FillSolid;
1395 XChangeGC (disp, gc, GCFillStyle, &gcv);
1396 }
1397
1398 if (bg >= 0)
1399 {
1400 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1401 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1402 }
1403
1404 back_rendered = true;
1405 }
1406 }
1407#endif
1408
1409 if (!back_rendered)
1410 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h);
1411
1412 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1413 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1414 }
1255 else 1415 else
1256 { 1416 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 { 1417 }
1265 if (xoff > ewidth) xoff = ewidth; 1418 else
1266 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1267 x + (ewidth - xoff >> 1),
1268 y + base, enc, ep - enc);
1269 } 1419 {
1420 clear_rect (d, x, y, w, h, bg);
1421 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1422 }
1270} 1423}
1424
1271#endif 1425#endif
1272 1426
1273///////////////////////////////////////////////////////////////////////////// 1427/////////////////////////////////////////////////////////////////////////////
1274 1428
1275rxvt_fontset::rxvt_fontset (rxvt_t r) 1429rxvt_fontset::rxvt_fontset (rxvt_term *term)
1276: r (r), fontdesc (0) 1430: fontdesc (0), term (term)
1277{ 1431{
1278 clear (); 1432 clear ();
1279} 1433}
1280 1434
1281rxvt_fontset::~rxvt_fontset () 1435rxvt_fontset::~rxvt_fontset ()
… …
1284} 1438}
1285 1439
1286void 1440void
1287rxvt_fontset::clear () 1441rxvt_fontset::clear ()
1288{ 1442{
1289 prop.width = prop.height = prop.weight = prop.slant 1443 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1290 = rxvt_fontprop::unset; 1444 = rxvt_fontprop::unset;
1445 force_prop = false;
1291 1446
1292 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1447 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1293 FONT_UNREF (*i); 1448 FONT_UNREF (*i);
1294 1449
1295 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1450 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1304 1459
1305rxvt_font * 1460rxvt_font *
1306rxvt_fontset::new_font (const char *name, codeset cs) 1461rxvt_fontset::new_font (const char *name, codeset cs)
1307{ 1462{
1308 rxvt_font *f; 1463 rxvt_font *f;
1309 1464
1310 if (!name || !*name) 1465 if (!name || !*name)
1311 { 1466 {
1312 name = ""; 1467 name = "";
1313 f = new rxvt_font_default (this); 1468 f = new rxvt_font_default (this);
1314 } 1469 }
… …
1325 f = new rxvt_font_x11; 1480 f = new rxvt_font_x11;
1326 } 1481 }
1327 else 1482 else
1328 f = new rxvt_font_x11; 1483 f = new rxvt_font_x11;
1329 1484
1330 f->set_term (r); 1485 f->set_term (term);
1331 f->set_name (strdup (name)); 1486 f->set_name (strdup (name));
1332 1487
1333 f->cs = cs; 1488 f->cs = cs;
1334 f->loaded = false; 1489 f->loaded = false;
1335 1490
… …
1346 char buf[512]; 1501 char buf[512];
1347 const char *end; 1502 const char *end;
1348 1503
1349 do 1504 do
1350 { 1505 {
1351 while (*desc <= ' ') desc++; 1506 while (*desc && *desc <= ' ')
1507 desc++;
1352 1508
1353 codeset cs = CS_UNICODE; 1509 codeset cs = CS_UNICODE;
1354 1510
1355 if (*desc == '[') 1511 if (*desc == '[')
1356 { 1512 {
… …
1381 if (!end) 1537 if (!end)
1382 end = desc + strlen (desc); 1538 end = desc + strlen (desc);
1383 1539
1384 if (end - desc < 511) 1540 if (end - desc < 511)
1385 { 1541 {
1386 strncpy (buf, desc, end - desc); 1542 memcpy (buf, desc, end - desc);
1387 buf[end - desc] = 0; 1543 buf[end - desc] = 0;
1388 1544
1389 fonts.push_back (new_font (buf, cs)); 1545 fonts.push_back (new_font (buf, cs));
1390 } 1546 }
1391 else 1547 else
… …
1406 if (fonts[i]->loaded) 1562 if (fonts[i]->loaded)
1407 return true; 1563 return true;
1408 1564
1409 fonts[i]->loaded = true; 1565 fonts[i]->loaded = true;
1410 1566
1411 if (!fonts[i]->load (prop)) 1567 if (!fonts[i]->load (prop, force_prop))
1412 { 1568 {
1413 fonts[i]->cs = CS_UNKNOWN; 1569 fonts[i]->cs = CS_UNKNOWN;
1414 return false; 1570 return false;
1415 } 1571 }
1416 1572
… …
1466 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1622 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1467 goto next_font; 1623 goto next_font;
1468 1624
1469 if (!realize_font (i)) 1625 if (!realize_font (i))
1470 goto next_font; 1626 goto next_font;
1627
1628 if (prop.ascent != rxvt_fontprop::unset)
1629 max_it (f->ascent, prop.ascent);
1471 } 1630 }
1472 1631
1473 if (f->cs == CS_UNKNOWN) 1632 if (f->cs == CS_UNKNOWN)
1474 goto next_font; 1633 goto next_font;
1475 1634
… …
1514 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1673 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1515 FcPatternAddBool (p, FC_MINSPACE, 1); 1674 FcPatternAddBool (p, FC_MINSPACE, 1);
1516 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1675 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1517 1676
1518 XftResult result; 1677 XftResult result;
1519 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1678 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1520 1679
1521 FcPatternDestroy (p); 1680 FcPatternDestroy (p);
1522 1681
1523 if (match) 1682 if (match)
1524 { 1683 {
… …
1529 if (find_font (font) < 0) 1688 if (find_font (font) < 0)
1530 { 1689 {
1531 char fontname[4096]; 1690 char fontname[4096];
1532 sprintf (fontname, "xft:%-.4090s", font); 1691 sprintf (fontname, "xft:%-.4090s", font);
1533 1692
1534 fonts.push_back (new_font (fontname, CS_UNICODE)); 1693 fonts.push_back (new_font (fontname, CS_UNICODE));
1535 } 1694 }
1536 1695
1537 free (font); 1696 free (font);
1538 } 1697 }
1539#endif 1698#endif

Diff Legend

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