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.37 by pcg, Fri Mar 5 05:52:02 2004 UTC

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

Diff Legend

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