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

Diff Legend

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