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

Diff Legend

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