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

Diff Legend

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