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.40 by pcg, Mon Mar 15 00:08:11 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
273 set_name ("built-in pseudofont");
274
230 return true; 275 return true;
231 } 276 }
232 277
233 bool has_codepoint (uint32_t unicode) 278 bool has_codepoint (unicode_t unicode)
234 { 279 {
235 if (unicode <= 0x001f) 280 if (unicode <= 0x001f)
236 return true; 281 return true;
282
237 if (unicode >= 0x0080 && unicode <= 0x009f) 283 if (unicode >= 0x0080 && unicode <= 0x009f)
238 return true; 284 return true;
239 285
240 if (unicode >= 0x2500 && unicode <= 0x257f 286 if (unicode >= 0x2500 && unicode <= 0x257f
241 && linedraw_cmds[unicode - 0x2500]) 287 && linedraw_cmds[unicode - 0x2500])
288 return true;
289
290 if (IS_COMPOSE (unicode))
242 return true; 291 return true;
243 292
244 switch (unicode) 293 switch (unicode)
245 { 294 {
246 case ZERO_WIDTH_CHAR: 295 case ZERO_WIDTH_CHAR:
… …
248 } 297 }
249 298
250 return false; 299 return false;
251 } 300 }
252 301
253 void draw (int x, int y, 302 void draw (rxvt_drawable &d, int x, int y,
254 const text_t *text, int len, 303 const text_t *text, int len,
255 int fg, int bg); 304 int fg, int bg);
256}; 305};
257 306
258void 307void
259rxvt_font_default::draw (int x, int y, 308rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
260 const text_t *text, int len, 309 const text_t *text, int len,
261 int fg, int bg) 310 int fg, int bg)
262{ 311{
263 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);
264 313
265 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 314 XSetForeground (d.display->display, GC, r->PixColors[fg]);
266 315
267 while (len--) 316 while (len--)
268 { 317 {
318#if ENABLE_COMBINING
319 compose_char *cc;
320#endif
269 text_t t = *text++; 321 text_t t = *text++;
270 322
323 // is it in our linedrawing table?
271 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 324 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
272 { 325 {
273 const char *p = linedraw_cmds[t - 0x2500]; 326 const char *p = linedraw_cmds[t - 0x2500];
274 327
275 int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1; 328 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; 329 int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1;
277 330
278 XGCValues gcv; 331 XGCValues gcv;
279
280 gcv.cap_style = CapButt;
281 XChangeGC (DISPLAY, GC, GCCapStyle, &gcv);
282 332
283 while (*p) 333 while (*p)
284 { 334 {
285 switch (*p++) 335 switch (*p++)
286 { 336 {
287 case '1': 337 case '1':
288 gcv.line_width = 0; 338 gcv.line_width = 0;
289 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 339 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
290 break; 340 break;
291 341
292 case '2': 342 case '2':
293 gcv.line_width = 2; 343 gcv.line_width = 2;
294 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 344 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
295 break; 345 break;
296 346
297 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 347 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; 348 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; 349 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; 350 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; 351 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; 352 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
303 } 353 }
304 } 354 }
305 355
306 gcv.line_width = 0; 356 gcv.line_width = 0;
307 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 357 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
358 }
359#if ENABLE_COMBINING
360 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
308 } 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
309 else 375 else
310 switch (*text++) 376 switch (t)
311 { 377 {
312 case NOCHAR:
313 case ZERO_WIDTH_CHAR: 378 case ZERO_WIDTH_CHAR:
314 break; 379 break;
315 default: 380 default:
316 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 381 int w = 0;
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;
317 } 392 }
318 393
319 x += r->TermWin.fwidth; 394 x += r->TermWin.fwidth;
320 } 395 }
321} 396}
… …
325struct rxvt_font_x11 : rxvt_font { 400struct rxvt_font_x11 : rxvt_font {
326 rxvt_font_x11 () { f = 0; } 401 rxvt_font_x11 () { f = 0; }
327 402
328 void clear (); 403 void clear ();
329 404
330 bool load (int maxheight); 405 rxvt_fontprop properties ();
331 406
407 bool load (const rxvt_fontprop &prop);
408
332 bool has_codepoint (uint32_t unicode); 409 bool has_codepoint (unicode_t unicode);
333 410
334 void draw (int x, int y, 411 void draw (rxvt_drawable &d, int x, int y,
335 const text_t *text, int len, 412 const text_t *text, int len,
336 int fg, int bg); 413 int fg, int bg);
337 414
338 XFontStruct *f; 415 XFontStruct *f;
339 codeset cs; 416 codeset cs;
340 bool enc2b, encm; 417 bool enc2b, encm;
341 418
342 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);
343}; 423};
344 424
345const char * 425const char *
346rxvt_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
347{ 427{
348 unsigned long value; 428 unsigned long value;
349 429
350 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 430 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
351 return XGetAtomName (DISPLAY, value); 431 return XGetAtomName (DISPLAY, value);
352 else 432 else
353 return repl; 433 return repl;
354} 434}
355 435
436rxvt_fontprop
437rxvt_font_x11::properties ()
438{
439 rxvt_fontprop p;
440 set_properties (p, f);
441 return p;
442}
443
356bool 444bool
357rxvt_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)
358{ 537{
359 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;
360 577
361 f = XLoadQueryFont (DISPLAY, name); 578 f = XLoadQueryFont (DISPLAY, name);
362 579
363 if (!f) 580 if (!f)
364 return false; 581 return false;
365 582
366 unsigned long value;
367
368 const char *registry = get_property ("CHARSET_REGISTRY", 0); 583 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
369 const char *encoding = get_property ("CHARSET_ENCODING", 0); 584 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
370 585
371 if (registry && encoding) 586 if (registry && encoding)
372 { 587 {
373 char charset[64]; 588 char charset[64];
374 snprintf (charset, 64, "%s-%s", registry, encoding); 589 snprintf (charset, 64, "%s-%s", registry, encoding);
375 590
376 cs = codeset_from_name (charset); 591 cs = codeset_from_name (charset);
377 } 592 }
378 else 593 else
379 { 594 {
380 const char *charset = get_property ("FONT", 0); 595 const char *charset = get_property (f, "FONT", 0);
381 596
382 if (!charset) 597 if (!charset)
383 charset = name; 598 charset = name;
384 599
385 int count = 13; 600 int count = 13;
… …
398 613
399 ascent = f->ascent; 614 ascent = f->ascent;
400 descent = f->descent; 615 descent = f->descent;
401 height = ascent + descent; 616 height = ascent + descent;
402 617
403 prop = false; 618 slow = false;
404 619
405 if (f->min_bounds.width == f->max_bounds.width) 620 if (f->min_bounds.width == f->max_bounds.width)
406 width = f->min_bounds.width; 621 width = f->min_bounds.width;
407 else if (f->per_char == NULL) 622 else if (f->per_char == NULL)
408 width = f->max_bounds.width; 623 width = f->max_bounds.width;
409 else 624 else
410 { 625 {
411 prop = true; 626 slow = true;
412 627
413 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;
414 629
415 if (encm) 630 if (encm)
416 N += (f->max_byte1 - f->min_byte1) 631 N += (f->max_byte1 - f->min_byte1)
… …
446 f = 0; 661 f = 0;
447 } 662 }
448} 663}
449 664
450bool 665bool
451rxvt_font_x11::has_codepoint (uint32_t unicode) 666rxvt_font_x11::has_codepoint (unicode_t unicode)
452{ 667{
453 uint32_t ch = FROM_UNICODE (cs, unicode); 668 uint32_t ch = FROM_UNICODE (cs, unicode);
454 669
455 if (ch == NOCHAR) 670 if (ch == NOCHAR)
456 return false; 671 return false;
… …
458 /* check wether the character exists in _this_ font. horrible. */ 673 /* check wether the character exists in _this_ font. horrible. */
459 XCharStruct *xcs; 674 XCharStruct *xcs;
460 675
461 if (encm) 676 if (encm)
462 { 677 {
463 int byte1 = ch >> 8; 678 unsigned char byte1 = ch >> 8;
464 int byte2 = ch & 255; 679 unsigned char byte2 = ch & 255;
465 680
466 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 681 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
467 || 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)
468 return false; 683 return false;
469 684
… …
492 707
493 return true; 708 return true;
494} 709}
495 710
496void 711void
497rxvt_font_x11::draw (int x, int y, 712rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
498 const text_t *text, int len, 713 const text_t *text, int len,
499 int fg, int bg) 714 int fg, int bg)
500{ 715{
501 // this looks like a mess /. 716 // this looks like a mess /.
502 // and it is a mess /. 717 // and it is a mess /.
503 // yet we are trying to be perfect /. 718 // yet we are trying to be perfect /.
504 // but the result still isn't perfect /. 719 // but the result still isn't perfect /.
505 720
506 bool slow = prop 721 bool slow = this->slow
507 || width != r->TermWin.fwidth 722 || width != r->TermWin.fwidth
508 || height != r->TermWin.fheight; 723 || height != r->TermWin.fheight;
509 724
510 int base = r->TermWin.fbase; 725 int base = r->TermWin.fbase;
511 726
… …
518 { 733 {
519 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 734 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
520 735
521 if (bg == Color_bg && !slow) 736 if (bg == Color_bg && !slow)
522 { 737 {
523 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 738 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
524 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 739 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
525 } 740 }
526 else 741 else
527 { 742 {
528 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);
529 744
530 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 745 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
531 746
532 if (slow) 747 if (slow)
533 { 748 {
534 do 749 do
535 { 750 {
536 if (xc->byte1 || xc->byte2) 751 if (xc->byte1 || xc->byte2)
537 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 752 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
538 753
539 x += r->TermWin.fwidth; 754 x += r->TermWin.fwidth;
540 xc++; len--; 755 xc++; len--;
541 } 756 }
542 while (len); 757 while (len);
543 } 758 }
544 else 759 else
545 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 760 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
546 } 761 }
547 } 762 }
548 else 763 else
549 { 764 {
550 const char *xc = enc_char (text, len, cs, slow); 765 const char *xc = enc_char (text, len, cs, slow);
551 766
552 if (bg == Color_bg && !slow) 767 if (bg == Color_bg && !slow)
553 { 768 {
554 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 769 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
555 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 770 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
556 } 771 }
557 else 772 else
558 { 773 {
559 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);
560 775
561 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 776 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
562 777
563 if (slow) 778 if (slow)
564 { 779 {
565 do 780 do
566 { 781 {
567 if (*xc) 782 if (*xc)
568 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 783 XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
569 784
570 x += r->TermWin.fwidth; 785 x += r->TermWin.fwidth;
571 xc++; len--; 786 xc++; len--;
572 } 787 }
573 while (len); 788 while (len);
574 } 789 }
575 else 790 else
576 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 791 XDrawString (d.display->display, d, GC, x, y + base, xc, len);
577 } 792 }
578 } 793 }
579} 794}
580 795
581///////////////////////////////////////////////////////////////////////////// 796/////////////////////////////////////////////////////////////////////////////
… …
586//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 801//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
587#define SWATHBITS 8 802#define SWATHBITS 8
588#endif 803#endif
589 804
590struct rxvt_font_xft : rxvt_font { 805struct 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; } 806 rxvt_font_xft () { f = 0; }
618 807
619 void clear (); 808 void clear ();
620 809
621 bool load (int maxheight); 810 rxvt_fontprop properties ();
622 811
623 void draw (int x, int y, 812 bool load (const rxvt_fontprop &prop);
813
814 void draw (rxvt_drawable &d, int x, int y,
624 const text_t *text, int len, 815 const text_t *text, int len,
625 int fg, int bg); 816 int fg, int bg);
626 817
627 bool has_codepoint (uint32_t unicode); 818 bool has_codepoint (unicode_t unicode);
628 819
629protected: 820protected:
630 XftFont *f; 821 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}; 822};
641 823
642void 824void
643rxvt_font_xft::clear () 825rxvt_font_xft::clear ()
644{ 826{
645 if (f) 827 if (f)
646 { 828 {
647 XftFontClose (DISPLAY, f); 829 XftFontClose (DISPLAY, f);
648 f = 0; 830 f = 0;
649 } 831 }
832}
650 833
651 if (d) 834rxvt_fontprop
652 { 835rxvt_font_xft::properties ()
653 XftDrawDestroy (d); 836{
654 d = 0; 837 rxvt_fontprop p;
655 }
656 838
657#if 0 839 FT_Face face = XftLockFace (f);
658 for (int i = 0; i < SWATHCOUNT; i++) 840
659 delete cvr[i]; 841 p.width = width; p.height = height;
660#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;
661} 848}
662 849
663bool 850bool
664rxvt_font_xft::load (int maxheight) 851rxvt_font_xft::load (const rxvt_fontprop &prop)
665{ 852{
666#if 0 853#if 0
667 for (int i = 0; i < SWATHCOUNT; i++) 854 for (int i = 0; i < SWATHCOUNT; i++)
668 cvr[i] = 0; 855 cvr[i] = 0;
669#endif 856#endif
670 857
671 clear (); 858 clear ();
672 859
673 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);
674 890
675 if (!f) 891 if (!f)
892 {
893 FcPatternDestroy (match);
676 return false; 894 return false;
895 }
677 896
678 FT_Face face = XftLockFace (f); 897 FT_Face face = XftLockFace (f);
679 898
680 prop = !FT_IS_FIXED_WIDTH (face); 899 slow = !FT_IS_FIXED_WIDTH (face);
681 900
682 int ftheight = 0; 901 int ftheight = 0;
683 902
684 for (;;) 903 for (;;)
685 { 904 {
… …
687 FcChar8 c; 906 FcChar8 c;
688 907
689 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1); 908 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);
690 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2); 909 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);
691 910
692 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;
693 913
694 width = g2.xOff; 914 width = g2.xOff;
695 ascent = (face->size->metrics.ascender + 63) >> 6; 915 ascent = (face->size->metrics.ascender + 63) >> 6;
696 descent = (-face->size->metrics.descender + 63) >> 6; 916 descent = (-face->size->metrics.descender + 63) >> 6;
697 height = ascent + descent; 917 height = ascent + descent;
698 918
699 if (height <= maxheight || !maxheight) 919 if (height <= prop.height || !prop.height)
700 break; 920 break;
701 921
702 if (ftheight) 922 if (ftheight)
703 { 923 {
704 // take smaller steps near the end 924 // take smaller steps near the end
705 if (height > maxheight + 1) ftheight++; 925 if (height > prop.height + 1) ftheight++;
706 if (height > maxheight + 2) ftheight++; 926 if (height > prop.height + 2) ftheight++;
707 if (height > maxheight + 3) ftheight++; 927 if (height > prop.height + 3) ftheight++;
708 928
709 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight); 929 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);
710 } 930 }
711 else 931 else
712 FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight); 932 FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);
713 } 933 }
714 934
715 XftUnlockFace (f); 935 XftUnlockFace (f);
716 936
717 return true; 937 return true;
718} 938}
719 939
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
732bool 940bool
733rxvt_font_xft::has_codepoint (uint32_t unicode) 941rxvt_font_xft::has_codepoint (unicode_t unicode)
734{ 942{
735 return XftCharExists (DISPLAY, f, unicode); 943 return XftCharExists (DISPLAY, f, unicode);
736} 944}
737 945
738void 946void
739rxvt_font_xft::draw (int x, int y, 947rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
740 const text_t *text, int len, 948 const text_t *text, int len,
741 int fg, int bg) 949 int fg, int bg)
742{ 950{
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); 951 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
753 952
754 if (!prop && width == r->TermWin.fwidth) 953 if (!slow && width == r->TermWin.fwidth && 0)
755 { 954 {
756 if (sizeof (text_t) == sizeof (FcChar16)) 955 if (sizeof (text_t) == sizeof (FcChar16))
757 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);
758 else 957 else
759 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);
… …
762 { 961 {
763 while (len) 962 while (len)
764 { 963 {
765 if (*text != NOCHAR && *text != ' ') 964 if (*text != NOCHAR && *text != ' ')
766 { 965 {
966 int fwidth = r->TermWin.fwidth;
967 if (len >= 2 && text[1] == NOCHAR)
968 fwidth *= 2;
969
970 XGlyphInfo extents;
767 if (sizeof (text_t) == sizeof (FcChar16)) 971 if (sizeof (text_t) == sizeof (FcChar16))
768 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 }
769 else 977 else
770 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 }
771 } 984 }
772 985
773 x += r->TermWin.fwidth; 986 x += r->TermWin.fwidth;
774 text++; 987 text++;
775 len--; 988 len--;
… …
779#endif 992#endif
780 993
781///////////////////////////////////////////////////////////////////////////// 994/////////////////////////////////////////////////////////////////////////////
782 995
783rxvt_fontset::rxvt_fontset (rxvt_t r) 996rxvt_fontset::rxvt_fontset (rxvt_t r)
784#ifdef EXPLICIT_CONTEXT
785: r(r) 997: r (r)
786#endif
787{ 998{
788 clear (); 999 clear ();
789} 1000}
790 1001
791rxvt_fontset::~rxvt_fontset () 1002rxvt_fontset::~rxvt_fontset ()
… …
794} 1005}
795 1006
796void 1007void
797rxvt_fontset::clear () 1008rxvt_fontset::clear ()
798{ 1009{
799 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 1010 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
800 FONT_UNREF (*i); 1011 FONT_UNREF (*i);
801 1012
802 fonts.clear (); 1013 fonts.clear ();
803 base_id = 0; 1014 base_id = 0;
804 height = 0x7fffffff; 1015 base_prop.height = 0x7fffffff;
1016 base_prop.weight = rxvt_fontprop::medium;
1017 base_prop.slant = rxvt_fontprop::roman;
805 1018
806 fallback = fallback_fonts; 1019 fallback = fallback_fonts;
807} 1020}
808 1021
809rxvt_font * 1022rxvt_font *
… …
829 f = new rxvt_font_x11; 1042 f = new rxvt_font_x11;
830 } 1043 }
831 else 1044 else
832 f = new rxvt_font_x11; 1045 f = new rxvt_font_x11;
833 1046
1047 f->fs = this;
834 f->set_term (r); 1048 f->set_term (r);
835 f->set_name (strdup (name)); 1049 f->set_name (strdup (name));
836 1050
837 f->cs = cs; 1051 f->cs = cs;
838 f->loaded = false; 1052 f->loaded = false;
… …
856 1070
857 if (*desc == '[') 1071 if (*desc == '[')
858 { 1072 {
859 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1073 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
860 1074
861 const char *extra = desc++; 1075 //const char *extra = desc++; // not yet used
862 1076
863 desc = strchr (desc, ']'); 1077 desc = strchr (desc, ']');
864 1078
865 if (!desc) 1079 if (!desc)
866 { 1080 {
… …
894rxvt_fontset::realize_font (int i) 1108rxvt_fontset::realize_font (int i)
895{ 1109{
896 if (fonts[i]->loaded) 1110 if (fonts[i]->loaded)
897 return true; 1111 return true;
898 1112
899 if (fonts[i]->load (height))
900 return fonts[i]->loaded = true; 1113 fonts[i]->loaded = true;
901 1114
902 delete fonts[i]; 1115 if (!fonts[i]->load (base_prop))
903 fonts.erase (fonts.begin () + i); 1116 {
904 1117 fonts[i]->cs = CS_UNKNOWN;
905 return false; 1118 return false;
906} 1119 }
907 1120
908void 1121 return true;
1122}
1123
1124bool
909rxvt_fontset::populate (const char *desc) 1125rxvt_fontset::populate (const char *desc)
910{ 1126{
911 clear (); 1127 clear ();
912 1128
913 fonts.push_back (new_font (0, CS_UNICODE)); 1129 fonts.push_back (new_font (0, CS_UNICODE));
… …
917 1133
918 if (!base_id) 1134 if (!base_id)
919 base_id = 1; 1135 base_id = 1;
920 1136
921 // we currently need a base-font, no matter what 1137 // we currently need a base-font, no matter what
922 if (fonts.size () <= base_id) 1138 if ((int)fonts.size () <= base_id || !realize_font (base_id))
923 { 1139 {
1140 puts ("unable to load specified font (s), falling back to 'fixed'\n");
924 add_fonts ("fixed"); 1141 add_fonts ("fixed");
925 base_id = 1; 1142 base_id = fonts.size () - 1;
926 } 1143 }
927 1144
928 if (fonts.size () <= base_id || !realize_font (base_id)) 1145 if ((int)fonts.size () <= base_id || !realize_font (base_id))
929 { 1146 return false;
930 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
931 exit (1);
932 }
933 1147
934 height = fonts[base_id]->height; 1148 base_prop = fonts[base_id]->properties ();
935 1149
936 /*add_fonts ("-efont-fixed-medium-r-normal-*-14-*-*-*-*-*-iso10646-1,"*/ 1150 return true;
937} 1151}
938 1152
939int 1153int
940rxvt_fontset::find_font (uint32_t unicode) 1154rxvt_fontset::find_font (unicode_t unicode)
941{ 1155{
942 for (int i = 0; i < fonts.size (); i++) 1156 for (unsigned int i = 0; i < fonts.size (); i++)
943 { 1157 {
944 rxvt_font *f = fonts[i]; 1158 rxvt_font *f = fonts[i];
945 1159
946 if (!f->loaded) 1160 if (!f->loaded)
947 { 1161 {
948 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1162 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
949 goto next_font; 1163 goto next_font;
950 1164
951 if (!realize_font (i)) 1165 if (!realize_font (i))
952 {
953 --i;
954 goto next_font; 1166 goto next_font;
955 } 1167 }
956 1168
957 //printf ("added font %s for %04lx\n", f->name, unicode);
958 }
959
960 if (f->has_codepoint (unicode)) 1169 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode))
961 return i; 1170 return i;
962 1171
963 next_font: 1172 next_font:
964 if (i == fonts.size () - 1 && fallback->name) 1173 if (i == fonts.size () - 1 && fallback->name)
965 { 1174 {
966 fonts.push_back (new_font (fallback->name, fallback->cs)); 1175 fonts.push_back (new_font (fallback->name, fallback->cs));
967 fallback++; 1176 fallback++;
1177 i = 0;
968 } 1178 }
969 } 1179 }
970 1180
971 return 0; /* we must return SOME font */ 1181 return 0; /* we must return SOME font */
972} 1182}

Diff Legend

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