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.48 by root, Sun Nov 21 20:19:24 2004 UTC vs.
Revision 1.155 by root, Tue Mar 30 23:00:35 2010 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-2008 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
… …
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
84 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
80 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
81 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
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/////////////////////////////////////////////////////////////////////////////
233 214
215rxvt_font::rxvt_font ()
216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217{
218}
219
234void 220void
235rxvt_font::set_name (char *name) 221rxvt_font::set_name (char *name_)
236{ 222{
237 if (this->name == name) 223 if (name == name_)
238 return; 224 return;
239 225
240 if (this->name) free (this->name); // let the compiler optimize 226 if (name) free (name); // let the compiler optimize
241 this->name = name; 227 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 Picture dst;
242
243# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap
245 && !term->pix_colors[color].is_opaque ()
246 && ((dst = XftDrawPicture (d))))
247 {
248 XClearArea (disp, d, x, y, w, h, false);
249
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
251 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 }
253 else
254# endif
252 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 255 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
256
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 370
351 int x_[16]; 371 int x_[16];
352 int y_[16]; 372 int y_[16];
353 373
354 for (int i = 0; i <= 8; i++) 374 for (int i = 0; i <= 8; i++)
… …
362 382
363 XGCValues gcv; 383 XGCValues gcv;
364 384
365 gcv.cap_style = CapButt; 385 gcv.cap_style = CapButt;
366 gcv.line_width = 0; 386 gcv.line_width = 0;
367 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 387 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
368 388
369 while (a < b) 389 while (a < b)
370 { 390 {
371 uint32_t command = *a++; 391 uint32_t command = *a++;
372 392
… …
379 int y2 = y_[(command >> 0) & 15]; 399 int y2 = y_[(command >> 0) & 15];
380 400
381 switch (op) 401 switch (op)
382 { 402 {
383 case 0: // line 403 case 0: // line
384 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 404 XDrawLine (disp, d, gc, x1, y1, x2, y2);
385 break; 405 break;
386 406
387 case 1: // rectangle, possibly stippled 407 case 1: // rectangle, possibly stippled
388 if (a) 408 if (a)
389 { 409 {
390 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 410 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
391 411
392 gcv.fill_style = FillStippled; 412 gcv.fill_style = FillStippled;
393 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 413 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
394 gcv.ts_x_origin = x; 414 gcv.ts_x_origin = x;
395 gcv.ts_y_origin = y; 415 gcv.ts_y_origin = y;
396 416
397 XChangeGC (d.display->display, TGC, 417 XChangeGC (disp, gc,
398 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 418 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
399 &gcv); 419 &gcv);
400 } 420 }
401 421
402 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);
403 423
404 if (a) 424 if (a)
405 { 425 {
406 XFreePixmap (d.display->display, gcv.stipple); 426 XFreePixmap (disp, gcv.stipple);
407 gcv.stipple = 0; 427 gcv.stipple = 0;
408 gcv.fill_style = FillSolid; 428 gcv.fill_style = FillSolid;
409 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 429 XChangeGC (disp, gc, GCFillStyle, &gcv);
410 } 430 }
411 break; 431 break;
412 case 2: // arc 432 case 2: // arc
413 XDrawArc (d.display->display, d, TGC, 433 XDrawArc (disp, d, gc,
414 x1 - W/2, y1 - H/2, W-1, H-1, 434 x1 - W/2, y1 - H/2, W-1, H-1,
415 (a - 1) * 90*64, (b - 1) * 90*64); 435 (a - 1) * 90*64, (b - 1) * 90*64);
416 break; 436 break;
417 } 437 }
418 } 438 }
419 } 439 }
440#else
441 if (0)
442 ;
443#endif
420#if ENABLE_COMBINING 444#if ENABLE_COMBINING
421 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
422 { 446 {
447 min_it (width, 2); // we only support wcwidth up to 2
448
423 text_t c2[2]; 449 text_t chrs[2];
424 int len2 = 1; 450 chrs [1] = NOCHAR;
425
426 // support double-width (but not more) combining characters
427 if (len && *text == NOCHAR)
428 {
429 c2[1] = *text; // not text++ to get correct x-width
430 len2++;
431 }
432 451
433 c2[0] = cc->c1; 452 *chrs = cc->c1;
434 rxvt_font *f1 = (*fs)[fs->find_font (c2[0])]; 453 rxvt_font *f1 = fs->get (cc->c1);
435 f1->draw (d, x, y, c2, len2, fg, bg); 454 f1->draw (d, x, y, chrs, width, fg, bg);
436 455
437 if (cc->c2 != NOCHAR) 456 if (cc->c2 != NOCHAR)
438 { 457 {
439 bool careful; 458 bool careful;
440 459
441 // prefer font of first character, for no good reasons 460 // prefer font of first character, for no good reasons
442 c2[0] = cc->c2; 461 *chrs = cc->c2;
443 rxvt_font *f2 = (f1->has_char (c2[0], 0, careful) && !careful) 462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
444 ? f1 463 ? f1
445 : (*fs)[fs->find_font (c2[0])]; 464 : fs->get (cc->c2);
446 465
447 f2->draw (d, x, y, c2, len2, fg, -1); 466 f2->draw (d, x, y, chrs, width, fg, Color_none);
448 } 467 }
449 } 468 }
450#endif 469#endif
451 else 470 else
452 switch (t) 471 switch (t)
… …
455 case ZERO_WIDTH_CHAR: 474 case ZERO_WIDTH_CHAR:
456 case NOCHAR: 475 case NOCHAR:
457 break; 476 break;
458 477
459 default: 478 default:
460 int w = 0;
461 while (len > 0 && *text == NOCHAR)
462 {
463 ++text;
464 --len;
465 w += r->TermWin.fwidth;
466 }
467
468 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, 479 XDrawRectangle (disp, d, gc, x + 2, y + 2,
469 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); 480 fwidth - 4, term->fheight - 4);
470 x += w;
471 } 481 }
472 482
473 x += r->TermWin.fwidth; 483 x += fwidth;
474 } 484 }
475} 485}
476 486
477///////////////////////////////////////////////////////////////////////////// 487/////////////////////////////////////////////////////////////////////////////
478 488
… …
481 491
482 void clear (); 492 void clear ();
483 493
484 rxvt_fontprop properties (); 494 rxvt_fontprop properties ();
485 495
486 bool load (const rxvt_fontprop &prop); 496 bool load (const rxvt_fontprop &prop, bool force_prop);
487 497
488 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;
489 499
490 void draw (rxvt_drawable &d, int x, int y, 500 void draw (rxvt_drawable &d, int x, int y,
491 const text_t *text, int len, 501 const text_t *text, int len,
492 int fg, int bg); 502 int fg, int bg);
493 503
494 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
495 XFontStruct *f; 505 XFontStruct *f;
496 codeset cs;
497 bool enc2b, encm; 506 bool enc2b, encm;
498 507
499 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 508 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
500 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);
501 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 510 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
502 bool set_properties (rxvt_fontprop &p, const char *name); 511 bool set_properties (rxvt_fontprop &p, const char *name);
503}; 512};
504 513
505char * 514char *
506rxvt_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
507{ 516{
508 unsigned long value; 517 unsigned long value;
509 518
510 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 519 if (XGetFontProperty (f, property, &value))
511 return XGetAtomName (DISPLAY, value); 520 return XGetAtomName (term->dpy, value);
512 else 521 else
513 return rxvt_strdup (repl); 522 return repl ? strdup (repl) : 0;
514} 523}
515 524
516rxvt_fontprop 525rxvt_fontprop
517rxvt_font_x11::properties () 526rxvt_font_x11::properties ()
518{ 527{
… …
522} 531}
523 532
524bool 533bool
525rxvt_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)
526{ 535{
527 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;
528 p.height = height; 539 p.height = height;
540 p.ascent = rxvt_fontprop::unset;
529 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;
530 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;
531 543
532 return true; 544 return true;
533} 545}
534 546
535bool 547bool
536rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 548rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
537{ 549{
538 unsigned long height; 550 unsigned long height;
551
552#if 0
539 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 553 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
540 return false; 554 return false;
555#else
556 height = f->ascent + f->descent;
557#endif
541 558
542 unsigned long avgwidth; 559 unsigned long avgwidth;
543 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 560 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
544 avgwidth = 0; 561 avgwidth = 0;
545 562
546 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 563 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
547 char *slant = get_property (f, "SLANT", "r"); 564 char *slant = get_property (f, term->xa [XA_SLANT], "r");
548 565
549 set_properties (p, height, weight, slant, avgwidth); 566 set_properties (p, height, weight, slant, avgwidth);
550 567
551 free (weight); 568 free (weight);
552 free (slant); 569 free (slant);
553 570
571 p.ascent = f->ascent;
572
554 return true; 573 return true;
555} 574}
556 575
557bool 576bool
558rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 577rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
559{ 578{
579 dTermDisplay;
560 int slashes = 0; 580 int slashes = 0;
561 const char *comp[13]; 581 const char *comp[13];
562 582
563 for (const char *c = name; *c; c++) 583 for (const char *c = name; *c; c++)
564 if (*c == '-') 584 if (*c == '-')
… …
572 if (slashes >= 13 592 if (slashes >= 13
573 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 593 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
574 && (*comp[11] >= '0' && *comp[11] <= '9')) 594 && (*comp[11] >= '0' && *comp[11] <= '9'))
575 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]));
576 596
577 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 597 XFontStruct *f = XLoadQueryFont (disp, name);
578 598
579 if (f) 599 if (f)
580 { 600 {
581 // 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
582 // (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).
583 // in that case, just return garbage. 603 // in that case, just return garbage.
584 bool ret = set_properties (p, f); 604 bool ret = set_properties (p, f);
585 XFreeFont (DISPLAY, f); 605 XFreeFont (disp, f);
586 return ret; 606 return ret;
587 } 607 }
588 else 608 else
589 return false; 609 return false;
590} 610}
591 611
592// fix the size of scalable fonts 612// fix the size of scalable fonts
593static bool 613static bool
594replace_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)
595{ 615{
596 int slashes = 0; 616 int slashes = 0;
597 const char *field, *end; 617 const char *field, *end;
598 618
599 for (const char *c = name; *c; c++) 619 for (const char *c = name; *c; c++)
… …
609 break; 629 break;
610 } 630 }
611 631
612 if (slashes >= 13 && (!old || *field == old)) 632 if (slashes >= 13 && (!old || *field == old))
613 { 633 {
614 // TODO: check for overflow in font-name 634 size_t len = field - name;
615 strncpy (buf, name, field - name); 635 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
616 buf += field - name; 636 memcpy (*ptr, name, len);
617 strcpy (buf, replace); 637 strcpy (*ptr + len, replace);
618 strcat (buf, end); 638 strcat (*ptr, end);
619 639
620 return true; 640 return true;
621 } 641 }
622 else 642 else
623 { 643 {
624 strcpy (buf, name); 644 *ptr = strdup (name);
625 645
626 return false; 646 return false;
627 } 647 }
628} 648}
629 649
630bool 650bool
631rxvt_font_x11::load (const rxvt_fontprop &prop) 651rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
632{ 652{
653 dTermDisplay;
654
633 clear (); 655 clear ();
634 656
635 char field_str[64]; // enough for 128 bits 657 char field_str[64]; // enough for 128 bits
636 658
637 // first morph the font if required 659 // first morph the font if required
638 if (prop.weight != rxvt_fontprop::unset 660 if (force_prop)
639 || prop.slant != rxvt_fontprop::unset)
640 { 661 {
641 char fname[1024]; 662 char *fname;
642 663
643 if (name[0] != '-') 664 if (name[0] != '-')
644 { 665 {
645 f = XLoadQueryFont (DISPLAY, name); 666 f = XLoadQueryFont (disp, name);
646 667
647 if (!f) 668 if (!f)
648 return false; 669 return false;
649 670
650 char *new_name = get_property (f, "FONT", name); 671 char *new_name = get_property (f, XA_FONT, name);
651 672
652 if (new_name) 673 if (new_name)
653 set_name (new_name); 674 set_name (new_name);
654 else 675 else
655 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
656 677
657 XFreeFont (DISPLAY, f); 678 XFreeFont (disp, f);
658 f = 0; 679 f = 0;
659 } 680 }
660 681
661 if (prop.weight != rxvt_fontprop::unset) 682 if (prop.weight != rxvt_fontprop::unset)
662 { 683 {
663 replace_field (fname, name, 2, 0, 684 replace_field (&fname, name, 2, 0,
664 prop.weight < rxvt_fontprop::bold 685 prop.weight < rxvt_fontprop::bold
665 ? "medium" : "bold"); 686 ? "medium" : "bold");
666 set_name (strdup (fname)); 687 set_name (fname);
667 } 688 }
668 689
669 if (prop.slant != rxvt_fontprop::unset) 690 if (prop.slant != rxvt_fontprop::unset)
670 { 691 {
671 replace_field (fname, name, 3, 0, 692 replace_field (&fname, name, 3, 0,
672 prop.slant < rxvt_fontprop::italic 693 prop.slant < rxvt_fontprop::italic
673 ? "r" : "i"); // TODO: handle "o"blique, too 694 ? "r" : "i"); // TODO: handle "o"blique, too
674 set_name (strdup (fname)); 695 set_name (fname);
675 } 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 ()
676 } 707 {
708 name = 0;
709 diff = 0x7fffffff;
710 }
711
712 font_weight () { clear (); }
713 ~font_weight () { free (name); }
714 };
677 715
678 char **list; 716 char **list;
679 int count; 717 int count;
680 list = XListFonts (DISPLAY, name, 1024, &count); 718 list = XListFonts (disp, name, 4000, &count);
681 719
682 set_name (0); 720 set_name (0);
683 721
684 if (!list) 722 if (!list)
685 return false; 723 return false;
686 724
687 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 725 font_weight *fonts = new font_weight[count];
688 ? 0 : prop.height);
689 726
690 int bestdiff = 0x7fffffff;
691 for (int i = 0; i < count; i++) 727 for (int i = 0; i < count; i++)
692 { 728 {
693 rxvt_fontprop p; 729 rxvt_fontprop p;
694 char fname[1024]; 730 char *fname;
695 731
696 int diff = 0; 732 int diff = 0;
697 733
698 if (replace_field (fname, list[i], 6, '0', field_str)) 734 if (replace_field (&fname, list[i], 6, '0', field_str))
699 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 }
700 742
701 if (!set_properties (p, fname)) 743 if (!set_properties (p, fname))
702 continue; 744 continue;
703 745
704 if (prop.height != rxvt_fontprop::unset 746 if (prop.height != rxvt_fontprop::unset
… …
708 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;
709 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);
710 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);
711 //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);
712 754
713 if (!name // compare against best found so far 755 fonts[i].name = fname;
714 || diff < bestdiff) 756 fonts[i].diff = diff;
715 {
716 set_name (strdup (fname));
717 bestdiff = diff;
718 }
719 } 757 }
720 758
721 XFreeFontNames (list); 759 XFreeFontNames (list);
722 760
723 if (!name) 761 // this loop only iterates when the guessed font-size is too small
724 return false; 762 for (;;)
763 {
764 font_weight *best = fonts + count - 1;
725 765
726 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;
727 790
728 if (!f) 791 if (!f)
729 return false; 792 return false;
730 793
731 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
732 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
796
797 cs = CS_UNKNOWN;
733 798
734 if (registry && encoding) 799 if (registry && encoding)
735 { 800 {
736 char charset[64]; 801 char charset[64];
737 snprintf (charset, 64, "%s-%s", registry, encoding); 802 snprintf (charset, 64, "%s-%s", registry, encoding);
738 803
739 cs = codeset_from_name (charset); 804 cs = codeset_from_name (charset);
740 } 805
741 else 806 if (cs == CS_UNKNOWN)
807 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
742 { 808 }
809
810 free (registry);
811 free (encoding);
812
813 if (cs == CS_UNKNOWN)
814 {
743 const char *charset = get_property (f, "FONT", 0); 815 const char *charset = get_property (f, XA_FONT, 0);
744 816
745 if (!charset) 817 if (!charset)
746 charset = name; 818 charset = name;
747 819
748 int count = 13; 820 int count = 13;
749 while (*charset) 821 while (*charset)
750 if (*charset++ == '-' && !--count) 822 if (*charset++ == '-' && !--count)
751 break; 823 break;
752 824
753 cs = codeset_from_name (charset); 825 cs = codeset_from_name (charset);
826 if (cs == CS_UNKNOWN)
827 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
828 }
829
830 if (cs == CS_UNKNOWN)
754 } 831 {
755 832 clear ();
756 free (registry); 833 return false;
757 free (encoding); 834 }
758 835
759 if (cs == CS_UNICODE) 836 if (cs == CS_UNICODE)
760 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 837 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
761 838
762 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 839 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
763 enc2b = encm || f->max_char_or_byte2 > 255; 840 enc2b = encm || f->max_char_or_byte2 > 255;
764 841
765 ascent = f->ascent;
766 descent = f->descent;
767 height = ascent + descent;
768
769 slow = false; 842 slow = false;
770 843
771#if 1 // only used for slow detection, TODO optimize 844#if 1 // only used for slow detection, TODO optimize
772 if (f->min_bounds.width == f->max_bounds.width) 845 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
773 width = f->min_bounds.width;
774 else if (f->per_char == NULL)
775 width = f->max_bounds.width; 846 width = f->max_bounds.width;
776 else 847 else
777 { 848 {
778 slow = true; 849 slow = true;
779 850
780 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 851 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
781 852
782 if (encm) 853 if (encm)
783 N += (f->max_byte1 - f->min_byte1) 854 N += (f->max_byte1 - f->min_byte1)
784 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 855 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
785 856
786 while (N) 857 while (N)
787 { 858 {
788 if (f->per_char[N].width > width) 859 if (f->per_char[N].width > width)
789 width = f->per_char[N].width; 860 width = f->per_char[N].width;
790 861
… …
795 866
796 width = 1; 867 width = 1;
797 868
798 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 869 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
799 { 870 {
800 if (cs != CS_UNICODE
801 && *t > 0x100
802 && FROM_UNICODE (cs, *t) == NOCHAR) 871 if (FROM_UNICODE (cs, *t) == NOCHAR)
803 continue; 872 continue;
804 873
805 // ignore characters we wouldn't use anyways 874 // ignore characters we wouldn't use anyways
806 bool careful; 875 bool careful;
807 if (!has_char (*t, &prop, careful)) 876 if (!has_char (*t, &prop, careful))
… …
811 880
812 XCharStruct g; 881 XCharStruct g;
813 int dir_ret, asc_ret, des_ret; 882 int dir_ret, asc_ret, des_ret;
814 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 883 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
815 884
816 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 885 int wcw = WCWIDTH (*t);
886 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
817 887
818 if (width < g.width) width = g.width; 888 if (width < g.width) width = g.width;
819 }
820
821 if (cs == CS_UNKNOWN)
822 { 889 }
823 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
824 890
891#if 0 // do it per-character
892 if (prop && width > prop->width)
893 {
825 clear (); 894 clear ();
826 return false; 895 return false;
827 } 896 }
828
829#if 0 // do it per-character
830 if (prop && width > prop->width)
831 {
832 clear ();
833 return false;
834 }
835#endif 897#endif
836 898
837 return true; 899 return true;
838} 900}
839 901
840void 902void
841rxvt_font_x11::clear () 903rxvt_font_x11::clear ()
842{ 904{
843 if (f) 905 if (f)
844 { 906 {
845 XFreeFont (DISPLAY, f); 907 XFreeFont (term->dpy, f);
846 f = 0; 908 f = 0;
847 } 909 }
848} 910}
849 911
850bool 912bool
851rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 913rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
852{ 914{
853 uint32_t ch = FROM_UNICODE (cs, unicode); 915 uint32_t ch = FROM_UNICODE (cs, unicode);
854 916
855 if (ch == NOCHAR) 917 if (ch == NOCHAR)
856 return false; 918 return false;
… …
893 return false; 955 return false;
894 956
895 if (!prop || prop->width == rxvt_fontprop::unset) 957 if (!prop || prop->width == rxvt_fontprop::unset)
896 return true; 958 return true;
897 959
898 // check character against base font bounding box 960 // check wether character overlaps previous/next character
899 int w = xcs->width; 961 int w = xcs->rbearing - xcs->lbearing;
900 int wcw = wcwidth (unicode); 962 int wcw = max (WCWIDTH (unicode), 1);
901 if (wcw > 0) w /= wcw;
902 963
903 careful = w > prop->width; 964 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
904 if (careful && w > prop->width * MAX_OVERLAP >> 2) 965
966 if (careful && !OVERLAP_OK (w, wcw, prop))
905 return false; 967 return false;
906 968
907 return true; 969 return true;
908} 970}
909 971
… …
915 // this looks like a mess /. 977 // this looks like a mess /.
916 // and it is a mess /. 978 // and it is a mess /.
917 // yet we are trying to be perfect /. 979 // yet we are trying to be perfect /.
918 // but the result still isn't perfect /. 980 // but the result still isn't perfect /.
919 981
982 dTermDisplay;
983 dTermGC;
984
920 bool slow = this->slow 985 bool slow = this->slow
921 || width != r->TermWin.fwidth 986 || width != term->fwidth
922 || height != r->TermWin.fheight; 987 || height != term->fheight;
923 988
924 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 989 int base = ascent; // sorry, incorrect: term->fbase;
925 990
926 XGCValues v; 991 XGCValues v;
927 v.foreground = r->pix_colors[fg]; 992 v.foreground = term->pix_colors[fg];
928 v.font = f->fid; 993 v.font = f->fid;
929 994
930 if (enc2b) 995 if (enc2b)
931 { 996 {
932 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 997 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
933 998
934 if (bg == Color_bg && !slow) 999 if (bg == Color_bg && !slow)
935 { 1000 {
936 v.background = r->pix_colors[bg]; 1001 v.background = term->pix_colors[bg];
937 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1002 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
938 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 1003 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
939 } 1004 }
940 else 1005 else
941 { 1006 {
942 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1007 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
943 1008
944 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1009 XChangeGC (disp, gc, GCForeground | GCFont, &v);
945 1010
946 if (slow) 1011 if (slow)
947 { 1012 {
948 do 1013 do
949 { 1014 {
950 if (xc->byte1 || xc->byte2) 1015 if (xc->byte1 || xc->byte2)
951 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1016 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
952 1017
953 x += r->TermWin.fwidth; 1018 x += term->fwidth;
954 xc++; len--; 1019 xc++; len--;
955 } 1020 }
956 while (len); 1021 while (len);
957 } 1022 }
958 else 1023 else
959 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1024 XDrawString16 (disp, d, gc, x, y + base, xc, len);
960 } 1025 }
961 } 1026 }
962 else 1027 else
963 { 1028 {
964 const char *xc = enc_char (text, len, cs, slow); 1029 const char *xc = enc_char (text, len, cs, slow);
965 1030
966 if (bg == Color_bg && !slow) 1031 if (bg == Color_bg && !slow)
967 { 1032 {
968 v.background = r->pix_colors[bg]; 1033 v.background = term->pix_colors[bg];
969 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1034 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
970 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1035 XDrawImageString (disp, d, gc, x, y + base, xc, len);
971 } 1036 }
972 else 1037 else
973 { 1038 {
974 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1039 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
975 1040
976 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1041 XChangeGC (disp, gc, GCForeground | GCFont, &v);
977 1042
978 if (slow) 1043 if (slow)
979 { 1044 {
980 do 1045 do
981 { 1046 {
982 if (*xc) 1047 if (*xc)
983 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1048 XDrawString (disp, d, gc, x, y + base, xc, 1);
984 1049
985 x += r->TermWin.fwidth; 1050 x += term->fwidth;
986 xc++; len--; 1051 xc++; len--;
987 } 1052 }
988 while (len); 1053 while (len);
989 } 1054 }
990 else 1055 else
991 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1056 XDrawString (disp, d, gc, x, y + base, xc, len);
992 } 1057 }
993 } 1058 }
994} 1059}
995 1060
996///////////////////////////////////////////////////////////////////////////// 1061/////////////////////////////////////////////////////////////////////////////
… …
1002 1067
1003 void clear (); 1068 void clear ();
1004 1069
1005 rxvt_fontprop properties (); 1070 rxvt_fontprop properties ();
1006 1071
1007 bool load (const rxvt_fontprop &prop); 1072 bool load (const rxvt_fontprop &prop, bool force_prop);
1008 1073
1009 void draw (rxvt_drawable &d, int x, int y, 1074 void draw (rxvt_drawable &d, int x, int y,
1010 const text_t *text, int len, 1075 const text_t *text, int len,
1011 int fg, int bg); 1076 int fg, int bg);
1012 1077
1013 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1078 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1014 1079
1015protected: 1080protected:
1016 XftFont *f; 1081 XftFont *f;
1017}; 1082};
1018 1083
1019void 1084void
1020rxvt_font_xft::clear () 1085rxvt_font_xft::clear ()
1021{ 1086{
1022 if (f) 1087 if (f)
1023 { 1088 {
1024 XftFontClose (DISPLAY, f); 1089 XftFontClose (term->dpy, f);
1025 f = 0; 1090 f = 0;
1026 } 1091 }
1027} 1092}
1028 1093
1029rxvt_fontprop 1094rxvt_fontprop
… …
1033 1098
1034 FT_Face face = XftLockFace (f); 1099 FT_Face face = XftLockFace (f);
1035 1100
1036 p.width = width; 1101 p.width = width;
1037 p.height = height; 1102 p.height = height;
1103 p.ascent = ascent;
1038 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1104 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1039 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1105 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1040 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1106 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1041 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1107 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1042 1108
… …
1044 1110
1045 return p; 1111 return p;
1046} 1112}
1047 1113
1048bool 1114bool
1049rxvt_font_xft::load (const rxvt_fontprop &prop) 1115rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1050{ 1116{
1117 dTermDisplay;
1118
1051 clear (); 1119 clear ();
1052 1120
1053 FcPattern *p = FcNameParse ((FcChar8 *) name); 1121 FcPattern *p = FcNameParse ((FcChar8 *) name);
1054 1122
1055 if (!p) 1123 if (!p)
1056 return false; 1124 return false;
1057 1125
1058 FcValue v; 1126 FcValue v;
1059 1127
1060 if (prop.height != rxvt_fontprop::unset 1128 if (prop.height != rxvt_fontprop::unset
1061 || FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch) 1129 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1130 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1062 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1131 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1063 1132
1064 if (prop.weight != rxvt_fontprop::unset 1133 if (prop.weight != rxvt_fontprop::unset
1065 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1134 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1066 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1135 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1067 1136
1068 if (prop.slant != rxvt_fontprop::unset 1137 if (prop.slant != rxvt_fontprop::unset
1069 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1138 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1070 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1139 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1071 1140
1072#if 0 // clipping unfortunately destroys our precious double-width-characters 1141#if 0 // clipping unfortunately destroys our precious double-width-characters
1073 // clip width, we can't do better, or can we? 1142 // clip width, we can't do better, or can we?
1074 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1143 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1075 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1144 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1076#endif 1145#endif
1077 1146
1078 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1147 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1079 FcPatternAddBool (p, FC_MINSPACE, 1); 1148 FcPatternAddBool (p, FC_MINSPACE, 1);
1080 1149
1081 // store generated name so iso14755 view gives better results 1150 // store generated name so iso14755 view gives better results
1082 set_name ((char *)FcNameUnparse (p)); 1151 set_name ((char *)FcNameUnparse (p));
1083 1152
1084 XftResult result; 1153 XftResult result;
1085 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1154 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1086 1155
1087 FcPatternDestroy (p); 1156 FcPatternDestroy (p);
1088 1157
1089 if (!match) 1158 if (!match)
1090 return false; 1159 return false;
… …
1092 int ftheight = 0; 1161 int ftheight = 0;
1093 bool success = true; 1162 bool success = true;
1094 1163
1095 for (;;) 1164 for (;;)
1096 { 1165 {
1097 f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); 1166 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
1098 1167
1099 if (!f) 1168 if (!f)
1100 { 1169 {
1101 success = false; 1170 success = false;
1102 break; 1171 break;
… …
1111 1180
1112 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1181 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1113 1182
1114 XftUnlockFace (f); 1183 XftUnlockFace (f);
1115 1184
1185 int glheight = height;
1186
1116 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1187 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1117 { 1188 {
1118 FcChar16 ch = *t; 1189 FcChar16 ch = *t;
1119 1190
1120 if (cs != CS_UNICODE 1191 if (cs != CS_UNICODE
… …
1126 bool careful; 1197 bool careful;
1127 if (!has_char (*t, &prop, careful)) 1198 if (!has_char (*t, &prop, careful))
1128 continue; 1199 continue;
1129 1200
1130 XGlyphInfo g; 1201 XGlyphInfo g;
1131 XftTextExtents16 (DISPLAY, f, &ch, 1, &g); 1202 XftTextExtents16 (disp, f, &ch, 1, &g);
1132 1203
1204 g.width -= g.x;
1205
1133 int wcw = wcwidth (ch); 1206 int wcw = WCWIDTH (ch);
1134 if (wcw > 0) g.width = g.width / wcw; 1207 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1135 1208
1136 if (width < g.width) width = g.width; 1209 if (width < g.width ) width = g.width;
1137 if (height < g.height) height = g.height; 1210 if (height < g.height ) height = g.height;
1211 if (glheight < g.height - g.y) glheight = g.height - g.y;
1212 }
1213
1214 if (!width)
1215 {
1216 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1217
1218 XftFontClose (disp, f);
1219 f = 0;
1220
1221 success = false;
1222 break;
1138 } 1223 }
1139 1224
1140 if (prop.height == rxvt_fontprop::unset 1225 if (prop.height == rxvt_fontprop::unset
1141 || height <= prop.height 1226 || (height <= prop.height && glheight <= prop.height)
1142 || height <= 2 1227 || height <= 2
1143 || !scalable) 1228 || !scalable)
1144 break; 1229 break;
1145 1230
1146 if (ftheight) 1231 if (ftheight)
… …
1153 ftheight -= height - prop.height; 1238 ftheight -= height - prop.height;
1154 } 1239 }
1155 else 1240 else
1156 ftheight = prop.height - 1; 1241 ftheight = prop.height - 1;
1157 1242
1158 XftFontClose (DISPLAY, f); 1243 XftFontClose (disp, f);
1159 FcPatternDel (match, FC_PIXEL_SIZE); 1244 FcPatternDel (match, FC_PIXEL_SIZE);
1160 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1245 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1161 } 1246 }
1162 1247
1163 FcPatternDestroy (match); 1248 FcPatternDestroy (match);
1164 1249
1165#if 0 // do it per-character 1250#if 0 // do it per-character
… …
1172 1257
1173 return success; 1258 return success;
1174} 1259}
1175 1260
1176bool 1261bool
1177rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1262rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1178{ 1263{
1179 careful = false; 1264 careful = false;
1180 1265
1181 if (!XftCharExists (DISPLAY, f, unicode)) 1266 if (!XftCharExists (term->dpy, f, unicode))
1182 return false; 1267 return false;
1183 1268
1184 if (!prop || prop->width == rxvt_fontprop::unset) 1269 if (!prop || prop->width == rxvt_fontprop::unset)
1185 return true; 1270 return true;
1186 1271
1187 // check character against base font bounding box 1272 // check character against base font bounding box
1188 FcChar32 ch = unicode; 1273 FcChar32 ch = unicode;
1189 XGlyphInfo g; 1274 XGlyphInfo g;
1190 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1275 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1191 1276
1192 int w = g.width; 1277 int w = g.width - g.x;
1193 int wcw = wcwidth (unicode); 1278 int wcw = max (WCWIDTH (unicode), 1);
1194 if (wcw > 0) w /= wcw;
1195 1279
1196 careful = w > prop->width; 1280 careful = g.x > 0 || w > prop->width * wcw;
1197 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1281
1282 if (careful && !OVERLAP_OK (w, wcw, prop))
1283 return false;
1284
1285 // this weeds out _totally_ broken fonts, or glyphs
1286 if (!OVERLAP_OK (g.xOff, wcw, prop))
1198 return false; 1287 return false;
1199 1288
1200 return true; 1289 return true;
1201} 1290}
1202 1291
1203void 1292void
1204rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1293rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1205 const text_t *text, int len, 1294 const text_t *text, int len,
1206 int fg, int bg) 1295 int fg, int bg)
1207{ 1296{
1208 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
1209
1210 int base = ascent; // should be fbase, but that is incorrect
1211
1212 XGlyphInfo extents; 1297 XGlyphInfo extents;
1213 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1298 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1214 FcChar32 *ep = enc; 1299 XftGlyphSpec *ep = enc;
1215 int ewidth = 0; 1300
1216 int xoff = 0; 1301 dTermDisplay;
1302 dTermGC;
1303
1304 int w = term->fwidth * len;
1305 int h = term->fheight;
1306
1307 bool buffered = bg >= Color_transparent
1308 && term->option (Opt_buffered);
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;
1217 1316
1218 while (len) 1317 while (len)
1219 { 1318 {
1220 int cwidth = r->TermWin.fwidth; 1319 int cwidth = term->fwidth;
1221 FcChar32 fc = *text++; len--; 1320 FcChar32 fc = *text++; len--;
1222 FT_UInt gl;
1223 1321
1224 while (len && *text == NOCHAR) 1322 while (len && *text == NOCHAR)
1225 text++, len--, cwidth += r->TermWin.fwidth; 1323 text++, len--, cwidth += term->fwidth;
1226
1227 gl = XftCharIndex (d.display->display, f, fc);
1228 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1229 1324
1230 if (extents.xOff != cwidth && ep != enc) 1325 if (fc != ' ') // skip spaces
1231 {
1232 if (xoff > ewidth) xoff = ewidth;
1233 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1234 x + (ewidth - xoff >> 1),
1235 y + base, enc, ep - enc);
1236 x += ewidth;
1237
1238 ep = enc;
1239 ewidth = 0;
1240 xoff = 0;
1241 } 1326 {
1327 FT_UInt glyph = XftCharIndex (disp, f, fc);
1328 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1242 1329
1243 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++;
1244 { 1338 }
1339
1245 x += cwidth; 1340 x_ += cwidth;
1246 continue; 1341 }
1342
1343 if (buffered)
1344 {
1345 if (ep != enc)
1247 } 1346 {
1347 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1248 1348
1349#ifdef HAVE_BG_PIXMAP
1350 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1351
1352 if (term->bgPixmap.pixmap
1353 && (bg == Color_transparent || bg == Color_bg
1354 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1355 {
1356 int src_x = x, src_y = y;
1357
1358 if (term->bgPixmap.is_parentOrigin ())
1359 {
1360 src_x += term->window_vt_x;
1361 src_y += term->window_vt_y;
1362 }
1363
1364 if (term->bgPixmap.pmap_width >= src_x + w
1365 && term->bgPixmap.pmap_height >= src_y + h)
1366 {
1367 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1368 src_x, src_y, w, h, 0, 0);
1369 }
1370 else
1371 {
1372 XGCValues gcv;
1373
1374 gcv.fill_style = FillTiled;
1375 gcv.tile = term->bgPixmap.pixmap;
1376 gcv.ts_x_origin = -src_x;
1377 gcv.ts_y_origin = -src_y;
1378
1379 XChangeGC (disp, gc,
1380 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1381 &gcv);
1382
1383 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1384
1385 gcv.fill_style = FillSolid;
1386 XChangeGC (disp, gc, GCFillStyle, &gcv);
1387 }
1388
1389 if (dst)
1390 {
1391 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1392
1393 // dst can only be set when bg >= 0
1394 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1395 }
1396 }
1397 else
1398#endif
1399 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1400
1401 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1402 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1403 }
1249 else 1404 else
1250 { 1405 clear_rect (d, x, y, w, h, bg);
1251 *ep++ = gl;
1252 ewidth += cwidth;
1253 xoff += extents.xOff;
1254 }
1255 }
1256
1257 if (ep != enc)
1258 { 1406 }
1259 if (xoff > ewidth) xoff = ewidth; 1407 else
1260 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1261 x + (ewidth - xoff >> 1),
1262 y + base, enc, ep - enc);
1263 } 1408 {
1409 clear_rect (d, x, y, w, h, bg);
1410 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1411 }
1264} 1412}
1413
1265#endif 1414#endif
1266 1415
1267///////////////////////////////////////////////////////////////////////////// 1416/////////////////////////////////////////////////////////////////////////////
1268 1417
1269rxvt_fontset::rxvt_fontset (rxvt_t r) 1418rxvt_fontset::rxvt_fontset (rxvt_term *term)
1270: r (r), fontdesc (0) 1419: fontdesc (0), term (term)
1271{ 1420{
1272 clear (); 1421 clear ();
1273} 1422}
1274 1423
1275rxvt_fontset::~rxvt_fontset () 1424rxvt_fontset::~rxvt_fontset ()
… …
1278} 1427}
1279 1428
1280void 1429void
1281rxvt_fontset::clear () 1430rxvt_fontset::clear ()
1282{ 1431{
1283 prop.width = prop.height = prop.weight = prop.slant 1432 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1284 = rxvt_fontprop::unset; 1433 = rxvt_fontprop::unset;
1434 force_prop = false;
1285 1435
1286 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1436 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1287 FONT_UNREF (*i); 1437 FONT_UNREF (*i);
1288 1438
1289 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1439 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1298 1448
1299rxvt_font * 1449rxvt_font *
1300rxvt_fontset::new_font (const char *name, codeset cs) 1450rxvt_fontset::new_font (const char *name, codeset cs)
1301{ 1451{
1302 rxvt_font *f; 1452 rxvt_font *f;
1303 1453
1304 if (!name || !*name) 1454 if (!name || !*name)
1305 { 1455 {
1306 name = ""; 1456 name = "";
1307 f = new rxvt_font_default (this); 1457 f = new rxvt_font_default (this);
1308 } 1458 }
… …
1319 f = new rxvt_font_x11; 1469 f = new rxvt_font_x11;
1320 } 1470 }
1321 else 1471 else
1322 f = new rxvt_font_x11; 1472 f = new rxvt_font_x11;
1323 1473
1324 f->set_term (r); 1474 f->set_term (term);
1325 f->set_name (strdup (name)); 1475 f->set_name (strdup (name));
1326 1476
1327 f->cs = cs; 1477 f->cs = cs;
1328 f->loaded = false; 1478 f->loaded = false;
1329 1479
… …
1340 char buf[512]; 1490 char buf[512];
1341 const char *end; 1491 const char *end;
1342 1492
1343 do 1493 do
1344 { 1494 {
1345 while (*desc <= ' ') desc++; 1495 while (*desc && *desc <= ' ')
1496 desc++;
1346 1497
1347 codeset cs = CS_UNICODE; 1498 codeset cs = CS_UNICODE;
1348 1499
1349 if (*desc == '[') 1500 if (*desc == '[')
1350 { 1501 {
… …
1375 if (!end) 1526 if (!end)
1376 end = desc + strlen (desc); 1527 end = desc + strlen (desc);
1377 1528
1378 if (end - desc < 511) 1529 if (end - desc < 511)
1379 { 1530 {
1380 strncpy (buf, desc, end - desc); 1531 memcpy (buf, desc, end - desc);
1381 buf[end - desc] = 0; 1532 buf[end - desc] = 0;
1382 1533
1383 fonts.push_back (new_font (buf, cs)); 1534 fonts.push_back (new_font (buf, cs));
1384 } 1535 }
1385 else 1536 else
… …
1400 if (fonts[i]->loaded) 1551 if (fonts[i]->loaded)
1401 return true; 1552 return true;
1402 1553
1403 fonts[i]->loaded = true; 1554 fonts[i]->loaded = true;
1404 1555
1405 if (!fonts[i]->load (prop)) 1556 if (!fonts[i]->load (prop, force_prop))
1406 { 1557 {
1407 fonts[i]->cs = CS_UNKNOWN; 1558 fonts[i]->cs = CS_UNKNOWN;
1408 return false; 1559 return false;
1409 } 1560 }
1410 1561
… …
1435 1586
1436 return -1; 1587 return -1;
1437} 1588}
1438 1589
1439int 1590int
1440rxvt_fontset::find_font (unicode_t unicode) 1591rxvt_fontset::find_font_ (unicode_t unicode)
1441{ 1592{
1442 if (unicode >= 1<<20) 1593 if (unicode >= 1<<20)
1443 return 0; 1594 return 0;
1444 1595
1445 unicode_t hi = unicode >> 8; 1596 unicode_t hi = unicode >> 8;
… …
1460 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1611 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1461 goto next_font; 1612 goto next_font;
1462 1613
1463 if (!realize_font (i)) 1614 if (!realize_font (i))
1464 goto next_font; 1615 goto next_font;
1616
1617 if (prop.ascent != rxvt_fontprop::unset)
1618 max_it (f->ascent, prop.ascent);
1465 } 1619 }
1466 1620
1467 if (f->cs == CS_UNKNOWN) 1621 if (f->cs == CS_UNKNOWN)
1468 goto next_font; 1622 goto next_font;
1469 1623
… …
1508 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1662 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1509 FcPatternAddBool (p, FC_MINSPACE, 1); 1663 FcPatternAddBool (p, FC_MINSPACE, 1);
1510 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1664 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1511 1665
1512 XftResult result; 1666 XftResult result;
1513 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1667 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1514 1668
1515 FcPatternDestroy (p); 1669 FcPatternDestroy (p);
1516 1670
1517 if (match) 1671 if (match)
1518 { 1672 {
… …
1521 FcPatternDestroy (match); 1675 FcPatternDestroy (match);
1522 1676
1523 if (find_font (font) < 0) 1677 if (find_font (font) < 0)
1524 { 1678 {
1525 char fontname[4096]; 1679 char fontname[4096];
1526 sprintf (fontname, "xft:%-.4090s", font); 1680 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1527 1681
1528 fonts.push_back (new_font (fontname, CS_UNICODE)); 1682 fonts.push_back (new_font (fontname, CS_UNICODE));
1529 } 1683 }
1530 1684
1531 free (font); 1685 free (font);
1532 } 1686 }
1533#endif 1687#endif
… …
1555 } 1709 }
1556 1710
1557 return i; 1711 return i;
1558} 1712}
1559 1713
1714int
1715rxvt_fontset::find_font (unicode_t unicode)
1716{
1717 return min<int> (fontCount, find_font_ (unicode));
1718}
1560 1719
1561 1720
1721

Diff Legend

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