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.194 by root, Fri Nov 14 11:06:49 2014 UTC

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

Diff Legend

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