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

Diff Legend

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