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

Diff Legend

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