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.2 by pcg, Tue Nov 25 15:25:17 2003 UTC vs.
Revision 1.13 by pcg, Fri Dec 26 08:18:45 2003 UTC

… …
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->Xdisplay
27#define DRAWABLE r->TermWin.vt 29#define DRAWABLE r->TermWin.vt
28#define GC r->TermWin.gc 30#define GC r->TermWin.gc
29 31
30const struct rxvt_fallback_font { 32const struct rxvt_fallback_font {
… …
57 59
58 // japanese 60 // japanese
59#if ENCODING_JP || ENCODING_JP_EXT 61#if ENCODING_JP || ENCODING_JP_EXT
60# if XFT 62# if XFT
61 // prefer xft for complex scripts 63 // prefer xft for complex scripts
62 { CS_UNICODE, "xft:Kochi Gothic" }, 64 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" },
63# endif 65# endif
64 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 66 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
65 { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 67 { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
66 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 68 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
67#endif 69#endif
68 70
69#if ENCODING_CN || ENCODING_CN_EXT 71#if ENCODING_CN || ENCODING_CN_EXT
70# if XFT 72# if XFT
71 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 73 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
72 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 74 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
73 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 75 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
74 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 76 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
75# endif 77# endif
76 { CS_CNS11643_1992_1, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-1" }, 78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-1" },
77 { CS_CNS11643_1992_2, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-2" }, 79 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-2" },
78 { CS_CNS11643_1992_3, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-3" }, 80 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-3" },
79 { CS_CNS11643_1992_4, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-4" }, 81 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-4" },
80 { CS_CNS11643_1992_5, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-5" }, 82 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-5" },
81 { CS_CNS11643_1992_6, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-6" }, 83 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-6" },
82 { CS_CNS11643_1992_7, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-7" }, 84 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-7" },
83 { CS_CNS11643_1992_F, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-f" }, 85 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-f" },
84#endif 86#endif
85 87
86#if XFT 88#if XFT
87 { CS_UNICODE, "xft:Andale Mono" }, 89 { CS_UNICODE, "xft:Andale Mono" },
88 { CS_UNICODE, "xft:Arial Unicode MS" }, 90 { CS_UNICODE, "xft:Arial Unicode MS" },
89#endif 91#endif
90 { CS_UNICODE, "-*-lucidatypewriter-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 92 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
93 { CS_UNICODE, "xft:FreeMono" },
94 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
95 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
91 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 96 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
92 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
93 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
94 97
95 { CS_UNKNOWN, 0 } 98 { CS_UNKNOWN, 0 }
96}; 99};
97 100
98///////////////////////////////////////////////////////////////////////////// 101/////////////////////////////////////////////////////////////////////////////
… …
168 XSetForeground (DISPLAY, GC, r->PixColors[color]); 171 XSetForeground (DISPLAY, GC, r->PixColors[color]);
169 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 172 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h);
170 } 173 }
171} 174}
172 175
176static const char *linedraw_cmds[128] = {
177 "1hH", "2hH", "1vV", "2vV",
178 0, 0, 0, 0,
179 0, 0, 0, 0,
180 "1HV", "2H1V", "1H2V", "2HV",
181
182 // 2510
183 "1hV", "2h1V", "1h2V", "2hV",
184 "1Hv", "2H1v", "1H2v", "2Hv",
185 "1hv", "2h1v", "1h2v", "2hv",
186 "1HvV", "2H1vV", "1HV2v", "1Hv2V",
187
188 // 2520
189 "1H2vV", "2Hv1V", "2HV1v", "2HvV",
190 "1hvV", "2h1vV", "1hV2v", "1hv2V",
191 "1h2vV", "2hv1V", "1v2hV", "2hvV",
192 "1hHV", "2h1HV", "2H1hV", "2hH1V",
193
194 // 2530
195 "1hH2V", "2hV1H", "1h2HV", "2hHV",
196 "1hHv", "1vH2h", "1hv2H", "1v2hH",
197 "1hH2v", "1H2hv", "1h2Hv", "2hHv",
198 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
199
200 // 2540
201 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
202 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
203 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
204 0, 0, 0, 0,
205
206 // 2550
207 0, 0, 0, 0,
208 0, 0, 0, 0,
209 0, 0, 0, 0,
210 0, 0, 0, 0,
211
212 // 2560
213 0, 0, 0, 0,
214 0, 0, 0, 0,
215 0, 0, 0, 0,
216 0, 0, 0, 0,
217
218 // 2570
219 0, "1a", "1b", "1ab",
220 "1h", "1v", "1H", "1V",
221 "2h", "2v", "2H", "2V",
222 "1h2H", "1v2V", "1H2h", "1V2v"
223
224 // to be done
225};
226
173struct rxvt_font_default : rxvt_font { 227struct rxvt_font_default : rxvt_font {
174 bool load (int maxheight) 228 rxvt_fontprop properties ()
229 {
230 rxvt_fontprop p;
231
232 p.width = p.height = 1;
233 p.weight = rxvt_fontprop::medium;
234 p.slant = rxvt_fontprop::roman;
235
236 return p;
237 }
238
239 bool load (const rxvt_fontprop &prop)
175 { 240 {
176 width = 1; height = 1; 241 width = 1; height = 1;
177 ascent = 1; descent = 0; 242 ascent = 1; descent = 0;
178 243
179 return true; 244 return true;
180 } 245 }
181 246
182 bool has_codepoint (uint32_t unicode) 247 bool has_codepoint (uint32_t unicode)
183 { 248 {
184 if (unicode <= 0x001f 249 if (unicode <= 0x001f)
250 return true;
185 || (unicode >= 0x80 && unicode <= 0x9f)) 251 if (unicode >= 0x0080 && unicode <= 0x009f)
252 return true;
253
254 if (unicode >= 0x2500 && unicode <= 0x257f
255 && linedraw_cmds[unicode - 0x2500])
186 return true; 256 return true;
187 257
188 switch (unicode) 258 switch (unicode)
189 { 259 {
190 case ZERO_WIDTH_CHAR: 260 case ZERO_WIDTH_CHAR:
… …
204 const text_t *text, int len, 274 const text_t *text, int len,
205 int fg, int bg) 275 int fg, int bg)
206{ 276{
207 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 277 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
208 278
279 XSetForeground (DISPLAY, GC, r->PixColors[fg]);
280
209 while (len--) 281 while (len--)
210 { 282 {
283 text_t t = *text++;
284
285 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
286 {
287 const char *p = linedraw_cmds[t - 0x2500];
288
289 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ;
290 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight;
291
292 XGCValues gcv;
293
294 while (*p)
295 {
296 switch (*p++)
297 {
298 case '1':
299 gcv.line_width = 0;
300 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);
301 break;
302
303 case '2':
304 gcv.line_width = 2;
305 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);
306 break;
307
308 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break;
309 case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break;
310 case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break;
311 case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break;
312 case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break;
313 case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break;
314 }
315 }
316
317 gcv.line_width = 0;
318 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);
319 }
320 else
211 switch (*text++) 321 switch (*text++)
212 { 322 {
213 case NOCHAR: 323 case NOCHAR:
214 case ZERO_WIDTH_CHAR: 324 case ZERO_WIDTH_CHAR:
215 break; 325 break;
216 default: 326 default:
217 XSetForeground (DISPLAY, GC, r->PixColors[fg]);
218 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 327 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
219 } 328 }
220 329
221 x += r->TermWin.fwidth; 330 x += r->TermWin.fwidth;
222 } 331 }
223} 332}
224 333
… …
227struct rxvt_font_x11 : rxvt_font { 336struct rxvt_font_x11 : rxvt_font {
228 rxvt_font_x11 () { f = 0; } 337 rxvt_font_x11 () { f = 0; }
229 338
230 void clear (); 339 void clear ();
231 340
232 bool load (int maxheight); 341 rxvt_fontprop properties ();
342
343 bool load (const rxvt_fontprop &prop);
233 344
234 bool has_codepoint (uint32_t unicode); 345 bool has_codepoint (uint32_t unicode);
235 346
236 void draw (int x, int y, 347 void draw (int x, int y,
237 const text_t *text, int len, 348 const text_t *text, int len,
… …
239 350
240 XFontStruct *f; 351 XFontStruct *f;
241 codeset cs; 352 codeset cs;
242 bool enc2b, encm; 353 bool enc2b, encm;
243 354
244 const char *get_property (const char *property, const char *repl) const; 355 const char *get_property (XFontStruct *f, const char *property, const char *repl) const;
356 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
357 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
358 bool set_properties (rxvt_fontprop &p, const char *name);
245}; 359};
246 360
247const char * 361const char *
248rxvt_font_x11::get_property (const char *property, const char *repl) const 362rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
249{ 363{
250 unsigned long value; 364 unsigned long value;
251 365
252 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 366 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
253 return XGetAtomName (DISPLAY, value); 367 return XGetAtomName (DISPLAY, value);
254 else 368 else
255 return repl; 369 return repl;
256} 370}
257 371
372rxvt_fontprop
373rxvt_font_x11::properties ()
374{
375 rxvt_fontprop p;
376 set_properties (p, f);
377 return p;
378}
379
258bool 380bool
259rxvt_font_x11::load (int maxheight) 381rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
382{
383 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
384 p.height = height;
385 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
386 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
387
388 return true;
389}
390
391bool
392rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
393{
394 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
395 const char *slant = get_property (f, "SLANT", "r");
396
397 unsigned long height;
398 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
399 return false;
400
401 unsigned long avgwidth;
402 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
403 avgwidth = 0;
404
405 return set_properties (p, height, weight, slant, avgwidth);
406}
407
408bool
409rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
410{
411 int slashes = 0;
412 const char *comp[12];
413
414 for (const char *c = name; *c; c++)
415 if (*c == '-')
416 {
417 comp[slashes++] = c + 1;
418 if (slashes >= 13)
419 break;
420 }
421
422 /* can we short-circuit the costly XLoadQueryFont? */
423 if (slashes >= 13
424 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
425 && (*comp[11] >= '0' && *comp[11] <= '9'))
426 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
427
428 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
429
430 if (f)
431 {
432 // the font should really exists now. if not, we have a problem
433 // (e.g. if the user did xset fp rehash just when we were searching fonts).
434 // in that case, just return garbage.
435 bool ret = set_properties (p, f);
436 XFreeFont (DISPLAY, f);
437 return ret;
438 }
439 else
440 return false;
441}
442
443// fix the size of scalable fonts
444static void
445fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop)
446{
447 int slashes = 0;
448 const char *size;
449
450 for (const char *c = name; *c; c++)
451 if (*c == '-')
452 {
453 if (slashes == 6)
454 size = c + 1;
455
456 if (++slashes >= 13)
457 break;
458 }
459
460 if (slashes >= 13 && size[0] == '0')
461 {
462 strncpy (buf, name, size - name);
463 buf += size - name;
464 buf += sprintf (buf, "%d", prop.height);
465 strcpy (buf, size + 1);
466 }
467 else
468 strcpy (buf, name);
469}
470
471bool
472rxvt_font_x11::load (const rxvt_fontprop &prop)
260{ 473{
261 clear (); 474 clear ();
475
476 char **list;
477 int count;
478 list = XListFonts (DISPLAY, name, 512, &count);
479 set_name (0);
480
481 if (!list)
482 return false;
483
484 int bestdiff = 0x7fffffff;
485 for (int i = 0; i < count; i++)
486 {
487 rxvt_fontprop p;
488 char fname[1024];
489 fix_scalable (fname, list[i], prop);
490
491 if (!set_properties (p, fname))
492 continue;
493
494 if (p.height > prop.height) // weed out too large fonts
495 continue;
496
497 int diff = (prop.height - p.height) * 32
498 + abs (prop.weight - p.weight)
499 + abs (prop.slant - p.slant );
500
501 if (!name // compare against best found so far
502 || diff < bestdiff)
503 {
504 set_name (strdup (fname));
505 bestdiff = diff;
506 }
507 }
508
509 XFreeFontNames (list);
510
511 if (!name)
512 return false;
262 513
263 f = XLoadQueryFont (DISPLAY, name); 514 f = XLoadQueryFont (DISPLAY, name);
264 515
265 if (!f) 516 if (!f)
266 return false; 517 return false;
267 518
268 unsigned long value; 519 unsigned long value;
269 520
270 const char *registry = get_property ("CHARSET_REGISTRY", 0); 521 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
271 const char *encoding = get_property ("CHARSET_ENCODING", 0); 522 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
272 523
273 if (registry && encoding) 524 if (registry && encoding)
274 { 525 {
275 char charset[64]; 526 char charset[64];
276 snprintf (charset, 64, "%s-%s", registry, encoding); 527 snprintf (charset, 64, "%s-%s", registry, encoding);
277 528
278 cs = codeset_from_name (charset); 529 cs = codeset_from_name (charset);
279 } 530 }
280 else 531 else
281 { 532 {
282 const char *charset = get_property ("FONT", 0); 533 const char *charset = get_property (f, "FONT", 0);
283 534
284 if (!charset) 535 if (!charset)
285 charset = name; 536 charset = name;
286 537
287 int count = 13; 538 int count = 13;
… …
300 551
301 ascent = f->ascent; 552 ascent = f->ascent;
302 descent = f->descent; 553 descent = f->descent;
303 height = ascent + descent; 554 height = ascent + descent;
304 555
305 prop = false; 556 slow = false;
306 557
307 if (f->min_bounds.width == f->max_bounds.width) 558 if (f->min_bounds.width == f->max_bounds.width)
308 width = f->min_bounds.width; 559 width = f->min_bounds.width;
309 else if (f->per_char == NULL) 560 else if (f->per_char == NULL)
310 width = f->max_bounds.width; 561 width = f->max_bounds.width;
311 else 562 else
312 { 563 {
313 prop = true; 564 slow = true;
314 565
315 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 566 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
316 567
317 if (encm) 568 if (encm)
318 N += (f->max_byte1 - f->min_byte1) 569 N += (f->max_byte1 - f->min_byte1)
… …
403 // this looks like a mess /. 654 // this looks like a mess /.
404 // and it is a mess /. 655 // and it is a mess /.
405 // yet we are trying to be perfect /. 656 // yet we are trying to be perfect /.
406 // but the result still isn't perfect /. 657 // but the result still isn't perfect /.
407 658
408 bool slow = prop 659 bool slow = this->slow
409 || width != r->TermWin.fwidth 660 || width != r->TermWin.fwidth
410 || height != r->TermWin.fheight; 661 || height != r->TermWin.fheight;
411 662
412 int base = r->TermWin.fbase; 663 int base = r->TermWin.fbase;
413 664
… …
488//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 739//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
489#define SWATHBITS 8 740#define SWATHBITS 8
490#endif 741#endif
491 742
492struct rxvt_font_xft : rxvt_font { 743struct 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; } 744 rxvt_font_xft () { f = 0; d = 0; }
520 745
521 void clear (); 746 void clear ();
522 747
523 bool load (int maxheight); 748 rxvt_fontprop properties ();
749
750 bool load (const rxvt_fontprop &prop);
524 751
525 void draw (int x, int y, 752 void draw (int x, int y,
526 const text_t *text, int len, 753 const text_t *text, int len,
527 int fg, int bg); 754 int fg, int bg);
528 755
529 bool has_codepoint (uint32_t unicode); 756 bool has_codepoint (uint32_t unicode);
530 757
531protected: 758protected:
532 XftFont *f; 759 XftFont *f;
533 XftDraw *d; 760 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}; 761};
543 762
544void 763void
545rxvt_font_xft::clear () 764rxvt_font_xft::clear ()
546{ 765{
… …
553 if (d) 772 if (d)
554 { 773 {
555 XftDrawDestroy (d); 774 XftDrawDestroy (d);
556 d = 0; 775 d = 0;
557 } 776 }
777}
558 778
559#if 0 779rxvt_fontprop
560 for (int i = 0; i < SWATHCOUNT; i++) 780rxvt_font_xft::properties ()
561 delete cvr[i]; 781{
562#endif 782 rxvt_fontprop p;
783
784 FT_Face face = XftLockFace (f);
785
786 p.width = width; p.height = height;
787 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
788 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
789
790 XftUnlockFace (f);
791
792 return p;
563} 793}
564 794
565bool 795bool
566rxvt_font_xft::load (int maxheight) 796rxvt_font_xft::load (const rxvt_fontprop &prop)
567{ 797{
568#if 0 798#if 0
569 for (int i = 0; i < SWATHCOUNT; i++) 799 for (int i = 0; i < SWATHCOUNT; i++)
570 cvr[i] = 0; 800 cvr[i] = 0;
571#endif 801#endif
572 802
573 clear (); 803 clear ();
574 804
575 f = XftFontOpenName (DISPLAY, DefaultScreen (DISPLAY), name); 805 FcPattern *p = FcNameParse ((FcChar8 *) name);
806
807 if (!p)
808 return false;
809
810 FcValue v;
811
812 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
813 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
814
815 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
816 FcPatternAddInteger (p, FC_SLANT, prop.slant);
817
818#if 0 // clipping unfortunately destroys our precious double-width-characters
819 // clip width, we can't do better, or can we?
820 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
821 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
822#endif
823
824 //FcPatternAddBool (p, FC_MINSPACE, 1);
825
826 XftResult result;
827 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
828
829 FcPatternDestroy (p);
830
831 if (!match)
832 return false;
833
834 f = XftFontOpenPattern (DISPLAY, match);
576 835
577 if (!f) 836 if (!f)
837 {
838 FcPatternDestroy (match);
578 return false; 839 return false;
840 }
579 841
580 FT_Face face = XftLockFace (f); 842 FT_Face face = XftLockFace (f);
581 843
582 prop = !FT_IS_FIXED_WIDTH (face); 844 slow = !FT_IS_FIXED_WIDTH (face);
583 845
584 int ftheight = 0; 846 int ftheight = 0;
585 847
586 for (;;) 848 for (;;)
587 { 849 {
… …
589 FcChar8 c; 851 FcChar8 c;
590 852
591 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1); 853 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);
592 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2); 854 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);
593 855
594 prop = prop || g1.xOff != g2.xOff; // don't simply trust the font 856 if (g1.xOff != g2.xOff) // don't simply trust the font
857 slow = true;
595 858
596 width = g2.xOff; 859 width = g2.xOff;
597 ascent = (face->size->metrics.ascender + 63) >> 6; 860 ascent = (face->size->metrics.ascender + 63) >> 6;
598 descent = (-face->size->metrics.descender + 63) >> 6; 861 descent = (-face->size->metrics.descender + 63) >> 6;
599 height = ascent + descent; 862 height = ascent + descent;
600 863
601 if (height <= maxheight || !maxheight) 864 if (height <= prop.height || !prop.height)
602 break; 865 break;
603 866
604 if (ftheight) 867 if (ftheight)
605 { 868 {
606 // take smaller steps near the end 869 // take smaller steps near the end
607 if (height > maxheight + 1) ftheight++; 870 if (height > prop.height + 1) ftheight++;
608 if (height > maxheight + 2) ftheight++; 871 if (height > prop.height + 2) ftheight++;
609 if (height > maxheight + 3) ftheight++; 872 if (height > prop.height + 3) ftheight++;
610 873
611 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight); 874 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);
612 } 875 }
613 else 876 else
614 FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight); 877 FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);
615 } 878 }
616 879
617 XftUnlockFace (f); 880 XftUnlockFace (f);
618 881
619 return true; 882 return true;
620} 883}
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 884
634bool 885bool
635rxvt_font_xft::has_codepoint (uint32_t unicode) 886rxvt_font_xft::has_codepoint (uint32_t unicode)
636{ 887{
637 return XftCharExists (DISPLAY, f, unicode); 888 return XftCharExists (DISPLAY, f, unicode);
… …
651 if (bg >= 0 && bg != Color_bg) 902 if (bg >= 0 && bg != Color_bg)
652 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); 903 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
653 else 904 else
654 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 905 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
655 906
656 if (!prop && width == r->TermWin.fwidth) 907 if (!slow && width == r->TermWin.fwidth && 0)
657 { 908 {
658 if (sizeof (text_t) == sizeof (FcChar16)) 909 if (sizeof (text_t) == sizeof (FcChar16))
659 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 910 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
660 else 911 else
661 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); 912 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
… …
664 { 915 {
665 while (len) 916 while (len)
666 { 917 {
667 if (*text != NOCHAR && *text != ' ') 918 if (*text != NOCHAR && *text != ' ')
668 { 919 {
920 int fwidth = r->TermWin.fwidth;
921 if (len >= 2 && text[1] == NOCHAR)
922 fwidth *= 2;
923
924 XGlyphInfo extents;
669 if (sizeof (text_t) == sizeof (FcChar16)) 925 if (sizeof (text_t) == sizeof (FcChar16))
670 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1); 926 {
927 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents);
928 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
929 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
930 }
671 else 931 else
672 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1); 932 {
933 XGlyphInfo extents;
934 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents);
935 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
936 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
937 }
673 } 938 }
674 939
675 x += r->TermWin.fwidth; 940 x += r->TermWin.fwidth;
676 text++; 941 text++;
677 len--; 942 len--;
… …
701 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 966 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)
702 FONT_UNREF (*i); 967 FONT_UNREF (*i);
703 968
704 fonts.clear (); 969 fonts.clear ();
705 base_id = 0; 970 base_id = 0;
706 height = 0x7fffffff; 971 base_prop.height = 0x7fffffff;
972 base_prop.weight = rxvt_fontprop::medium;
973 base_prop.slant = rxvt_fontprop::roman;
707 974
708 fallback = fallback_fonts; 975 fallback = fallback_fonts;
709} 976}
710 977
711rxvt_font * 978rxvt_font *
… …
796rxvt_fontset::realize_font (int i) 1063rxvt_fontset::realize_font (int i)
797{ 1064{
798 if (fonts[i]->loaded) 1065 if (fonts[i]->loaded)
799 return true; 1066 return true;
800 1067
801 if (fonts[i]->load (height))
802 return fonts[i]->loaded = true; 1068 fonts[i]->loaded = true;
803 1069
804 delete fonts[i]; 1070 if (!fonts[i]->load (base_prop))
805 fonts.erase (fonts.begin () + i); 1071 {
806 1072 fonts[i]->cs = CS_UNKNOWN;
807 return false; 1073 return false;
1074 }
1075
1076 return true;
808} 1077}
809 1078
810void 1079void
811rxvt_fontset::populate (const char *desc) 1080rxvt_fontset::populate (const char *desc)
812{ 1081{
… …
819 1088
820 if (!base_id) 1089 if (!base_id)
821 base_id = 1; 1090 base_id = 1;
822 1091
823 // we currently need a base-font, no matter what 1092 // we currently need a base-font, no matter what
824 if (fonts.size () <= base_id) 1093 if (fonts.size () <= base_id || !realize_font (base_id))
825 { 1094 {
1095 puts ("unable to load specified font(s), falling back to 'fixed'\n");
826 add_fonts ("fixed"); 1096 add_fonts ("fixed");
827 base_id = 1; 1097 base_id = fonts.size () - 1;
828 } 1098 }
829 1099
830 if (fonts.size () <= base_id || !realize_font (base_id)) 1100 if (fonts.size () <= base_id || !realize_font (base_id))
831 { 1101 {
832 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); 1102 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
833 exit (1); 1103 exit (1);
834 } 1104 }
835 1105
836 height = fonts[base_id]->height; 1106 base_prop = fonts[base_id]->properties ();
837
838 /*add_fonts ("-efont-fixed-medium-r-normal-*-14-*-*-*-*-*-iso10646-1,"*/
839} 1107}
840 1108
841int 1109int
842rxvt_fontset::find_font (uint32_t unicode) 1110rxvt_fontset::find_font (uint32_t unicode)
843{ 1111{
… …
849 { 1117 {
850 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1118 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
851 goto next_font; 1119 goto next_font;
852 1120
853 if (!realize_font (i)) 1121 if (!realize_font (i))
854 {
855 --i;
856 goto next_font; 1122 goto next_font;
857 } 1123 }
858 1124
859 //printf ("added font %s for %04lx\n", f->name, unicode);
860 }
861
862 if (f->has_codepoint (unicode)) 1125 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode))
863 return i; 1126 return i;
864 1127
865 next_font: 1128 next_font:
866 if (i == fonts.size () - 1 && fallback->name) 1129 if (i == fonts.size () - 1 && fallback->name)
867 { 1130 {
868 fonts.push_back (new_font (fallback->name, fallback->cs)); 1131 fonts.push_back (new_font (fallback->name, fallback->cs));
869 fallback++; 1132 fallback++;
1133 i = 0;
870 } 1134 }
871 } 1135 }
872 1136
873 return 0; /* we must return SOME font */ 1137 return 0; /* we must return SOME font */
874} 1138}

Diff Legend

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