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.37 by pcg, Fri Mar 5 05:52:02 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_COMPOSE (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 {
316 compose_char *cc;
269 text_t t = *text++; 317 text_t t = *text++;
270 318
319 // is it in our linedrawing table?
271 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 320 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
272 { 321 {
273 const char *p = linedraw_cmds[t - 0x2500]; 322 const char *p = linedraw_cmds[t - 0x2500];
274 323
275 int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1; 324 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; 325 int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1;
277 326
278 XGCValues gcv; 327 XGCValues gcv;
279
280 gcv.cap_style = CapButt;
281 XChangeGC (DISPLAY, GC, GCCapStyle, &gcv);
282 328
283 while (*p) 329 while (*p)
284 { 330 {
285 switch (*p++) 331 switch (*p++)
286 { 332 {
287 case '1': 333 case '1':
288 gcv.line_width = 0; 334 gcv.line_width = 0;
289 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 335 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
290 break; 336 break;
291 337
292 case '2': 338 case '2':
293 gcv.line_width = 2; 339 gcv.line_width = 2;
294 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 340 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
295 break; 341 break;
296 342
297 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 343 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; 344 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; 345 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; 346 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; 347 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; 348 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
303 } 349 }
304 } 350 }
305 351
306 gcv.line_width = 0; 352 gcv.line_width = 0;
307 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 353 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
354 }
355 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
356 {
357 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
358 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
359 if (cc->c2 != NOCHAR)
360 {
361 // prefer font of first character, for no good reasons
362 rxvt_font *f2 = f1->has_codepoint (cc->c2)
363 ? f1
364 : (*fs)[fs->find_font (cc->c2)];
365
366 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
367 }
308 } 368 }
309 else 369 else
310 switch (*text++) 370 switch (t)
311 { 371 {
312 case NOCHAR:
313 case ZERO_WIDTH_CHAR: 372 case ZERO_WIDTH_CHAR:
314 break; 373 break;
315 default: 374 default:
316 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 375 int w = 0;
376 while (len > 0 && *text == NOCHAR)
377 {
378 ++text;
379 --len;
380 w += r->TermWin.fwidth;
381 }
382
383 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2,
384 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
385 x += w;
317 } 386 }
318 387
319 x += r->TermWin.fwidth; 388 x += r->TermWin.fwidth;
320 } 389 }
321} 390}
… …
325struct rxvt_font_x11 : rxvt_font { 394struct rxvt_font_x11 : rxvt_font {
326 rxvt_font_x11 () { f = 0; } 395 rxvt_font_x11 () { f = 0; }
327 396
328 void clear (); 397 void clear ();
329 398
330 bool load (int maxheight); 399 rxvt_fontprop properties ();
400
401 bool load (const rxvt_fontprop &prop);
331 402
332 bool has_codepoint (uint32_t unicode); 403 bool has_codepoint (uint32_t unicode);
333 404
334 void draw (int x, int y, 405 void draw (rxvt_drawable &d, int x, int y,
335 const text_t *text, int len, 406 const text_t *text, int len,
336 int fg, int bg); 407 int fg, int bg);
337 408
338 XFontStruct *f; 409 XFontStruct *f;
339 codeset cs; 410 codeset cs;
340 bool enc2b, encm; 411 bool enc2b, encm;
341 412
342 const char *get_property (const char *property, const char *repl) const; 413 const char *get_property (XFontStruct *f, const char *property, const char *repl) const;
414 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
415 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
416 bool set_properties (rxvt_fontprop &p, const char *name);
343}; 417};
344 418
345const char * 419const char *
346rxvt_font_x11::get_property (const char *property, const char *repl) const 420rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
347{ 421{
348 unsigned long value; 422 unsigned long value;
349 423
350 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 424 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
351 return XGetAtomName (DISPLAY, value); 425 return XGetAtomName (DISPLAY, value);
352 else 426 else
353 return repl; 427 return repl;
354} 428}
355 429
430rxvt_fontprop
431rxvt_font_x11::properties ()
432{
433 rxvt_fontprop p;
434 set_properties (p, f);
435 return p;
436}
437
356bool 438bool
357rxvt_font_x11::load (int maxheight) 439rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
440{
441 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
442 p.height = height;
443 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
444 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
445
446 return true;
447}
448
449bool
450rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
451{
452 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
453 const char *slant = get_property (f, "SLANT", "r");
454
455 unsigned long height;
456 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
457 return false;
458
459 unsigned long avgwidth;
460 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
461 avgwidth = 0;
462
463 return set_properties (p, height, weight, slant, avgwidth);
464}
465
466bool
467rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
468{
469 int slashes = 0;
470 const char *comp[13];
471
472 for (const char *c = name; *c; c++)
473 if (*c == '-')
474 {
475 comp[slashes++] = c + 1;
476 if (slashes >= 13)
477 break;
478 }
479
480 /* can we short-circuit the costly XLoadQueryFont? */
481 if (slashes >= 13
482 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
483 && (*comp[11] >= '0' && *comp[11] <= '9'))
484 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
485
486 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
487
488 if (f)
489 {
490 // the font should really exist now. if not, we have a problem
491 // (e.g. if the user did xset fp rehash just when we were searching fonts).
492 // in that case, just return garbage.
493 bool ret = set_properties (p, f);
494 XFreeFont (DISPLAY, f);
495 return ret;
496 }
497 else
498 return false;
499}
500
501// fix the size of scalable fonts
502static void
503fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop)
504{
505 int slashes = 0;
506 const char *size;
507
508 for (const char *c = name; *c; c++)
509 if (*c == '-')
510 {
511 if (slashes == 6)
512 size = c + 1;
513
514 if (++slashes >= 13)
515 break;
516 }
517
518 if (slashes >= 13 && size[0] == '0')
519 {
520 strncpy (buf, name, size - name);
521 buf += size - name;
522 buf += sprintf (buf, "%d", prop.height);
523 strcpy (buf, size + 1);
524 }
525 else
526 strcpy (buf, name);
527}
528
529bool
530rxvt_font_x11::load (const rxvt_fontprop &prop)
358{ 531{
359 clear (); 532 clear ();
533
534 char **list;
535 int count;
536 list = XListFonts (DISPLAY, name, 512, &count);
537 set_name (0);
538
539 if (!list)
540 return false;
541
542 int bestdiff = 0x7fffffff;
543 for (int i = 0; i < count; i++)
544 {
545 rxvt_fontprop p;
546 char fname[1024];
547 fix_scalable (fname, list[i], prop);
548
549 if (!set_properties (p, fname))
550 continue;
551
552 if (p.height > prop.height) // weed out too large fonts
553 continue;
554
555 int diff = (prop.height - p.height) * 32
556 + abs (prop.weight - p.weight)
557 + abs (prop.slant - p.slant );
558
559 if (!name // compare against best found so far
560 || diff < bestdiff)
561 {
562 set_name (strdup (fname));
563 bestdiff = diff;
564 }
565 }
566
567 XFreeFontNames (list);
568
569 if (!name)
570 return false;
360 571
361 f = XLoadQueryFont (DISPLAY, name); 572 f = XLoadQueryFont (DISPLAY, name);
362 573
363 if (!f) 574 if (!f)
364 return false; 575 return false;
365 576
366 unsigned long value;
367
368 const char *registry = get_property ("CHARSET_REGISTRY", 0); 577 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
369 const char *encoding = get_property ("CHARSET_ENCODING", 0); 578 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
370 579
371 if (registry && encoding) 580 if (registry && encoding)
372 { 581 {
373 char charset[64]; 582 char charset[64];
374 snprintf (charset, 64, "%s-%s", registry, encoding); 583 snprintf (charset, 64, "%s-%s", registry, encoding);
375 584
376 cs = codeset_from_name (charset); 585 cs = codeset_from_name (charset);
377 } 586 }
378 else 587 else
379 { 588 {
380 const char *charset = get_property ("FONT", 0); 589 const char *charset = get_property (f, "FONT", 0);
381 590
382 if (!charset) 591 if (!charset)
383 charset = name; 592 charset = name;
384 593
385 int count = 13; 594 int count = 13;
… …
398 607
399 ascent = f->ascent; 608 ascent = f->ascent;
400 descent = f->descent; 609 descent = f->descent;
401 height = ascent + descent; 610 height = ascent + descent;
402 611
403 prop = false; 612 slow = false;
404 613
405 if (f->min_bounds.width == f->max_bounds.width) 614 if (f->min_bounds.width == f->max_bounds.width)
406 width = f->min_bounds.width; 615 width = f->min_bounds.width;
407 else if (f->per_char == NULL) 616 else if (f->per_char == NULL)
408 width = f->max_bounds.width; 617 width = f->max_bounds.width;
409 else 618 else
410 { 619 {
411 prop = true; 620 slow = true;
412 621
413 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 622 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
414 623
415 if (encm) 624 if (encm)
416 N += (f->max_byte1 - f->min_byte1) 625 N += (f->max_byte1 - f->min_byte1)
… …
458 /* check wether the character exists in _this_ font. horrible. */ 667 /* check wether the character exists in _this_ font. horrible. */
459 XCharStruct *xcs; 668 XCharStruct *xcs;
460 669
461 if (encm) 670 if (encm)
462 { 671 {
463 int byte1 = ch >> 8; 672 unsigned char byte1 = ch >> 8;
464 int byte2 = ch & 255; 673 unsigned char byte2 = ch & 255;
465 674
466 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 675 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
467 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 676 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
468 return false; 677 return false;
469 678
… …
492 701
493 return true; 702 return true;
494} 703}
495 704
496void 705void
497rxvt_font_x11::draw (int x, int y, 706rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
498 const text_t *text, int len, 707 const text_t *text, int len,
499 int fg, int bg) 708 int fg, int bg)
500{ 709{
501 // this looks like a mess /. 710 // this looks like a mess /.
502 // and it is a mess /. 711 // and it is a mess /.
503 // yet we are trying to be perfect /. 712 // yet we are trying to be perfect /.
504 // but the result still isn't perfect /. 713 // but the result still isn't perfect /.
505 714
506 bool slow = prop 715 bool slow = this->slow
507 || width != r->TermWin.fwidth 716 || width != r->TermWin.fwidth
508 || height != r->TermWin.fheight; 717 || height != r->TermWin.fheight;
509 718
510 int base = r->TermWin.fbase; 719 int base = r->TermWin.fbase;
511 720
… …
518 { 727 {
519 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 728 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
520 729
521 if (bg == Color_bg && !slow) 730 if (bg == Color_bg && !slow)
522 { 731 {
523 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 732 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
524 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 733 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
525 } 734 }
526 else 735 else
527 { 736 {
528 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 737 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
529 738
530 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 739 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
531 740
532 if (slow) 741 if (slow)
533 { 742 {
534 do 743 do
535 { 744 {
536 if (xc->byte1 || xc->byte2) 745 if (xc->byte1 || xc->byte2)
537 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 746 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
538 747
539 x += r->TermWin.fwidth; 748 x += r->TermWin.fwidth;
540 xc++; len--; 749 xc++; len--;
541 } 750 }
542 while (len); 751 while (len);
543 } 752 }
544 else 753 else
545 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 754 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
546 } 755 }
547 } 756 }
548 else 757 else
549 { 758 {
550 const char *xc = enc_char (text, len, cs, slow); 759 const char *xc = enc_char (text, len, cs, slow);
551 760
552 if (bg == Color_bg && !slow) 761 if (bg == Color_bg && !slow)
553 { 762 {
554 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 763 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
555 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 764 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
556 } 765 }
557 else 766 else
558 { 767 {
559 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 768 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
560 769
561 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 770 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
562 771
563 if (slow) 772 if (slow)
564 { 773 {
565 do 774 do
566 { 775 {
567 if (*xc) 776 if (*xc)
568 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 777 XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
569 778
570 x += r->TermWin.fwidth; 779 x += r->TermWin.fwidth;
571 xc++; len--; 780 xc++; len--;
572 } 781 }
573 while (len); 782 while (len);
574 } 783 }
575 else 784 else
576 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 785 XDrawString (d.display->display, d, GC, x, y + base, xc, len);
577 } 786 }
578 } 787 }
579} 788}
580 789
581///////////////////////////////////////////////////////////////////////////// 790/////////////////////////////////////////////////////////////////////////////
… …
586//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 795//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
587#define SWATHBITS 8 796#define SWATHBITS 8
588#endif 797#endif
589 798
590struct rxvt_font_xft : rxvt_font { 799struct 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; } 800 rxvt_font_xft () { f = 0; }
618 801
619 void clear (); 802 void clear ();
620 803
621 bool load (int maxheight); 804 rxvt_fontprop properties ();
622 805
623 void draw (int x, int y, 806 bool load (const rxvt_fontprop &prop);
807
808 void draw (rxvt_drawable &d, int x, int y,
624 const text_t *text, int len, 809 const text_t *text, int len,
625 int fg, int bg); 810 int fg, int bg);
626 811
627 bool has_codepoint (uint32_t unicode); 812 bool has_codepoint (uint32_t unicode);
628 813
629protected: 814protected:
630 XftFont *f; 815 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}; 816};
641 817
642void 818void
643rxvt_font_xft::clear () 819rxvt_font_xft::clear ()
644{ 820{
645 if (f) 821 if (f)
646 { 822 {
647 XftFontClose (DISPLAY, f); 823 XftFontClose (DISPLAY, f);
648 f = 0; 824 f = 0;
649 } 825 }
826}
650 827
651 if (d) 828rxvt_fontprop
652 { 829rxvt_font_xft::properties ()
653 XftDrawDestroy (d); 830{
654 d = 0; 831 rxvt_fontprop p;
655 }
656 832
657#if 0 833 FT_Face face = XftLockFace (f);
658 for (int i = 0; i < SWATHCOUNT; i++) 834
659 delete cvr[i]; 835 p.width = width; p.height = height;
660#endif 836 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
837 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
838
839 XftUnlockFace (f);
840
841 return p;
661} 842}
662 843
663bool 844bool
664rxvt_font_xft::load (int maxheight) 845rxvt_font_xft::load (const rxvt_fontprop &prop)
665{ 846{
666#if 0 847#if 0
667 for (int i = 0; i < SWATHCOUNT; i++) 848 for (int i = 0; i < SWATHCOUNT; i++)
668 cvr[i] = 0; 849 cvr[i] = 0;
669#endif 850#endif
670 851
671 clear (); 852 clear ();
672 853
673 f = XftFontOpenName (DISPLAY, DefaultScreen (DISPLAY), name); 854 FcPattern *p = FcNameParse ((FcChar8 *) name);
855
856 if (!p)
857 return false;
858
859 FcValue v;
860
861 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
862 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
863
864 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
865 FcPatternAddInteger (p, FC_SLANT, prop.slant);
866
867#if 0 // clipping unfortunately destroys our precious double-width-characters
868 // clip width, we can't do better, or can we?
869 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
870 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
871#endif
872
873 //FcPatternAddBool (p, FC_MINSPACE, 1);
874
875 XftResult result;
876 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
877
878 FcPatternDestroy (p);
879
880 if (!match)
881 return false;
882
883 f = XftFontOpenPattern (DISPLAY, match);
674 884
675 if (!f) 885 if (!f)
886 {
887 FcPatternDestroy (match);
676 return false; 888 return false;
889 }
677 890
678 FT_Face face = XftLockFace (f); 891 FT_Face face = XftLockFace (f);
679 892
680 prop = !FT_IS_FIXED_WIDTH (face); 893 slow = !FT_IS_FIXED_WIDTH (face);
681 894
682 int ftheight = 0; 895 int ftheight = 0;
683 896
684 for (;;) 897 for (;;)
685 { 898 {
… …
687 FcChar8 c; 900 FcChar8 c;
688 901
689 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1); 902 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);
690 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2); 903 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);
691 904
692 prop = prop || g1.xOff != g2.xOff; // don't simply trust the font 905 if (g1.xOff != g2.xOff) // don't simply trust the font
906 slow = true;
693 907
694 width = g2.xOff; 908 width = g2.xOff;
695 ascent = (face->size->metrics.ascender + 63) >> 6; 909 ascent = (face->size->metrics.ascender + 63) >> 6;
696 descent = (-face->size->metrics.descender + 63) >> 6; 910 descent = (-face->size->metrics.descender + 63) >> 6;
697 height = ascent + descent; 911 height = ascent + descent;
698 912
699 if (height <= maxheight || !maxheight) 913 if (height <= prop.height || !prop.height)
700 break; 914 break;
701 915
702 if (ftheight) 916 if (ftheight)
703 { 917 {
704 // take smaller steps near the end 918 // take smaller steps near the end
705 if (height > maxheight + 1) ftheight++; 919 if (height > prop.height + 1) ftheight++;
706 if (height > maxheight + 2) ftheight++; 920 if (height > prop.height + 2) ftheight++;
707 if (height > maxheight + 3) ftheight++; 921 if (height > prop.height + 3) ftheight++;
708 922
709 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight); 923 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);
710 } 924 }
711 else 925 else
712 FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight); 926 FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);
713 } 927 }
714 928
715 XftUnlockFace (f); 929 XftUnlockFace (f);
716 930
717 return true; 931 return true;
718} 932}
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 933
732bool 934bool
733rxvt_font_xft::has_codepoint (uint32_t unicode) 935rxvt_font_xft::has_codepoint (uint32_t unicode)
734{ 936{
735 return XftCharExists (DISPLAY, f, unicode); 937 return XftCharExists (DISPLAY, f, unicode);
736} 938}
737 939
738void 940void
739rxvt_font_xft::draw (int x, int y, 941rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
740 const text_t *text, int len, 942 const text_t *text, int len,
741 int fg, int bg) 943 int fg, int bg)
742{ 944{
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); 945 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
753 946
754 if (!prop && width == r->TermWin.fwidth) 947 if (!slow && width == r->TermWin.fwidth && 0)
755 { 948 {
756 if (sizeof (text_t) == sizeof (FcChar16)) 949 if (sizeof (text_t) == sizeof (FcChar16))
757 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 950 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
758 else 951 else
759 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); 952 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
… …
762 { 955 {
763 while (len) 956 while (len)
764 { 957 {
765 if (*text != NOCHAR && *text != ' ') 958 if (*text != NOCHAR && *text != ' ')
766 { 959 {
960 int fwidth = r->TermWin.fwidth;
961 if (len >= 2 && text[1] == NOCHAR)
962 fwidth *= 2;
963
964 XGlyphInfo extents;
767 if (sizeof (text_t) == sizeof (FcChar16)) 965 if (sizeof (text_t) == sizeof (FcChar16))
768 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1); 966 {
967 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
968 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
969 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
970 }
769 else 971 else
770 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1); 972 {
973 XGlyphInfo extents;
974 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
975 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
976 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
977 }
771 } 978 }
772 979
773 x += r->TermWin.fwidth; 980 x += r->TermWin.fwidth;
774 text++; 981 text++;
775 len--; 982 len--;
… …
779#endif 986#endif
780 987
781///////////////////////////////////////////////////////////////////////////// 988/////////////////////////////////////////////////////////////////////////////
782 989
783rxvt_fontset::rxvt_fontset (rxvt_t r) 990rxvt_fontset::rxvt_fontset (rxvt_t r)
784#ifdef EXPLICIT_CONTEXT
785: r(r) 991: r (r)
786#endif
787{ 992{
788 clear (); 993 clear ();
789} 994}
790 995
791rxvt_fontset::~rxvt_fontset () 996rxvt_fontset::~rxvt_fontset ()
… …
794} 999}
795 1000
796void 1001void
797rxvt_fontset::clear () 1002rxvt_fontset::clear ()
798{ 1003{
799 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 1004 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
800 FONT_UNREF (*i); 1005 FONT_UNREF (*i);
801 1006
802 fonts.clear (); 1007 fonts.clear ();
803 base_id = 0; 1008 base_id = 0;
804 height = 0x7fffffff; 1009 base_prop.height = 0x7fffffff;
1010 base_prop.weight = rxvt_fontprop::medium;
1011 base_prop.slant = rxvt_fontprop::roman;
805 1012
806 fallback = fallback_fonts; 1013 fallback = fallback_fonts;
807} 1014}
808 1015
809rxvt_font * 1016rxvt_font *
… …
829 f = new rxvt_font_x11; 1036 f = new rxvt_font_x11;
830 } 1037 }
831 else 1038 else
832 f = new rxvt_font_x11; 1039 f = new rxvt_font_x11;
833 1040
1041 f->fs = this;
834 f->set_term (r); 1042 f->set_term (r);
835 f->set_name (strdup (name)); 1043 f->set_name (strdup (name));
836 1044
837 f->cs = cs; 1045 f->cs = cs;
838 f->loaded = false; 1046 f->loaded = false;
… …
856 1064
857 if (*desc == '[') 1065 if (*desc == '[')
858 { 1066 {
859 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1067 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
860 1068
861 const char *extra = desc++; 1069 //const char *extra = desc++; // not yet used
862 1070
863 desc = strchr (desc, ']'); 1071 desc = strchr (desc, ']');
864 1072
865 if (!desc) 1073 if (!desc)
866 { 1074 {
… …
894rxvt_fontset::realize_font (int i) 1102rxvt_fontset::realize_font (int i)
895{ 1103{
896 if (fonts[i]->loaded) 1104 if (fonts[i]->loaded)
897 return true; 1105 return true;
898 1106
899 if (fonts[i]->load (height))
900 return fonts[i]->loaded = true; 1107 fonts[i]->loaded = true;
901 1108
902 delete fonts[i]; 1109 if (!fonts[i]->load (base_prop))
903 fonts.erase (fonts.begin () + i); 1110 {
904 1111 fonts[i]->cs = CS_UNKNOWN;
905 return false; 1112 return false;
906} 1113 }
907 1114
908void 1115 return true;
1116}
1117
1118bool
909rxvt_fontset::populate (const char *desc) 1119rxvt_fontset::populate (const char *desc)
910{ 1120{
911 clear (); 1121 clear ();
912 1122
913 fonts.push_back (new_font (0, CS_UNICODE)); 1123 fonts.push_back (new_font (0, CS_UNICODE));
… …
917 1127
918 if (!base_id) 1128 if (!base_id)
919 base_id = 1; 1129 base_id = 1;
920 1130
921 // we currently need a base-font, no matter what 1131 // we currently need a base-font, no matter what
922 if (fonts.size () <= base_id) 1132 if ((int)fonts.size () <= base_id || !realize_font (base_id))
923 { 1133 {
1134 puts ("unable to load specified font (s), falling back to 'fixed'\n");
924 add_fonts ("fixed"); 1135 add_fonts ("fixed");
925 base_id = 1; 1136 base_id = fonts.size () - 1;
926 } 1137 }
927 1138
928 if (fonts.size () <= base_id || !realize_font (base_id)) 1139 if ((int)fonts.size () <= base_id || !realize_font (base_id))
929 { 1140 return false;
930 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
931 exit (1);
932 }
933 1141
934 height = fonts[base_id]->height; 1142 base_prop = fonts[base_id]->properties ();
935 1143
936 /*add_fonts ("-efont-fixed-medium-r-normal-*-14-*-*-*-*-*-iso10646-1,"*/ 1144 return true;
937} 1145}
938 1146
939int 1147int
940rxvt_fontset::find_font (uint32_t unicode) 1148rxvt_fontset::find_font (uint32_t unicode)
941{ 1149{
942 for (int i = 0; i < fonts.size (); i++) 1150 for (unsigned int i = 0; i < fonts.size (); i++)
943 { 1151 {
944 rxvt_font *f = fonts[i]; 1152 rxvt_font *f = fonts[i];
945 1153
946 if (!f->loaded) 1154 if (!f->loaded)
947 { 1155 {
948 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1156 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
949 goto next_font; 1157 goto next_font;
950 1158
951 if (!realize_font (i)) 1159 if (!realize_font (i))
952 {
953 --i;
954 goto next_font; 1160 goto next_font;
955 } 1161 }
956 1162
957 //printf ("added font %s for %04lx\n", f->name, unicode);
958 }
959
960 if (f->has_codepoint (unicode)) 1163 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode))
961 return i; 1164 return i;
962 1165
963 next_font: 1166 next_font:
964 if (i == fonts.size () - 1 && fallback->name) 1167 if (i == fonts.size () - 1 && fallback->name)
965 { 1168 {
966 fonts.push_back (new_font (fallback->name, fallback->cs)); 1169 fonts.push_back (new_font (fallback->name, fallback->cs));
967 fallback++; 1170 fallback++;
1171 i = 0;
968 } 1172 }
969 } 1173 }
970 1174
971 return 0; /* we must return SOME font */ 1175 return 0; /* we must return SOME font */
972} 1176}

Diff Legend

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