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

Diff Legend

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