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.50 by root, Wed Dec 1 02:29:14 2004 UTC vs.
Revision 1.173 by root, Fri Jan 7 21:17:08 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 <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 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" },
… …
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_ZH || ENCODING_ZH_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:autohint=true"}, 140 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
131 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 141 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
132 { CS_UNICODE, "xft:Andale Mono:antialias=false" }, 142 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
133 { CS_UNICODE, "xft:Arial Unicode MS:antialias=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:autohint=true" }, 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->bgPixmap.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 * wcwidth (t); 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
423 text_t c2[2]; 451 text_t chrs[2];
424 int len2 = 1; 452 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 453
433 c2[0] = cc->c1; 454 *chrs = cc->c1;
434 rxvt_font *f1 = (*fs)[fs->find_font (c2[0])]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
435 f1->draw (d, x, y, c2, len2, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
436 457
437 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
438 { 459 {
439 bool careful; 460 bool careful;
440 461
441 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
442 c2[0] = cc->c2; 463 *chrs = cc->c2;
443 rxvt_font *f2 = (f1->has_char (c2[0], 0, careful) && !careful) 464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
444 ? f1 465 ? f1
445 : (*fs)[fs->find_font (c2[0])]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
446 467
447 f2->draw (d, x, y, c2, len2, fg, -1); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
448 } 469 }
449 } 470 }
450#endif 471#endif
451 else 472 else
452 switch (t) 473 switch (t)
… …
455 case ZERO_WIDTH_CHAR: 476 case ZERO_WIDTH_CHAR:
456 case NOCHAR: 477 case NOCHAR:
457 break; 478 break;
458 479
459 default: 480 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, 481 XDrawRectangle (disp, d, gc, x + 2, y + 2,
469 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); 482 fwidth - 4, term->fheight - 4);
470 x += w;
471 } 483 }
472 484
473 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;
474 } 535 }
475} 536 }
537};
476 538
477///////////////////////////////////////////////////////////////////////////// 539/////////////////////////////////////////////////////////////////////////////
478 540
479struct rxvt_font_x11 : rxvt_font { 541struct rxvt_font_x11 : rxvt_font {
480 rxvt_font_x11 () { f = 0; } 542 rxvt_font_x11 () { f = 0; }
481 543
482 void clear (); 544 void clear ();
483 545
484 rxvt_fontprop properties (); 546 rxvt_fontprop properties ();
485 547
486 bool load (const rxvt_fontprop &prop); 548 bool load (const rxvt_fontprop &prop, bool force_prop);
487 549
488 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;
489 551
490 void draw (rxvt_drawable &d, int x, int y, 552 void draw (rxvt_drawable &d, int x, int y,
491 const text_t *text, int len, 553 const text_t *text, int len,
492 int fg, int bg); 554 int fg, int bg);
493 555
494 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
495 XFontStruct *f; 557 XFontStruct *f;
496 codeset cs;
497 bool enc2b, encm; 558 bool enc2b, encm;
498 559
499 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 560 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); 561 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); 562 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
502 bool set_properties (rxvt_fontprop &p, const char *name); 563 bool set_properties (rxvt_fontprop &p, const char *name);
503}; 564};
504 565
505char * 566char *
506rxvt_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
507{ 568{
508 unsigned long value; 569 unsigned long value;
509 570
510 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 571 if (XGetFontProperty (f, property, &value))
511 return XGetAtomName (DISPLAY, value); 572 return XGetAtomName (term->dpy, value);
512 else 573 else
513 return rxvt_strdup (repl); 574 return repl ? strdup (repl) : 0;
514} 575}
515 576
516rxvt_fontprop 577rxvt_fontprop
517rxvt_font_x11::properties () 578rxvt_font_x11::properties ()
518{ 579{
… …
522} 583}
523 584
524bool 585bool
525rxvt_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)
526{ 587{
527 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;
528 p.height = height; 591 p.height = height;
592 p.ascent = rxvt_fontprop::unset;
529 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;
530 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;
531 595
532 return true; 596 return true;
533} 597}
534 598
535bool 599bool
536rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 600rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
537{ 601{
538 unsigned long height; 602 unsigned long height;
603
604#if 0
539 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 605 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
540 return false; 606 return false;
607#else
608 height = f->ascent + f->descent;
609#endif
541 610
542 unsigned long avgwidth; 611 unsigned long avgwidth;
543 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 612 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
544 avgwidth = 0; 613 avgwidth = 0;
545 614
546 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 615 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
547 char *slant = get_property (f, "SLANT", "r"); 616 char *slant = get_property (f, term->xa [XA_SLANT], "r");
548 617
549 set_properties (p, height, weight, slant, avgwidth); 618 set_properties (p, height, weight, slant, avgwidth);
550 619
551 free (weight); 620 free (weight);
552 free (slant); 621 free (slant);
553 622
623 p.ascent = f->ascent;
624
554 return true; 625 return true;
555} 626}
556 627
557bool 628bool
558rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 629rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
559{ 630{
631 dTermDisplay;
560 int slashes = 0; 632 int slashes = 0;
561 const char *comp[13]; 633 const char *comp[13];
562 634
563 for (const char *c = name; *c; c++) 635 for (const char *c = name; *c; c++)
564 if (*c == '-') 636 if (*c == '-')
… …
572 if (slashes >= 13 644 if (slashes >= 13
573 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 645 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
574 && (*comp[11] >= '0' && *comp[11] <= '9')) 646 && (*comp[11] >= '0' && *comp[11] <= '9'))
575 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]));
576 648
577 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 649 XFontStruct *f = XLoadQueryFont (disp, name);
578 650
579 if (f) 651 if (f)
580 { 652 {
581 // 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
582 // (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).
583 // in that case, just return garbage. 655 // in that case, just return garbage.
584 bool ret = set_properties (p, f); 656 bool ret = set_properties (p, f);
585 XFreeFont (DISPLAY, f); 657 XFreeFont (disp, f);
586 return ret; 658 return ret;
587 } 659 }
588 else 660 else
589 return false; 661 return false;
590} 662}
591 663
592// fix the size of scalable fonts 664// fix the size of scalable fonts
593static bool 665static bool
594replace_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)
595{ 667{
596 int slashes = 0; 668 int slashes = 0;
597 const char *field, *end; 669 const char *field, *end;
598 670
599 for (const char *c = name; *c; c++) 671 for (const char *c = name; *c; c++)
… …
609 break; 681 break;
610 } 682 }
611 683
612 if (slashes >= 13 && (!old || *field == old)) 684 if (slashes >= 13 && (!old || *field == old))
613 { 685 {
614 // TODO: check for overflow in font-name 686 size_t len = field - name;
615 strncpy (buf, name, field - name); 687 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
616 buf += field - name; 688 memcpy (*ptr, name, len);
617 strcpy (buf, replace); 689 strcpy (*ptr + len, replace);
618 strcat (buf, end); 690 strcat (*ptr, end);
619 691
620 return true; 692 return true;
621 } 693 }
622 else 694 else
623 { 695 {
624 strcpy (buf, name); 696 *ptr = strdup (name);
625 697
626 return false; 698 return false;
627 } 699 }
628} 700}
629 701
630bool 702bool
631rxvt_font_x11::load (const rxvt_fontprop &prop) 703rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
632{ 704{
705 dTermDisplay;
706
633 clear (); 707 clear ();
634 708
635 char field_str[64]; // enough for 128 bits 709 char field_str[64]; // enough for 128 bits
636 710
637 // first morph the font if required 711 // first morph the font if required
638 if (prop.weight != rxvt_fontprop::unset 712 if (force_prop)
639 || prop.slant != rxvt_fontprop::unset)
640 { 713 {
641 char fname[1024]; 714 char *fname;
642 715
643 if (name[0] != '-') 716 if (name[0] != '-')
644 { 717 {
645 f = XLoadQueryFont (DISPLAY, name); 718 f = XLoadQueryFont (disp, name);
646 719
647 if (!f) 720 if (!f)
648 return false; 721 return false;
649 722
650 char *new_name = get_property (f, "FONT", name); 723 char *new_name = get_property (f, XA_FONT, 0);
651 724
652 if (new_name) 725 if (new_name)
653 set_name (new_name); 726 set_name (new_name);
654 else 727 else
655 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 728 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
656 729
657 XFreeFont (DISPLAY, f); 730 XFreeFont (disp, f);
658 f = 0; 731 f = 0;
659 } 732 }
660 733
661 if (prop.weight != rxvt_fontprop::unset) 734 if (prop.weight != rxvt_fontprop::unset)
662 { 735 {
663 replace_field (fname, name, 2, 0, 736 replace_field (&fname, name, 2, 0,
664 prop.weight < rxvt_fontprop::bold 737 prop.weight < rxvt_fontprop::bold
665 ? "medium" : "bold"); 738 ? "medium" : "bold");
666 set_name (strdup (fname)); 739 set_name (fname);
667 } 740 }
668 741
669 if (prop.slant != rxvt_fontprop::unset) 742 if (prop.slant != rxvt_fontprop::unset)
670 { 743 {
671 replace_field (fname, name, 3, 0, 744 replace_field (&fname, name, 3, 0,
672 prop.slant < rxvt_fontprop::italic 745 prop.slant < rxvt_fontprop::italic
673 ? "r" : "i"); // TODO: handle "o"blique, too 746 ? "r" : "i"); // TODO: handle "o"blique, too
674 set_name (strdup (fname)); 747 set_name (fname);
675 } 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 ()
676 } 759 {
760 name = 0;
761 diff = 0x7fffffff;
762 }
763
764 font_weight () { clear (); }
765 ~font_weight () { free (name); }
766 };
677 767
678 char **list; 768 char **list;
679 int count; 769 int count;
680 list = XListFonts (DISPLAY, name, 1024, &count); 770 list = XListFonts (disp, name, 4000, &count);
681 771
682 set_name (0); 772 set_name (0);
683 773
684 if (!list) 774 if (!list)
685 return false; 775 return false;
686 776
687 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 777 font_weight *fonts = new font_weight[count];
688 ? 0 : prop.height);
689 778
690 int bestdiff = 0x7fffffff;
691 for (int i = 0; i < count; i++) 779 for (int i = 0; i < count; i++)
692 { 780 {
693 rxvt_fontprop p; 781 rxvt_fontprop p;
694 char fname[1024]; 782 char *fname;
695 783
696 int diff = 0; 784 int diff = 0;
697 785
698 if (replace_field (fname, list[i], 6, '0', field_str)) 786 if (replace_field (&fname, list[i], 6, '0', field_str))
699 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 }
700 794
701 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);
702 continue; 801 continue;
703 802 }
704 if (prop.height != rxvt_fontprop::unset
705 && p.height > prop.height) // weed out too large fonts
706 continue;
707 803
708 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;
709 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);
710 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);
711 //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);
712 808
713 if (!name // compare against best found so far 809 fonts[i].name = fname;
714 || diff < bestdiff) 810 fonts[i].diff = diff;
715 {
716 set_name (strdup (fname));
717 bestdiff = diff;
718 }
719 } 811 }
720 812
721 XFreeFontNames (list); 813 XFreeFontNames (list);
722 814
723 if (!name) 815 // this loop only iterates when the guessed font-size is too small
724 return false; 816 for (;;)
817 {
818 font_weight *best = fonts + count - 1;
725 819
726 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;
727 844
728 if (!f) 845 if (!f)
729 return false; 846 return false;
730 847
731 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 848 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
732 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;
733 852
734 if (registry && encoding) 853 if (registry && encoding)
735 { 854 {
736 char charset[64]; 855 char charset[64];
737 snprintf (charset, 64, "%s-%s", registry, encoding); 856 snprintf (charset, 64, "%s-%s", registry, encoding);
738 857
739 cs = codeset_from_name (charset); 858 cs = codeset_from_name (charset);
740 } 859
741 else 860 if (cs == CS_UNKNOWN)
861 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
742 { 862 }
863
864 free (registry);
865 free (encoding);
866
867 if (cs == CS_UNKNOWN)
868 {
743 const char *charset = get_property (f, "FONT", 0); 869 char *value = get_property (f, XA_FONT, 0);
870 const char *charset = value;
744 871
745 if (!charset) 872 if (!charset)
746 charset = name; 873 charset = name;
747 874
748 int count = 13; 875 int count = 13;
749 while (*charset) 876 while (*charset)
750 if (*charset++ == '-' && !--count) 877 if (*charset++ == '-' && !--count)
751 break; 878 break;
752 879
753 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)
754 } 888 {
755 889 clear ();
756 free (registry); 890 return false;
757 free (encoding); 891 }
758 892
759 if (cs == CS_UNICODE) 893 if (cs == CS_UNICODE)
760 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
761 895
762 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 896 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
763 enc2b = encm || f->max_char_or_byte2 > 255; 897 enc2b = encm || f->max_char_or_byte2 > 255;
764 898
765 ascent = f->ascent;
766 descent = f->descent;
767 height = ascent + descent;
768
769 slow = false; 899 slow = false;
770 900
771#if 1 // only used for slow detection, TODO optimize 901#if 1 // only used for slow detection, TODO optimize
772 if (f->min_bounds.width == f->max_bounds.width) 902 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; 903 width = f->max_bounds.width;
776 else 904 else
777 { 905 {
778 slow = true; 906 slow = true;
779 907
780 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;
781 909
782 if (encm) 910 if (encm)
783 N += (f->max_byte1 - f->min_byte1) 911 N += (f->max_byte1 - f->min_byte1)
784 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 912 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
785 913
786 while (N) 914 while (N)
787 { 915 {
788 if (f->per_char[N].width > width) 916 if (f->per_char[N].width > width)
789 width = f->per_char[N].width; 917 width = f->per_char[N].width;
790 918
… …
793 } 921 }
794#endif 922#endif
795 923
796 width = 1; 924 width = 1;
797 925
798 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; )
799 { 927 {
800 if (cs != CS_UNICODE
801 && *t > 0x100
802 && FROM_UNICODE (cs, *t) == NOCHAR) 928 if (FROM_UNICODE (cs, *t) == NOCHAR)
803 continue; 929 continue;
804 930
805 // ignore characters we wouldn't use anyways 931 // ignore characters we wouldn't use anyways
806 bool careful; 932 bool careful;
807 if (!has_char (*t, &prop, careful)) 933 if (!has_char (*t, &prop, careful))
… …
811 937
812 XCharStruct g; 938 XCharStruct g;
813 int dir_ret, asc_ret, des_ret; 939 int dir_ret, asc_ret, des_ret;
814 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 940 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
815 941
816 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;
817 944
818 if (width < g.width) width = g.width; 945 if (width < g.width) width = g.width;
819 }
820
821 if (cs == CS_UNKNOWN)
822 { 946 }
823 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
824 947
948#if 0 // do it per-character
949 if (prop && width > prop->width)
950 {
825 clear (); 951 clear ();
826 return false; 952 return false;
827 } 953 }
828
829#if 0 // do it per-character
830 if (prop && width > prop->width)
831 {
832 clear ();
833 return false;
834 }
835#endif 954#endif
836 955
837 return true; 956 return true;
838} 957}
839 958
840void 959void
841rxvt_font_x11::clear () 960rxvt_font_x11::clear ()
842{ 961{
843 if (f) 962 if (f)
844 { 963 {
845 XFreeFont (DISPLAY, f); 964 XFreeFont (term->dpy, f);
846 f = 0; 965 f = 0;
847 } 966 }
848} 967}
849 968
850bool 969bool
851rxvt_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
852{ 971{
853 uint32_t ch = FROM_UNICODE (cs, unicode); 972 uint32_t ch = FROM_UNICODE (cs, unicode);
854 973
855 if (ch == NOCHAR) 974 if (ch == NOCHAR)
856 return false; 975 return false;
857 976
858 /* check wether the character exists in _this_ font. horrible. */ 977 /* check whether the character exists in _this_ font. horrible. */
859 XCharStruct *xcs; 978 XCharStruct *xcs;
860 979
861 if (encm) 980 if (encm)
862 { 981 {
863 unsigned char byte1 = ch >> 8; 982 unsigned char byte1 = ch >> 8;
… …
893 return false; 1012 return false;
894 1013
895 if (!prop || prop->width == rxvt_fontprop::unset) 1014 if (!prop || prop->width == rxvt_fontprop::unset)
896 return true; 1015 return true;
897 1016
898 // check character against base font bounding box 1017 // check whether character overlaps previous/next character
899 int w = xcs->width; 1018 int w = xcs->rbearing - xcs->lbearing;
900 int wcw = wcwidth (unicode); 1019 int wcw = max (WCWIDTH (unicode), 1);
901 if (wcw > 0) w /= wcw;
902 1020
903 careful = w > prop->width; 1021 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
904 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1022
1023 if (careful && !OVERLAP_OK (w, wcw, prop))
905 return false; 1024 return false;
906 1025
907 return true; 1026 return true;
908} 1027}
909 1028
… …
915 // this looks like a mess /. 1034 // this looks like a mess /.
916 // and it is a mess /. 1035 // and it is a mess /.
917 // yet we are trying to be perfect /. 1036 // yet we are trying to be perfect /.
918 // but the result still isn't perfect /. 1037 // but the result still isn't perfect /.
919 1038
1039 dTermDisplay;
1040 dTermGC;
1041
920 bool slow = this->slow 1042 bool slow = this->slow
921 || width != r->TermWin.fwidth 1043 || width != term->fwidth
922 || height != r->TermWin.fheight; 1044 || height != term->fheight;
923 1045
924 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 1046 int base = ascent; // sorry, incorrect: term->fbase;
925 1047
926 XGCValues v; 1048 XGCValues v;
927 v.foreground = r->pix_colors[fg]; 1049 v.foreground = term->pix_colors[fg];
928 v.font = f->fid; 1050 v.font = f->fid;
929 1051
930 if (enc2b) 1052 if (enc2b)
931 { 1053 {
932 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 1054 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
933 1055
934 if (bg == Color_bg && !slow) 1056 if (bg == Color_bg && !slow)
935 { 1057 {
936 v.background = r->pix_colors[bg]; 1058 v.background = term->pix_colors[bg];
937 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1059 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
938 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 1060 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
939 } 1061 }
940 else 1062 else
941 { 1063 {
942 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1064 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
943 1065
944 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1066 XChangeGC (disp, gc, GCForeground | GCFont, &v);
945 1067
946 if (slow) 1068 if (slow)
947 { 1069 {
948 do 1070 do
949 { 1071 {
950 if (xc->byte1 || xc->byte2) 1072 if (xc->byte1 || xc->byte2)
951 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1073 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
952 1074
953 x += r->TermWin.fwidth; 1075 x += term->fwidth;
954 xc++; len--; 1076 xc++; len--;
955 } 1077 }
956 while (len); 1078 while (len);
957 } 1079 }
958 else 1080 else
959 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1081 XDrawString16 (disp, d, gc, x, y + base, xc, len);
960 } 1082 }
961 } 1083 }
962 else 1084 else
963 { 1085 {
964 const char *xc = enc_char (text, len, cs, slow); 1086 const char *xc = enc_char (text, len, cs, slow);
965 1087
966 if (bg == Color_bg && !slow) 1088 if (bg == Color_bg && !slow)
967 { 1089 {
968 v.background = r->pix_colors[bg]; 1090 v.background = term->pix_colors[bg];
969 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1091 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
970 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1092 XDrawImageString (disp, d, gc, x, y + base, xc, len);
971 } 1093 }
972 else 1094 else
973 { 1095 {
974 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1096 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
975 1097
976 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1098 XChangeGC (disp, gc, GCForeground | GCFont, &v);
977 1099
978 if (slow) 1100 if (slow)
979 { 1101 {
980 do 1102 do
981 { 1103 {
982 if (*xc) 1104 if (*xc)
983 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1105 XDrawString (disp, d, gc, x, y + base, xc, 1);
984 1106
985 x += r->TermWin.fwidth; 1107 x += term->fwidth;
986 xc++; len--; 1108 xc++; len--;
987 } 1109 }
988 while (len); 1110 while (len);
989 } 1111 }
990 else 1112 else
991 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1113 XDrawString (disp, d, gc, x, y + base, xc, len);
992 } 1114 }
993 } 1115 }
994} 1116}
995 1117
996///////////////////////////////////////////////////////////////////////////// 1118/////////////////////////////////////////////////////////////////////////////
… …
1002 1124
1003 void clear (); 1125 void clear ();
1004 1126
1005 rxvt_fontprop properties (); 1127 rxvt_fontprop properties ();
1006 1128
1007 bool load (const rxvt_fontprop &prop); 1129 bool load (const rxvt_fontprop &prop, bool force_prop);
1008 1130
1009 void draw (rxvt_drawable &d, int x, int y, 1131 void draw (rxvt_drawable &d, int x, int y,
1010 const text_t *text, int len, 1132 const text_t *text, int len,
1011 int fg, int bg); 1133 int fg, int bg);
1012 1134
1013 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1135 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1014 1136
1015protected: 1137protected:
1016 XftFont *f; 1138 XftFont *f;
1017}; 1139};
1018 1140
1019void 1141void
1020rxvt_font_xft::clear () 1142rxvt_font_xft::clear ()
1021{ 1143{
1022 if (f) 1144 if (f)
1023 { 1145 {
1024 XftFontClose (DISPLAY, f); 1146 XftFontClose (term->dpy, f);
1025 f = 0; 1147 f = 0;
1026 } 1148 }
1027} 1149}
1028 1150
1029rxvt_fontprop 1151rxvt_fontprop
… …
1033 1155
1034 FT_Face face = XftLockFace (f); 1156 FT_Face face = XftLockFace (f);
1035 1157
1036 p.width = width; 1158 p.width = width;
1037 p.height = height; 1159 p.height = height;
1160 p.ascent = ascent;
1038 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1161 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1039 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1162 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1040 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1163 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1041 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1164 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1042 1165
… …
1044 1167
1045 return p; 1168 return p;
1046} 1169}
1047 1170
1048bool 1171bool
1049rxvt_font_xft::load (const rxvt_fontprop &prop) 1172rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1050{ 1173{
1174 dTermDisplay;
1175
1051 clear (); 1176 clear ();
1052 1177
1053 FcPattern *p = FcNameParse ((FcChar8 *) name); 1178 FcPattern *p = FcNameParse ((FcChar8 *) name);
1054 1179
1055 if (!p) 1180 if (!p)
1056 return false; 1181 return false;
1057 1182
1058 FcValue v; 1183 FcValue v;
1059 1184
1060 if (prop.height != rxvt_fontprop::unset 1185 if (prop.height != rxvt_fontprop::unset
1061 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1186 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1062 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1187 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1063 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1188 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1064 1189
1065 if (prop.weight != rxvt_fontprop::unset 1190 if (prop.weight != rxvt_fontprop::unset
1066 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1191 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1067 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1192 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1068 1193
1069 if (prop.slant != rxvt_fontprop::unset 1194 if (prop.slant != rxvt_fontprop::unset
1070 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1195 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1071 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1196 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1072 1197
1073#if 0 // clipping unfortunately destroys our precious double-width-characters 1198#if 0 // clipping unfortunately destroys our precious double-width-characters
1074 // clip width, we can't do better, or can we? 1199 // clip width, we can't do better, or can we?
1075 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1200 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1076 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1201 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1077#endif 1202#endif
1078 1203
1079 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1204 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1080 FcPatternAddBool (p, FC_MINSPACE, 1); 1205 FcPatternAddBool (p, FC_MINSPACE, 1);
1081 1206
1082 // store generated name so iso14755 view gives better results 1207 // store generated name so iso14755 view gives better results
1083 set_name ((char *)FcNameUnparse (p)); 1208 set_name ((char *)FcNameUnparse (p));
1084 1209
1085 XftResult result; 1210 XftResult result;
1086 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1211 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1087 1212
1088 FcPatternDestroy (p); 1213 FcPatternDestroy (p);
1089 1214
1090 if (!match) 1215 if (!match)
1091 return false; 1216 return false;
… …
1093 int ftheight = 0; 1218 int ftheight = 0;
1094 bool success = true; 1219 bool success = true;
1095 1220
1096 for (;;) 1221 for (;;)
1097 { 1222 {
1098 f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); 1223 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
1099 1224
1100 if (!f) 1225 if (!f)
1101 { 1226 {
1102 success = false; 1227 success = false;
1103 break; 1228 break;
… …
1112 1237
1113 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1238 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1114 1239
1115 XftUnlockFace (f); 1240 XftUnlockFace (f);
1116 1241
1242 int glheight = height;
1243
1117 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1244 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1118 { 1245 {
1119 FcChar16 ch = *t; 1246 FcChar16 ch = *t;
1120 1247
1121 if (cs != CS_UNICODE 1248 if (cs != CS_UNICODE
1122 && ch > 0x100 1249 && ch > 0x100
… …
1127 bool careful; 1254 bool careful;
1128 if (!has_char (*t, &prop, careful)) 1255 if (!has_char (*t, &prop, careful))
1129 continue; 1256 continue;
1130 1257
1131 XGlyphInfo g; 1258 XGlyphInfo g;
1132 XftTextExtents16 (DISPLAY, f, &ch, 1, &g); 1259 XftTextExtents16 (disp, f, &ch, 1, &g);
1133 1260
1261 g.width -= g.x;
1262
1134 int wcw = wcwidth (ch); 1263 int wcw = WCWIDTH (ch);
1135 if (wcw > 0) g.width = g.width / wcw; 1264 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1136 1265
1137 if (width < g.width) width = g.width; 1266 if (width < g.width ) width = g.width;
1138 if (height < g.height) height = g.height; 1267 if (height < g.height ) height = g.height;
1268 if (glheight < g.height - g.y) glheight = g.height - g.y;
1269 }
1270
1271 if (!width)
1272 {
1273 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1274
1275 XftFontClose (disp, f);
1276 f = 0;
1277
1278 success = false;
1279 break;
1139 } 1280 }
1140 1281
1141 if (prop.height == rxvt_fontprop::unset 1282 if (prop.height == rxvt_fontprop::unset
1142 || height <= prop.height 1283 || (height <= prop.height && glheight <= prop.height)
1143 || height <= 2 1284 || height <= 2
1144 || !scalable) 1285 || !scalable)
1145 break; 1286 break;
1146 1287
1147 if (ftheight) 1288 if (ftheight)
… …
1154 ftheight -= height - prop.height; 1295 ftheight -= height - prop.height;
1155 } 1296 }
1156 else 1297 else
1157 ftheight = prop.height - 1; 1298 ftheight = prop.height - 1;
1158 1299
1159 XftFontClose (DISPLAY, f); 1300 XftFontClose (disp, f);
1160 FcPatternDel (match, FC_PIXEL_SIZE); 1301 FcPatternDel (match, FC_PIXEL_SIZE);
1161 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1302 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1162 } 1303 }
1163 1304
1164 FcPatternDestroy (match); 1305 FcPatternDestroy (match);
1165 1306
1166#if 0 // do it per-character 1307#if 0 // do it per-character
… …
1173 1314
1174 return success; 1315 return success;
1175} 1316}
1176 1317
1177bool 1318bool
1178rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1319rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1179{ 1320{
1180 careful = false; 1321 careful = false;
1181 1322
1182 if (!XftCharExists (DISPLAY, f, unicode)) 1323 if (!XftCharExists (term->dpy, f, unicode))
1183 return false; 1324 return false;
1184 1325
1185 if (!prop || prop->width == rxvt_fontprop::unset) 1326 if (!prop || prop->width == rxvt_fontprop::unset)
1186 return true; 1327 return true;
1187 1328
1188 // check character against base font bounding box 1329 // check character against base font bounding box
1189 FcChar32 ch = unicode; 1330 FcChar32 ch = unicode;
1190 XGlyphInfo g; 1331 XGlyphInfo g;
1191 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1332 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1192 1333
1193 int w = g.width; 1334 int w = g.width - g.x;
1194 int wcw = wcwidth (unicode); 1335 int wcw = max (WCWIDTH (unicode), 1);
1195 if (wcw > 0) w /= wcw;
1196 1336
1197 careful = w > prop->width; 1337 careful = g.x > 0 || w > prop->width * wcw;
1198 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1338
1339 if (careful && !OVERLAP_OK (w, wcw, prop))
1340 return false;
1341
1342 // this weeds out _totally_ broken fonts, or glyphs
1343 if (!OVERLAP_OK (g.xOff, wcw, prop))
1199 return false; 1344 return false;
1200 1345
1201 return true; 1346 return true;
1202} 1347}
1203 1348
1204void 1349void
1205rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1350rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1206 const text_t *text, int len, 1351 const text_t *text, int len,
1207 int fg, int bg) 1352 int fg, int bg)
1208{ 1353{
1209 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
1210
1211 int base = ascent; // should be fbase, but that is incorrect
1212
1213 XGlyphInfo extents; 1354 XGlyphInfo extents;
1214 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1355 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1215 FcChar32 *ep = enc; 1356 XftGlyphSpec *ep = enc;
1216 int ewidth = 0; 1357
1217 int xoff = 0; 1358 dTermDisplay;
1359 dTermGC;
1360
1361 int w = term->fwidth * len;
1362 int h = term->fheight;
1363
1364 bool buffered = bg >= Color_transparent
1365 && term->option (Opt_buffered);
1366
1367 // cut trailing spaces
1368 while (len && text [len - 1] == ' ')
1369 len--;
1370
1371 int x_ = buffered ? 0 : x;
1372 int y_ = buffered ? 0 : y;
1218 1373
1219 while (len) 1374 while (len)
1220 { 1375 {
1221 int cwidth = r->TermWin.fwidth; 1376 int cwidth = term->fwidth;
1222 FcChar32 fc = *text++; len--; 1377 FcChar32 fc = *text++; len--;
1223 FT_UInt gl;
1224 1378
1225 while (len && *text == NOCHAR) 1379 while (len && *text == NOCHAR)
1226 text++, len--, cwidth += r->TermWin.fwidth; 1380 text++, len--, cwidth += term->fwidth;
1227
1228 gl = XftCharIndex (d.display->display, f, fc);
1229 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1230 1381
1231 if (extents.xOff != cwidth && ep != enc) 1382 if (fc != ' ') // skip spaces
1232 {
1233 if (xoff > ewidth) xoff = ewidth;
1234 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1235 x + (ewidth - xoff >> 1),
1236 y + base, enc, ep - enc);
1237 x += ewidth;
1238
1239 ep = enc;
1240 ewidth = 0;
1241 xoff = 0;
1242 } 1383 {
1384 FT_UInt glyph = XftCharIndex (disp, f, fc);
1385 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1243 1386
1244 if (fc == ' ' && ep == enc) // skip leading spaces 1387 ep->glyph = glyph;
1388 ep->x = x_ + (cwidth - extents.xOff >> 1);
1389 ep->y = y_ + ascent;
1390
1391 if (extents.xOff == 0)
1392 ep->x = x_ + cwidth;
1393
1394 ep++;
1245 { 1395 }
1396
1246 x += cwidth; 1397 x_ += cwidth;
1247 continue; 1398 }
1399
1400 if (buffered)
1401 {
1402 if (ep != enc)
1248 } 1403 {
1404 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1249 1405
1406#ifdef HAVE_BG_PIXMAP
1407 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1408
1409 if (term->bgPixmap.pixmap
1410 && (bg == Color_transparent || bg == Color_bg
1411 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1412 {
1413 int src_x = x, src_y = y;
1414
1415 if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
1416 {
1417 src_x += term->window_vt_x;
1418 src_y += term->window_vt_y;
1419 }
1420
1421 if (term->bgPixmap.pmap_width >= src_x + w
1422 && term->bgPixmap.pmap_height >= src_y + h)
1423 {
1424 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1425 src_x, src_y, w, h, 0, 0);
1426 }
1427 else
1428 {
1429 XGCValues gcv;
1430
1431 gcv.fill_style = FillTiled;
1432 gcv.tile = term->bgPixmap.pixmap;
1433 gcv.ts_x_origin = -src_x;
1434 gcv.ts_y_origin = -src_y;
1435
1436 XChangeGC (disp, gc,
1437 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1438 &gcv);
1439
1440 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1441
1442 gcv.fill_style = FillSolid;
1443 XChangeGC (disp, gc, GCFillStyle, &gcv);
1444 }
1445
1446 if (dst)
1447 {
1448 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1449
1450 // dst can only be set when bg >= 0
1451 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1452 }
1453 }
1454 else
1455#endif
1456 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1457
1458 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1459 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1460 }
1250 else 1461 else
1251 { 1462 clear_rect (d, x, y, w, h, bg);
1252 *ep++ = gl;
1253 ewidth += cwidth;
1254 xoff += extents.xOff;
1255 }
1256 }
1257
1258 if (ep != enc)
1259 { 1463 }
1260 if (xoff > ewidth) xoff = ewidth; 1464 else
1261 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1262 x + (ewidth - xoff >> 1),
1263 y + base, enc, ep - enc);
1264 } 1465 {
1466 clear_rect (d, x, y, w, h, bg);
1467 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1468 }
1265} 1469}
1470
1266#endif 1471#endif
1267 1472
1268///////////////////////////////////////////////////////////////////////////// 1473/////////////////////////////////////////////////////////////////////////////
1269 1474
1270rxvt_fontset::rxvt_fontset (rxvt_t r) 1475rxvt_fontset::rxvt_fontset (rxvt_term *term)
1271: r (r), fontdesc (0) 1476: fontdesc (0), term (term)
1272{ 1477{
1273 clear (); 1478 clear ();
1274} 1479}
1275 1480
1276rxvt_fontset::~rxvt_fontset () 1481rxvt_fontset::~rxvt_fontset ()
… …
1279} 1484}
1280 1485
1281void 1486void
1282rxvt_fontset::clear () 1487rxvt_fontset::clear ()
1283{ 1488{
1284 prop.width = prop.height = prop.weight = prop.slant 1489 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1285 = rxvt_fontprop::unset; 1490 = rxvt_fontprop::unset;
1491 force_prop = false;
1286 1492
1287 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1493 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1288 FONT_UNREF (*i); 1494 (*i)->unref ();
1289 1495
1290 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1496 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1291 delete *p; 1497 delete *p;
1292 1498
1293 free (fontdesc); fontdesc = 0; 1499 free (fontdesc); fontdesc = 0;
… …
1295 fonts.clear (); 1501 fonts.clear ();
1296 1502
1297 fallback = fallback_fonts; 1503 fallback = fallback_fonts;
1298} 1504}
1299 1505
1506void
1507rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1508{
1509 font->set_term (term);
1510
1511 font->cs = cs;
1512 font->loaded = false;
1513}
1514
1300rxvt_font * 1515rxvt_font *
1301rxvt_fontset::new_font (const char *name, codeset cs) 1516rxvt_fontset::new_font (const char *name, codeset cs)
1302{ 1517{
1303 rxvt_font *f; 1518 rxvt_font *f;
1304 1519
1305 if (!name || !*name) 1520 if (!name || !*name)
1306 { 1521 {
1307 name = ""; 1522 name = "";
1308 f = new rxvt_font_default (this); 1523 f = new rxvt_font_default (this);
1309 } 1524 }
… …
1320 f = new rxvt_font_x11; 1535 f = new rxvt_font_x11;
1321 } 1536 }
1322 else 1537 else
1323 f = new rxvt_font_x11; 1538 f = new rxvt_font_x11;
1324 1539
1325 f->set_term (r);
1326 f->set_name (strdup (name)); 1540 f->set_name (strdup (name));
1327 1541 prepare_font (f, cs);
1328 f->cs = cs;
1329 f->loaded = false;
1330 1542
1331 return f; 1543 return f;
1332} 1544}
1333 1545
1334///////////////////////////////////////////////////////////////////////////// 1546/////////////////////////////////////////////////////////////////////////////
1547
1548void
1549rxvt_fontset::push_font (rxvt_font *font)
1550{
1551 // the fontCount index is reserved for the overflow font, it is only
1552 // necessary when we get fontCount or more fonts, as they cannot be
1553 // represented in the rendition.
1554 if (fonts.size () == fontCount)
1555 {
1556 rxvt_font *f = new rxvt_font_overflow (this);
1557
1558 prepare_font (f, CS_UNICODE);
1559 fonts.push_back (f);
1560 }
1561
1562 fonts.push_back (font);
1563}
1335 1564
1336void 1565void
1337rxvt_fontset::add_fonts (const char *desc) 1566rxvt_fontset::add_fonts (const char *desc)
1338{ 1567{
1339 if (desc) 1568 if (desc)
… …
1341 char buf[512]; 1570 char buf[512];
1342 const char *end; 1571 const char *end;
1343 1572
1344 do 1573 do
1345 { 1574 {
1346 while (*desc <= ' ') desc++; 1575 while (*desc && *desc <= ' ')
1576 desc++;
1347 1577
1348 codeset cs = CS_UNICODE; 1578 codeset cs = CS_UNICODE;
1349 1579
1350 if (*desc == '[') 1580 if (*desc == '[')
1351 { 1581 {
… …
1376 if (!end) 1606 if (!end)
1377 end = desc + strlen (desc); 1607 end = desc + strlen (desc);
1378 1608
1379 if (end - desc < 511) 1609 if (end - desc < 511)
1380 { 1610 {
1381 strncpy (buf, desc, end - desc); 1611 memcpy (buf, desc, end - desc);
1382 buf[end - desc] = 0; 1612 buf[end - desc] = 0;
1383 1613
1384 fonts.push_back (new_font (buf, cs)); 1614 push_font (new_font (buf, cs));
1385 } 1615 }
1386 else 1616 else
1387 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1617 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1388 1618
1389 desc = end + 1; 1619 desc = end + 1;
1390 } 1620 }
1391 while (*end); 1621 while (*end);
1392 } 1622 }
… …
1401 if (fonts[i]->loaded) 1631 if (fonts[i]->loaded)
1402 return true; 1632 return true;
1403 1633
1404 fonts[i]->loaded = true; 1634 fonts[i]->loaded = true;
1405 1635
1406 if (!fonts[i]->load (prop)) 1636 if (!fonts[i]->load (prop, force_prop))
1407 { 1637 {
1408 fonts[i]->cs = CS_UNKNOWN; 1638 fonts[i]->cs = CS_UNKNOWN;
1409 return false; 1639 return false;
1410 } 1640 }
1411 1641
… …
1417{ 1647{
1418 clear (); 1648 clear ();
1419 1649
1420 fontdesc = strdup (desc); 1650 fontdesc = strdup (desc);
1421 1651
1422 fonts.push_back (new_font (0, CS_UNICODE)); 1652 push_font (new_font (0, CS_UNICODE));
1423 realize_font (0); 1653 realize_font (0);
1424 1654
1425 add_fonts (desc); 1655 add_fonts (desc);
1426 1656
1427 return true; 1657 return true;
… …
1436 1666
1437 return -1; 1667 return -1;
1438} 1668}
1439 1669
1440int 1670int
1441rxvt_fontset::find_font (unicode_t unicode) 1671rxvt_fontset::find_font_idx (unicode_t unicode)
1442{ 1672{
1443 if (unicode >= 1<<20) 1673 if (unicode >= 1<<20)
1444 return 0; 1674 return 0;
1445 1675
1446 unicode_t hi = unicode >> 8; 1676 unicode_t hi = unicode >> 8;
… …
1461 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1691 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1462 goto next_font; 1692 goto next_font;
1463 1693
1464 if (!realize_font (i)) 1694 if (!realize_font (i))
1465 goto next_font; 1695 goto next_font;
1696
1697 if (prop.ascent != rxvt_fontprop::unset)
1698 max_it (f->ascent, prop.ascent);
1466 } 1699 }
1467 1700
1468 if (f->cs == CS_UNKNOWN) 1701 if (f->cs == CS_UNKNOWN)
1469 goto next_font; 1702 goto next_font;
1470 1703
1471 bool careful; 1704 bool careful;
1472 if (f->has_char (unicode, &prop, careful)) 1705 if (f->has_char (unicode, &prop, careful))
1473 { 1706 {
1474 if (careful) 1707 i = (i << 1) | careful;
1475 i |= 128;
1476 1708
1477 goto found; 1709 goto found;
1478 } 1710 }
1479 1711
1480 next_font: 1712 next_font:
1481 if (i == fonts.size () - 1) 1713 if (i == fonts.size () - 1)
1482 { 1714 {
1483 if (fallback->name) 1715 if (fallback->name)
1484 { 1716 {
1485 // search through the fallback list 1717 // search through the fallback list
1486 fonts.push_back (new_font (fallback->name, fallback->cs)); 1718 push_font (new_font (fallback->name, fallback->cs));
1487 fallback++; 1719 fallback++;
1488 } 1720 }
1489 else 1721 else
1490 { 1722 {
1491 // try to find a new font. 1723 // try to find a new font.
… …
1509 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1741 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1510 FcPatternAddBool (p, FC_MINSPACE, 1); 1742 FcPatternAddBool (p, FC_MINSPACE, 1);
1511 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1743 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1512 1744
1513 XftResult result; 1745 XftResult result;
1514 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1746 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1515 1747
1516 FcPatternDestroy (p); 1748 FcPatternDestroy (p);
1517 1749
1518 if (match) 1750 if (match)
1519 { 1751 {
… …
1522 FcPatternDestroy (match); 1754 FcPatternDestroy (match);
1523 1755
1524 if (find_font (font) < 0) 1756 if (find_font (font) < 0)
1525 { 1757 {
1526 char fontname[4096]; 1758 char fontname[4096];
1527 sprintf (fontname, "xft:%-.4090s", font); 1759 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1528 1760
1529 fonts.push_back (new_font (fontname, CS_UNICODE)); 1761 push_font (new_font (fontname, CS_UNICODE));
1530 } 1762 }
1531 1763
1532 free (font); 1764 free (font);
1533 } 1765 }
1534#endif 1766#endif
… …
1556 } 1788 }
1557 1789
1558 return i; 1790 return i;
1559} 1791}
1560 1792
1561
1562

Diff Legend

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