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

Diff Legend

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