ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtfont.C
(Generate patch)

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

Diff Legend

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