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.3 by root, Sun Aug 15 21:55:45 2004 UTC vs.
Revision 1.95 by root, Sat Feb 18 14:14:43 2006 UTC

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

Diff Legend

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