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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.27 by pcg, Wed Mar 3 00:20:33 2004 UTC

1/*--------------------------------*-C-*---------------------------------*; 1/*--------------------------------*-C-*---------------------------------*;
2 * File: defaultfont.C 2 * File: defaultfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003 Marc Lehmann rxvt@plan9.de> 4 * Copyright (c) 2003-2004 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
… …
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "defaultfont.h" 24#include "defaultfont.h"
25 25
26#include <cstdlib>
27
26#define DISPLAY R->Xdisplay 28#define DISPLAY r->display->display
27#define DRAWABLE R->TermWin.vt
28#define GC R->TermWin.gc 29#define GC r->TermWin.gc
29 30
30const struct rxvt_fallback_font { 31const struct rxvt_fallback_font {
31 codeset cs; 32 codeset cs;
32 const char *name; 33 const char *name;
33} fallback_fonts[] = { 34} fallback_fonts[] = {
… …
57 58
58 // japanese 59 // japanese
59#if ENCODING_JP || ENCODING_JP_EXT 60#if ENCODING_JP || ENCODING_JP_EXT
60# if XFT 61# if XFT
61 // prefer xft for complex scripts 62 // prefer xft for complex scripts
62 { CS_UNICODE, "xft:Kochi Gothic" }, 63 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" },
63# endif 64# endif
64 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 65 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
65 { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 66 { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
66 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 67 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
67#endif 68#endif
68 69
69#if ENCODING_CN || ENCODING_CN_EXT 70#if ENCODING_CN || ENCODING_CN_EXT
70# if XFT 71# if XFT
71 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 72 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
72 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 73 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
73 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 74 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
74 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 75 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
75# endif 76# endif
77 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5*-0" },
78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
76 { CS_CNS11643_1992_1, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-1" }, 79 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
77 { CS_CNS11643_1992_2, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-2" }, 80 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
78 { CS_CNS11643_1992_3, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-3" }, 81 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
79 { CS_CNS11643_1992_4, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-4" }, 82 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
80 { CS_CNS11643_1992_5, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-5" }, 83 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
81 { CS_CNS11643_1992_6, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-6" }, 84 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
82 { CS_CNS11643_1992_7, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-7" }, 85 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
83 { CS_CNS11643_1992_F, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-f" }, 86 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
84#endif 87#endif
85 88
86#if XFT 89#if XFT
87 { CS_UNICODE, "xft:Andale Mono" }, 90 { CS_UNICODE, "xft:Andale Mono" },
88 { CS_UNICODE, "xft:Arial Unicode MS" }, 91 { CS_UNICODE, "xft:Arial Unicode MS" },
89#endif 92#endif
90 { CS_UNICODE, "-*-lucidatypewriter-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 93 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
94 { CS_UNICODE, "xft:FreeMono" },
95 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
96 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
91 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 97 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
92 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
93 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
94 98
95 { CS_UNKNOWN, 0 } 99 { CS_UNKNOWN, 0 }
96}; 100};
97 101
98///////////////////////////////////////////////////////////////////////////// 102/////////////////////////////////////////////////////////////////////////////
99 103
104#if XFT
105rxvt_drawable::~rxvt_drawable ()
106{
107 if (xftdrawable)
108 XftDrawDestroy (xftdrawable);
109}
110
111rxvt_drawable::operator XftDraw *()
112{
113 if (!xftdrawable)
114 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
115
116 return xftdrawable;
117}
118#endif
119
120/////////////////////////////////////////////////////////////////////////////
121
100static void *enc_buf; 122static void *enc_buf;
101static uint32_t enc_len; 123static uint32_t enc_len;
102 124
103static inline void * 125static inline void *
104get_enc_buf (int len) 126get_enc_buf (uint32_t len)
105{ 127{
106 if (len > enc_len) 128 if (len > enc_len)
107 { 129 {
108 free (enc_buf); 130 free (enc_buf);
109 enc_buf = malloc (len); 131 enc_buf = malloc (len);
… …
111 133
112 return enc_buf; 134 return enc_buf;
113} 135}
114 136
115static const char * 137static const char *
116enc_char (const text_t *text, int len, codeset cs, bool &zero) 138enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
117{ 139{
118 uint8_t *buf = (uint8_t *)get_enc_buf (len); 140 uint8_t *buf = (uint8_t *)get_enc_buf (len);
119 141
120 while (len--) 142 while (len--)
121 { 143 {
… …
132 154
133 return (const char *)enc_buf; 155 return (const char *)enc_buf;
134} 156}
135 157
136static const XChar2b * 158static const XChar2b *
137enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 159enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
138{ 160{
139 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 161 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
140 162
141 while (len--) 163 while (len--)
142 { 164 {
… …
157} 179}
158 180
159///////////////////////////////////////////////////////////////////////////// 181/////////////////////////////////////////////////////////////////////////////
160 182
161void 183void
162rxvt_font::clear_rect (int x, int y, int w, int h, int color) 184rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
163{ 185{
164 if (color == Color_bg) 186 if (color == Color_bg)
165 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 187 XClearArea (d.display->display, d, x, y, w, h, FALSE);
166 else if (color >= 0) 188 else if (color >= 0)
167 { 189 {
190#if XFT
191 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
192#else
168 XSetForeground (DISPLAY, GC, R->PixColors[color]); 193 XSetForeground (d.display->display, GC, r->PixColors[color]);
169 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 194 XFillRectangle (d.display->display, d, GC, x, y, w, h);
195#endif
170 } 196 }
171} 197}
198
199static const char *linedraw_cmds[128] = {
200 "1hH", "2hH", "1vV", "2vV",
201 0, 0, 0, 0,
202 0, 0, 0, 0,
203 "1HV", "2H1V", "1H2V", "2HV",
204
205 // 2510
206 "1hV", "2h1V", "1h2V", "2hV",
207 "1Hv", "2H1v", "1H2v", "2Hv",
208 "1hv", "2h1v", "1h2v", "2hv",
209 "1HvV", "2H1vV", "1HV2v", "1Hv2V",
210
211 // 2520
212 "1H2vV", "2Hv1V", "2HV1v", "2HvV",
213 "1hvV", "2h1vV", "1hV2v", "1hv2V",
214 "1h2vV", "2hv1V", "1v2hV", "2hvV",
215 "1hHV", "2h1HV", "2H1hV", "2hH1V",
216
217 // 2530
218 "1hH2V", "2hV1H", "1h2HV", "2hHV",
219 "1hHv", "1vH2h", "1hv2H", "1v2hH",
220 "1hH2v", "1H2hv", "1h2Hv", "2hHv",
221 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
222
223 // 2540
224 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
225 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
226 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
227 0, 0, 0, 0,
228
229 // 2550
230 0, 0, 0, 0,
231 0, 0, 0, 0,
232 0, 0, 0, 0,
233 0, 0, 0, 0,
234
235 // 2560
236 0, 0, 0, 0,
237 0, 0, 0, 0,
238 0, 0, 0, 0,
239 0, 0, 0, 0,
240
241 // 2570
242 0, "1a", "1b", "1ab",
243 "1h", "1v", "1H", "1V",
244 "2h", "2v", "2H", "2V",
245 "1h2H", "1v2V", "1H2h", "1V2v"
246
247 // to be done
248};
172 249
173struct rxvt_font_default : rxvt_font { 250struct rxvt_font_default : rxvt_font {
174 bool load (int maxheight) 251 rxvt_fontprop properties ()
252 {
253 rxvt_fontprop p;
254
255 p.width = p.height = 1;
256 p.weight = rxvt_fontprop::medium;
257 p.slant = rxvt_fontprop::roman;
258
259 return p;
260 }
261
262 bool load (const rxvt_fontprop &prop)
175 { 263 {
176 width = 1; height = 1; 264 width = 1; height = 1;
177 ascent = 1; descent = 0; 265 ascent = 1; descent = 0;
178 266
179 return true; 267 return true;
180 } 268 }
181 269
182 bool has_codepoint (uint32_t unicode) 270 bool has_codepoint (uint32_t unicode)
183 { 271 {
184 if (unicode <= 0x001f 272 if (unicode <= 0x001f)
273 return true;
185 || (unicode >= 0x80 && unicode <= 0x9f)) 274 if (unicode >= 0x0080 && unicode <= 0x009f)
275 return true;
276
277 if (unicode >= 0x2500 && unicode <= 0x257f
278 && linedraw_cmds[unicode - 0x2500])
186 return true; 279 return true;
187 280
188 switch (unicode) 281 switch (unicode)
189 { 282 {
190 case ZERO_WIDTH_CHAR: 283 case ZERO_WIDTH_CHAR:
… …
192 } 285 }
193 286
194 return false; 287 return false;
195 } 288 }
196 289
197 void draw (int x, int y, 290 void draw (rxvt_drawable &d, int x, int y,
198 const text_t *text, int len, 291 const text_t *text, int len,
199 int fg, int bg); 292 int fg, int bg);
200}; 293};
201 294
202void 295void
203rxvt_font_default::draw (int x, int y, 296rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
204 const text_t *text, int len, 297 const text_t *text, int len,
205 int fg, int bg) 298 int fg, int bg)
206{ 299{
207 clear_rect (x, y, R->TermWin.fwidth * len, R->TermWin.fheight, bg); 300 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
301
302 XSetForeground (d.display->display, GC, r->PixColors[fg]);
208 303
209 while (len--) 304 while (len--)
210 { 305 {
306 text_t t = *text++;
307
308 // is it in our linedrawing table?
309 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
310 {
311 const char *p = linedraw_cmds[t - 0x2500];
312
313 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1;
314 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1;
315
316 XGCValues gcv;
317
318 while (*p)
319 {
320 switch (*p++)
321 {
322 case '1':
323 gcv.line_width = 0;
324 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
325 break;
326
327 case '2':
328 gcv.line_width = 2;
329 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
330 break;
331
332 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break;
333 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break;
334 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break;
335 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break;
336 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
337 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
338 }
339 }
340
341 gcv.line_width = 0;
342 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
343 }
344 else
211 switch (*text++) 345 switch (t)
212 { 346 {
213 case NOCHAR:
214 case ZERO_WIDTH_CHAR: 347 case ZERO_WIDTH_CHAR:
215 break; 348 break;
216 default: 349 default:
217 XSetForeground (DISPLAY, GC, R->PixColors[fg]); 350 int w = 0;
218 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, R->TermWin.fwidth - 5, R->TermWin.fheight - 5); 351 while (len > 0 && *text == NOCHAR)
352 {
353 ++text;
354 --len;
355 w += r->TermWin.fwidth;
356 }
357
358 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2,
359 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
360 x += w;
219 } 361 }
220 362
221 x += R->TermWin.fwidth; 363 x += r->TermWin.fwidth;
222 } 364 }
223} 365}
224 366
225///////////////////////////////////////////////////////////////////////////// 367/////////////////////////////////////////////////////////////////////////////
226 368
227struct rxvt_font_x11 : rxvt_font { 369struct rxvt_font_x11 : rxvt_font {
228 rxvt_font_x11 () { f = 0; } 370 rxvt_font_x11 () { f = 0; }
229 371
230 void clear (); 372 void clear ();
231 373
232 bool load (int maxheight); 374 rxvt_fontprop properties ();
375
376 bool load (const rxvt_fontprop &prop);
233 377
234 bool has_codepoint (uint32_t unicode); 378 bool has_codepoint (uint32_t unicode);
235 379
236 void draw (int x, int y, 380 void draw (rxvt_drawable &d, int x, int y,
237 const text_t *text, int len, 381 const text_t *text, int len,
238 int fg, int bg); 382 int fg, int bg);
239 383
240 XFontStruct *f; 384 XFontStruct *f;
241 codeset cs; 385 codeset cs;
242 bool enc2b, encm; 386 bool enc2b, encm;
243 387
244 const char *get_property (const char *property, const char *repl) const; 388 const char *get_property (XFontStruct *f, const char *property, const char *repl) const;
389 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
390 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
391 bool set_properties (rxvt_fontprop &p, const char *name);
245}; 392};
246 393
247const char * 394const char *
248rxvt_font_x11::get_property (const char *property, const char *repl) const 395rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
249{ 396{
250 unsigned long value; 397 unsigned long value;
251 398
252 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 399 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
253 return XGetAtomName (DISPLAY, value); 400 return XGetAtomName (DISPLAY, value);
254 else 401 else
255 return repl; 402 return repl;
256} 403}
257 404
405rxvt_fontprop
406rxvt_font_x11::properties ()
407{
408 rxvt_fontprop p;
409 set_properties (p, f);
410 return p;
411}
412
258bool 413bool
259rxvt_font_x11::load (int maxheight) 414rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
415{
416 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
417 p.height = height;
418 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
419 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
420
421 return true;
422}
423
424bool
425rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
426{
427 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
428 const char *slant = get_property (f, "SLANT", "r");
429
430 unsigned long height;
431 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
432 return false;
433
434 unsigned long avgwidth;
435 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
436 avgwidth = 0;
437
438 return set_properties (p, height, weight, slant, avgwidth);
439}
440
441bool
442rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
443{
444 int slashes = 0;
445 const char *comp[12];
446
447 for (const char *c = name; *c; c++)
448 if (*c == '-')
449 {
450 comp[slashes++] = c + 1;
451 if (slashes >= 13)
452 break;
453 }
454
455 /* can we short-circuit the costly XLoadQueryFont? */
456 if (slashes >= 13
457 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
458 && (*comp[11] >= '0' && *comp[11] <= '9'))
459 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
460
461 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
462
463 if (f)
464 {
465 // the font should really exist now. if not, we have a problem
466 // (e.g. if the user did xset fp rehash just when we were searching fonts).
467 // in that case, just return garbage.
468 bool ret = set_properties (p, f);
469 XFreeFont (DISPLAY, f);
470 return ret;
471 }
472 else
473 return false;
474}
475
476// fix the size of scalable fonts
477static void
478fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop)
479{
480 int slashes = 0;
481 const char *size;
482
483 for (const char *c = name; *c; c++)
484 if (*c == '-')
485 {
486 if (slashes == 6)
487 size = c + 1;
488
489 if (++slashes >= 13)
490 break;
491 }
492
493 if (slashes >= 13 && size[0] == '0')
494 {
495 strncpy (buf, name, size - name);
496 buf += size - name;
497 buf += sprintf (buf, "%d", prop.height);
498 strcpy (buf, size + 1);
499 }
500 else
501 strcpy (buf, name);
502}
503
504bool
505rxvt_font_x11::load (const rxvt_fontprop &prop)
260{ 506{
261 clear (); 507 clear ();
508
509 char **list;
510 int count;
511 list = XListFonts (DISPLAY, name, 512, &count);
512 set_name (0);
513
514 if (!list)
515 return false;
516
517 int bestdiff = 0x7fffffff;
518 for (int i = 0; i < count; i++)
519 {
520 rxvt_fontprop p;
521 char fname[1024];
522 fix_scalable (fname, list[i], prop);
523
524 if (!set_properties (p, fname))
525 continue;
526
527 if (p.height > prop.height) // weed out too large fonts
528 continue;
529
530 int diff = (prop.height - p.height) * 32
531 + abs (prop.weight - p.weight)
532 + abs (prop.slant - p.slant );
533
534 if (!name // compare against best found so far
535 || diff < bestdiff)
536 {
537 set_name (strdup (fname));
538 bestdiff = diff;
539 }
540 }
541
542 XFreeFontNames (list);
543
544 if (!name)
545 return false;
262 546
263 f = XLoadQueryFont (DISPLAY, name); 547 f = XLoadQueryFont (DISPLAY, name);
264 548
265 if (!f) 549 if (!f)
266 return false; 550 return false;
267 551
268 unsigned long value;
269
270 const char *registry = get_property ("CHARSET_REGISTRY", 0); 552 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
271 const char *encoding = get_property ("CHARSET_ENCODING", 0); 553 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
272 554
273 if (registry && encoding) 555 if (registry && encoding)
274 { 556 {
275 char charset[64]; 557 char charset[64];
276 snprintf (charset, 64, "%s-%s", registry, encoding); 558 snprintf (charset, 64, "%s-%s", registry, encoding);
277 559
278 cs = codeset_from_name (charset); 560 cs = codeset_from_name (charset);
279 } 561 }
280 else 562 else
281 { 563 {
282 const char *charset = get_property ("FONT", 0); 564 const char *charset = get_property (f, "FONT", 0);
283 565
284 if (!charset) 566 if (!charset)
285 charset = name; 567 charset = name;
286 568
287 int count = 13; 569 int count = 13;
… …
300 582
301 ascent = f->ascent; 583 ascent = f->ascent;
302 descent = f->descent; 584 descent = f->descent;
303 height = ascent + descent; 585 height = ascent + descent;
304 586
305 prop = false; 587 slow = false;
306 588
307 if (f->min_bounds.width == f->max_bounds.width) 589 if (f->min_bounds.width == f->max_bounds.width)
308 width = f->min_bounds.width; 590 width = f->min_bounds.width;
309 else if (f->per_char == NULL) 591 else if (f->per_char == NULL)
310 width = f->max_bounds.width; 592 width = f->max_bounds.width;
311 else 593 else
312 { 594 {
313 prop = true; 595 slow = true;
314 596
315 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 597 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
316 598
317 if (encm) 599 if (encm)
318 N += (f->max_byte1 - f->min_byte1) 600 N += (f->max_byte1 - f->min_byte1)
… …
360 /* check wether the character exists in _this_ font. horrible. */ 642 /* check wether the character exists in _this_ font. horrible. */
361 XCharStruct *xcs; 643 XCharStruct *xcs;
362 644
363 if (encm) 645 if (encm)
364 { 646 {
365 int byte1 = ch >> 8; 647 unsigned char byte1 = ch >> 8;
366 int byte2 = ch & 255; 648 unsigned char byte2 = ch & 255;
367 649
368 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 650 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
369 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 651 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
370 return false; 652 return false;
371 653
… …
394 676
395 return true; 677 return true;
396} 678}
397 679
398void 680void
399rxvt_font_x11::draw (int x, int y, 681rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
400 const text_t *text, int len, 682 const text_t *text, int len,
401 int fg, int bg) 683 int fg, int bg)
402{ 684{
403 // this looks like a mess /. 685 // this looks like a mess /.
404 // and it is a mess /. 686 // and it is a mess /.
405 // yet we are trying to be perfect /. 687 // yet we are trying to be perfect /.
406 // but the result still isn't perfect /. 688 // but the result still isn't perfect /.
407 689
408 bool slow = prop 690 bool slow = this->slow
409 || width != R->TermWin.fwidth 691 || width != r->TermWin.fwidth
410 || height != R->TermWin.fheight; 692 || height != r->TermWin.fheight;
411 693
412 int base = R->TermWin.fbase; 694 int base = r->TermWin.fbase;
413 695
414 XGCValues v; 696 XGCValues v;
415 v.foreground = R->PixColors[fg]; 697 v.foreground = r->PixColors[fg];
416 v.background = R->PixColors[bg]; 698 v.background = r->PixColors[bg];
417 v.font = f->fid; 699 v.font = f->fid;
418 700
419 if (enc2b) 701 if (enc2b)
420 { 702 {
421 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 703 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
422 704
423 if (bg == Color_bg && !slow) 705 if (bg == Color_bg && !slow)
424 { 706 {
425 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 707 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
426 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 708 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
427 } 709 }
428 else 710 else
429 { 711 {
430 clear_rect (x, y, R->TermWin.fwidth * len, R->TermWin.fheight, bg); 712 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
431 713
432 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 714 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
433 715
434 if (slow) 716 if (slow)
435 { 717 {
436 do 718 do
437 { 719 {
438 if (xc->byte1 || xc->byte2) 720 if (xc->byte1 || xc->byte2)
439 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 721 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
440 722
441 x += R->TermWin.fwidth; 723 x += r->TermWin.fwidth;
442 xc++; len--; 724 xc++; len--;
443 } 725 }
444 while (len); 726 while (len);
445 } 727 }
446 else 728 else
447 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 729 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
448 } 730 }
449 } 731 }
450 else 732 else
451 { 733 {
452 const char *xc = enc_char (text, len, cs, slow); 734 const char *xc = enc_char (text, len, cs, slow);
453 735
454 if (bg == Color_bg && !slow) 736 if (bg == Color_bg && !slow)
455 { 737 {
456 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 738 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
457 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 739 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
458 } 740 }
459 else 741 else
460 { 742 {
461 clear_rect (x, y, R->TermWin.fwidth * len, R->TermWin.fheight, bg); 743 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
462 744
463 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 745 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
464 746
465 if (slow) 747 if (slow)
466 { 748 {
467 do 749 do
468 { 750 {
469 if (*xc) 751 if (*xc)
470 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 752 XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
471 753
472 x += R->TermWin.fwidth; 754 x += r->TermWin.fwidth;
473 xc++; len--; 755 xc++; len--;
474 } 756 }
475 while (len); 757 while (len);
476 } 758 }
477 else 759 else
478 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 760 XDrawString (d.display->display, d, GC, x, y + base, xc, len);
479 } 761 }
480 } 762 }
481} 763}
482 764
483///////////////////////////////////////////////////////////////////////////// 765/////////////////////////////////////////////////////////////////////////////
… …
488//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 770//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
489#define SWATHBITS 8 771#define SWATHBITS 8
490#endif 772#endif
491 773
492struct rxvt_font_xft : rxvt_font { 774struct rxvt_font_xft : rxvt_font {
493#if 0
494 enum {
495 SWATHCOUNT = 1 << (21 - UNIBITS),
496 SWATHSIZE = 1 << (SWATHBITS - 5)
497 };
498 typedef uint32_t swath[SWATHSIZE];
499
500 swath *cvr[SWATHCOUNT];
501#endif
502
503#if 0
504 void gen_coverage_swath (unsigned int page);
505
506 bool has_char (uint32_t ch)
507 {
508 unsigned int page = ch >> SWATHBITS;
509 unsigned int idx = ch & ((1 << SWATHBITS) - 1);
510
511 if (page >= SWATHCOUNT)
512 return false;
513
514 if (!cvr[page]) gen_coverage_swath (page);
515
516 return cvr[page][idx >> 5] & (1 << (idx & 31));
517 }
518#endif
519 rxvt_font_xft () { f = 0; d = 0; } 775 rxvt_font_xft () { f = 0; }
520 776
521 void clear (); 777 void clear ();
522 778
523 bool load (int maxheight); 779 rxvt_fontprop properties ();
524 780
525 void draw (int x, int y, 781 bool load (const rxvt_fontprop &prop);
782
783 void draw (rxvt_drawable &d, int x, int y,
526 const text_t *text, int len, 784 const text_t *text, int len,
527 int fg, int bg); 785 int fg, int bg);
528 786
529 bool has_codepoint (uint32_t unicode); 787 bool has_codepoint (uint32_t unicode);
530 788
531protected: 789protected:
532 XftFont *f; 790 XftFont *f;
533 XftDraw *d;
534
535#if 0
536 virtual void populate_coverage_swath (uint32_t lo, uint32_t hi) = 0;
537 void set_swath (uint32_t ch)
538 {
539 cvr[ch >> SWATHBITS] |= 1 << (ch & ((1 << SWATHBITS) - 1));
540 }
541#endif
542}; 791};
543 792
544void 793void
545rxvt_font_xft::clear () 794rxvt_font_xft::clear ()
546{ 795{
547 if (f) 796 if (f)
548 { 797 {
549 XftFontClose (R->Xdisplay, f); 798 XftFontClose (DISPLAY, f);
550 f = 0; 799 f = 0;
551 } 800 }
801}
552 802
553 if (d) 803rxvt_fontprop
554 { 804rxvt_font_xft::properties ()
555 XftDrawDestroy (d); 805{
556 d = 0; 806 rxvt_fontprop p;
557 }
558 807
559#if 0 808 FT_Face face = XftLockFace (f);
560 for (int i = 0; i < SWATHCOUNT; i++) 809
561 delete cvr[i]; 810 p.width = width; p.height = height;
562#endif 811 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
812 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
813
814 XftUnlockFace (f);
815
816 return p;
563} 817}
564 818
565bool 819bool
566rxvt_font_xft::load (int maxheight) 820rxvt_font_xft::load (const rxvt_fontprop &prop)
567{ 821{
568#if 0 822#if 0
569 for (int i = 0; i < SWATHCOUNT; i++) 823 for (int i = 0; i < SWATHCOUNT; i++)
570 cvr[i] = 0; 824 cvr[i] = 0;
571#endif 825#endif
572 826
573 clear (); 827 clear ();
574 828
575 f = XftFontOpenName (R->Xdisplay, DefaultScreen (R->Xdisplay), name); 829 FcPattern *p = FcNameParse ((FcChar8 *) name);
830
831 if (!p)
832 return false;
833
834 FcValue v;
835
836 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
837 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
838
839 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
840 FcPatternAddInteger (p, FC_SLANT, prop.slant);
841
842#if 0 // clipping unfortunately destroys our precious double-width-characters
843 // clip width, we can't do better, or can we?
844 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
845 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
846#endif
847
848 //FcPatternAddBool (p, FC_MINSPACE, 1);
849
850 XftResult result;
851 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
852
853 FcPatternDestroy (p);
854
855 if (!match)
856 return false;
857
858 f = XftFontOpenPattern (DISPLAY, match);
576 859
577 if (!f) 860 if (!f)
861 {
862 FcPatternDestroy (match);
578 return false; 863 return false;
864 }
579 865
580 FT_Face face = XftLockFace (f); 866 FT_Face face = XftLockFace (f);
581 867
582 prop = !FT_IS_FIXED_WIDTH (face); 868 slow = !FT_IS_FIXED_WIDTH (face);
583 869
584 int ftheight = 0; 870 int ftheight = 0;
585 871
586 for (;;) 872 for (;;)
587 { 873 {
588 XGlyphInfo g1, g2; 874 XGlyphInfo g1, g2;
589 FcChar8 c; 875 FcChar8 c;
590 876
591 c = 'i'; XftTextExtents8 (R->Xdisplay, f, &c, 1, &g1); 877 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);
592 c = 'W'; XftTextExtents8 (R->Xdisplay, f, &c, 1, &g2); 878 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);
593 879
594 prop = prop || g1.xOff != g2.xOff; // don't simply trust the font 880 if (g1.xOff != g2.xOff) // don't simply trust the font
881 slow = true;
595 882
596 width = g2.xOff; 883 width = g2.xOff;
597 ascent = (face->size->metrics.ascender + 63) >> 6; 884 ascent = (face->size->metrics.ascender + 63) >> 6;
598 descent = (-face->size->metrics.descender + 63) >> 6; 885 descent = (-face->size->metrics.descender + 63) >> 6;
599 height = ascent + descent; 886 height = ascent + descent;
600 887
601 if (height <= maxheight || !maxheight) 888 if (height <= prop.height || !prop.height)
602 break; 889 break;
603 890
604 if (ftheight) 891 if (ftheight)
605 { 892 {
606 // take smaller steps near the end 893 // take smaller steps near the end
607 if (height > maxheight + 1) ftheight++; 894 if (height > prop.height + 1) ftheight++;
608 if (height > maxheight + 2) ftheight++; 895 if (height > prop.height + 2) ftheight++;
609 if (height > maxheight + 3) ftheight++; 896 if (height > prop.height + 3) ftheight++;
610 897
611 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight); 898 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);
612 } 899 }
613 else 900 else
614 FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight); 901 FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);
615 } 902 }
616 903
617 XftUnlockFace (f); 904 XftUnlockFace (f);
618 905
619 return true; 906 return true;
620} 907}
621
622#if 0
623void rxvt_font::gen_coverage_swath (unsigned int page)
624{
625 cvr[page] = new swath;
626
627 for (int i = 0; i < SWATHSIZE; i++)
628 cvr[page][i] = 0;
629
630 populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1);
631}
632#endif
633 908
634bool 909bool
635rxvt_font_xft::has_codepoint (uint32_t unicode) 910rxvt_font_xft::has_codepoint (uint32_t unicode)
636{ 911{
637 return XftCharExists (R->Xdisplay, f, unicode); 912 return XftCharExists (DISPLAY, f, unicode);
638} 913}
639 914
640void 915void
641rxvt_font_xft::draw (int x, int y, 916rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
642 const text_t *text, int len, 917 const text_t *text, int len,
643 int fg, int bg) 918 int fg, int bg)
644{ 919{
645 if (!d)
646 d = XftDrawCreate (R->Xdisplay, DRAWABLE, XVISUAL, XCMAP);
647
648 if (bg >= 0 && bg != Color_bg)
649 XftDrawRect (d, &R->PixColors[bg].c, x, y, R->TermWin.fwidth * len, R->TermWin.fheight);
650 else
651 clear_rect (x, y, R->TermWin.fwidth * len, R->TermWin.fheight, bg); 920 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
652 921
653 if (!prop && width == R->TermWin.fwidth) 922 if (!slow && width == r->TermWin.fwidth && 0)
654 { 923 {
655 if (sizeof (text_t) == sizeof (FcChar16)) 924 if (sizeof (text_t) == sizeof (FcChar16))
656 XftDrawString16 (d, &R->PixColors[fg].c, f, x, y + R->TermWin.fbase, (const FcChar16 *)text, len); 925 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
657 else 926 else
658 XftDrawString32 (d, &R->PixColors[fg].c, f, x, y + R->TermWin.fbase, (const FcChar32 *)text, len); 927 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
659 } 928 }
660 else 929 else
661 { 930 {
662 while (len) 931 while (len)
663 { 932 {
664 if (*text != NOCHAR && *text != ' ') 933 if (*text != NOCHAR && *text != ' ')
665 { 934 {
935 int fwidth = r->TermWin.fwidth;
936 if (len >= 2 && text[1] == NOCHAR)
937 fwidth *= 2;
938
939 XGlyphInfo extents;
666 if (sizeof (text_t) == sizeof (FcChar16)) 940 if (sizeof (text_t) == sizeof (FcChar16))
667 XftDrawString16 (d, &R->PixColors[fg].c, f, x, y + R->TermWin.fbase, (const FcChar16 *)text, 1); 941 {
942 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
943 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
944 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
945 }
668 else 946 else
669 XftDrawString32 (d, &R->PixColors[fg].c, f, x, y + R->TermWin.fbase, (const FcChar32 *)text, 1); 947 {
948 XGlyphInfo extents;
949 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
950 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
951 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
952 }
670 } 953 }
671 954
672 x += R->TermWin.fwidth; 955 x += r->TermWin.fwidth;
673 text++; 956 text++;
674 len--; 957 len--;
675 } 958 }
676 } 959 }
677} 960}
678#endif 961#endif
679 962
680///////////////////////////////////////////////////////////////////////////// 963/////////////////////////////////////////////////////////////////////////////
681 964
682rxvt_fontset::rxvt_fontset (pR) 965rxvt_fontset::rxvt_fontset (rxvt_t r)
683#ifdef EXPLICIT_CONTEXT 966: r (r)
684: rxvt_term(R)
685#endif
686{ 967{
687 clear (); 968 clear ();
688} 969}
689 970
690rxvt_fontset::~rxvt_fontset () 971rxvt_fontset::~rxvt_fontset ()
… …
693} 974}
694 975
695void 976void
696rxvt_fontset::clear () 977rxvt_fontset::clear ()
697{ 978{
698 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 979 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
699 FONT_UNREF (*i); 980 FONT_UNREF (*i);
700 981
701 fonts.clear (); 982 fonts.clear ();
702 base_id = 0; 983 base_id = 0;
703 height = 0x7fffffff; 984 base_prop.height = 0x7fffffff;
985 base_prop.weight = rxvt_fontprop::medium;
986 base_prop.slant = rxvt_fontprop::roman;
704 987
705 fallback = fallback_fonts; 988 fallback = fallback_fonts;
706} 989}
707 990
708rxvt_font * 991rxvt_font *
… …
728 f = new rxvt_font_x11; 1011 f = new rxvt_font_x11;
729 } 1012 }
730 else 1013 else
731 f = new rxvt_font_x11; 1014 f = new rxvt_font_x11;
732 1015
733 f->set_term (aR); 1016 f->set_term (r);
734 f->set_name (strdup (name)); 1017 f->set_name (strdup (name));
735 1018
736 f->cs = cs; 1019 f->cs = cs;
737 f->loaded = false; 1020 f->loaded = false;
738 1021
… …
755 1038
756 if (*desc == '[') 1039 if (*desc == '[')
757 { 1040 {
758 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1041 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
759 1042
760 const char *extra = desc++; 1043 //const char *extra = desc++; // not yet used
761 1044
762 desc = strchr (desc, ']'); 1045 desc = strchr (desc, ']');
763 1046
764 if (!desc) 1047 if (!desc)
765 { 1048 {
… …
793rxvt_fontset::realize_font (int i) 1076rxvt_fontset::realize_font (int i)
794{ 1077{
795 if (fonts[i]->loaded) 1078 if (fonts[i]->loaded)
796 return true; 1079 return true;
797 1080
798 if (fonts[i]->load (height))
799 return fonts[i]->loaded = true; 1081 fonts[i]->loaded = true;
800 1082
801 delete fonts[i]; 1083 if (!fonts[i]->load (base_prop))
802 fonts.erase (fonts.begin () + i); 1084 {
803 1085 fonts[i]->cs = CS_UNKNOWN;
804 return false; 1086 return false;
805} 1087 }
806 1088
807void 1089 return true;
1090}
1091
1092bool
808rxvt_fontset::populate (const char *desc) 1093rxvt_fontset::populate (const char *desc)
809{ 1094{
810 clear (); 1095 clear ();
811 1096
812 fonts.push_back (new_font (0, CS_UNICODE)); 1097 fonts.push_back (new_font (0, CS_UNICODE));
… …
816 1101
817 if (!base_id) 1102 if (!base_id)
818 base_id = 1; 1103 base_id = 1;
819 1104
820 // we currently need a base-font, no matter what 1105 // we currently need a base-font, no matter what
821 if (fonts.size () <= base_id) 1106 if ((int)fonts.size () <= base_id || !realize_font (base_id))
822 { 1107 {
1108 puts ("unable to load specified font (s), falling back to 'fixed'\n");
823 add_fonts ("fixed"); 1109 add_fonts ("fixed");
824 base_id = 1; 1110 base_id = fonts.size () - 1;
825 } 1111 }
826 1112
827 if (fonts.size () <= base_id || !realize_font (base_id)) 1113 if ((int)fonts.size () <= base_id || !realize_font (base_id))
828 { 1114 return false;
829 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
830 exit (1);
831 }
832 1115
833 height = fonts[base_id]->height; 1116 base_prop = fonts[base_id]->properties ();
834 1117
835 /*add_fonts ("-efont-fixed-medium-r-normal-*-14-*-*-*-*-*-iso10646-1,"*/ 1118 return true;
836} 1119}
837 1120
838int 1121int
839rxvt_fontset::find_font (uint32_t unicode) 1122rxvt_fontset::find_font (uint32_t unicode)
840{ 1123{
841 for (int i = 0; i < fonts.size (); i++) 1124 for (unsigned int i = 0; i < fonts.size (); i++)
842 { 1125 {
843 rxvt_font *f = fonts[i]; 1126 rxvt_font *f = fonts[i];
844 1127
845 if (!f->loaded) 1128 if (!f->loaded)
846 { 1129 {
847 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1130 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
848 goto next_font; 1131 goto next_font;
849 1132
850 if (!realize_font (i)) 1133 if (!realize_font (i))
851 {
852 --i;
853 goto next_font; 1134 goto next_font;
854 } 1135 }
855 1136
856 //printf ("added font %s for %04lx\n", f->name, unicode);
857 }
858
859 if (f->has_codepoint (unicode)) 1137 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode))
860 return i; 1138 return i;
861 1139
862 next_font: 1140 next_font:
863 if (i == fonts.size () - 1 && fallback->name) 1141 if (i == fonts.size () - 1 && fallback->name)
864 { 1142 {
865 fonts.push_back (new_font (fallback->name, fallback->cs)); 1143 fonts.push_back (new_font (fallback->name, fallback->cs));
866 fallback++; 1144 fallback++;
1145 i = 0;
867 } 1146 }
868 } 1147 }
869 1148
870 return 0; /* we must return SOME font */ 1149 return 0; /* we must return SOME font */
871} 1150}

Diff Legend

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