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.6 by pcg, Wed Dec 17 22:29:03 2003 UTC vs.
Revision 1.9 by pcg, Wed Dec 24 06:26:52 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/////////////////////////////////////////////////////////////////////////////
… …
220 223
221 // to be done 224 // to be done
222}; 225};
223 226
224struct rxvt_font_default : rxvt_font { 227struct rxvt_font_default : rxvt_font {
225 bool load (int maxheight) 228 rxvt_fontprop properties ()
229 {
230 rxvt_fontprop p;
231
232 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)
226 { 240 {
227 width = 1; height = 1; 241 width = 1; height = 1;
228 ascent = 1; descent = 0; 242 ascent = 1; descent = 0;
229 243
230 return true; 244 return true;
… …
322struct rxvt_font_x11 : rxvt_font { 336struct rxvt_font_x11 : rxvt_font {
323 rxvt_font_x11 () { f = 0; } 337 rxvt_font_x11 () { f = 0; }
324 338
325 void clear (); 339 void clear ();
326 340
327 bool load (int maxheight); 341 rxvt_fontprop properties ();
342 rxvt_fontprop properties (XFontStruct *f);
343
344 bool load (const rxvt_fontprop &prop);
328 345
329 bool has_codepoint (uint32_t unicode); 346 bool has_codepoint (uint32_t unicode);
330 347
331 void draw (int x, int y, 348 void draw (int x, int y,
332 const text_t *text, int len, 349 const text_t *text, int len,
… …
334 351
335 XFontStruct *f; 352 XFontStruct *f;
336 codeset cs; 353 codeset cs;
337 bool enc2b, encm; 354 bool enc2b, encm;
338 355
339 const char *get_property (const char *property, const char *repl) const; 356 const char *get_property (XFontStruct *f, const char *property, const char *repl) const;
340}; 357};
341 358
342const char * 359const char *
343rxvt_font_x11::get_property (const char *property, const char *repl) const 360rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
344{ 361{
345 unsigned long value; 362 unsigned long value;
346 363
347 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 364 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
348 return XGetAtomName (DISPLAY, value); 365 return XGetAtomName (DISPLAY, value);
349 else 366 else
350 return repl; 367 return repl;
351} 368}
352 369
370rxvt_fontprop
371rxvt_font_x11::properties ()
372{
373 return properties (f);
374}
375
376rxvt_fontprop
377rxvt_font_x11::properties (XFontStruct *f)
378{
379 rxvt_fontprop p;
380
381 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
382 const char *slant = get_property (f, "SLANT", "r");
383
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 p;
389}
390
353bool 391bool
354rxvt_font_x11::load (int maxheight) 392rxvt_font_x11::load (const rxvt_fontprop &prop)
355{ 393{
356 clear (); 394 clear ();
357 395
358 char **list; 396 char **list;
359 int count; 397 int count;
… …
361 list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info); 399 list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info);
362 400
363 if (!list) 401 if (!list)
364 return false; 402 return false;
365 403
404 int bestdiff = 0x7fffffff;
366 XFontStruct *best = 0; 405 XFontStruct *best = 0;
367 for (int i = 0; i < count; i++) 406 for (int i = 0; i < count; i++)
368 { 407 {
369 XFontStruct *f = info + i; 408 XFontStruct *f = info + i;
409
370 if (f->ascent + f->descent <= maxheight) // weed out too large fonts 410 if (f->ascent + f->descent <= prop.height) // weed out too large fonts
411 {
412 rxvt_fontprop p = properties (f);
413 int diff = (prop.height - f->ascent + f->descent) * 32
414 + abs (prop.weight - p.weight)
415 + abs (prop.slant - p.slant );
416
371 if (!best // compare against best found so far 417 if (!best // compare against best found so far
372 || best->ascent + best->descent < f->ascent + f->descent) 418 || diff < bestdiff)
419 {
373 best = f; 420 best = f;
421 bestdiff = diff;
422 }
423 }
374 } 424 }
425
426 if (!best)
427 return false;
375 428
376 set_name (strdup (list[best - info])); 429 set_name (strdup (list[best - info]));
377 430
378 XFreeFontInfo (list, info, count); 431 XFreeFontInfo (list, info, count);
379 432
… …
382 if (!f) 435 if (!f)
383 return false; 436 return false;
384 437
385 unsigned long value; 438 unsigned long value;
386 439
387 const char *registry = get_property ("CHARSET_REGISTRY", 0); 440 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
388 const char *encoding = get_property ("CHARSET_ENCODING", 0); 441 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
389 442
390 if (registry && encoding) 443 if (registry && encoding)
391 { 444 {
392 char charset[64]; 445 char charset[64];
393 snprintf (charset, 64, "%s-%s", registry, encoding); 446 snprintf (charset, 64, "%s-%s", registry, encoding);
394 447
395 cs = codeset_from_name (charset); 448 cs = codeset_from_name (charset);
396 } 449 }
397 else 450 else
398 { 451 {
399 const char *charset = get_property ("FONT", 0); 452 const char *charset = get_property (f, "FONT", 0);
400 453
401 if (!charset) 454 if (!charset)
402 charset = name; 455 charset = name;
403 456
404 int count = 13; 457 int count = 13;
… …
417 470
418 ascent = f->ascent; 471 ascent = f->ascent;
419 descent = f->descent; 472 descent = f->descent;
420 height = ascent + descent; 473 height = ascent + descent;
421 474
422 prop = false; 475 slow = false;
423 476
424 if (f->min_bounds.width == f->max_bounds.width) 477 if (f->min_bounds.width == f->max_bounds.width)
425 width = f->min_bounds.width; 478 width = f->min_bounds.width;
426 else if (f->per_char == NULL) 479 else if (f->per_char == NULL)
427 width = f->max_bounds.width; 480 width = f->max_bounds.width;
428 else 481 else
429 { 482 {
430 prop = true; 483 slow = true;
431 484
432 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 485 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
433 486
434 if (encm) 487 if (encm)
435 N += (f->max_byte1 - f->min_byte1) 488 N += (f->max_byte1 - f->min_byte1)
… …
520 // this looks like a mess /. 573 // this looks like a mess /.
521 // and it is a mess /. 574 // and it is a mess /.
522 // yet we are trying to be perfect /. 575 // yet we are trying to be perfect /.
523 // but the result still isn't perfect /. 576 // but the result still isn't perfect /.
524 577
525 bool slow = prop 578 bool slow = this->slow
526 || width != r->TermWin.fwidth 579 || width != r->TermWin.fwidth
527 || height != r->TermWin.fheight; 580 || height != r->TermWin.fheight;
528 581
529 int base = r->TermWin.fbase; 582 int base = r->TermWin.fbase;
530 583
… …
635#endif 688#endif
636 rxvt_font_xft () { f = 0; d = 0; } 689 rxvt_font_xft () { f = 0; d = 0; }
637 690
638 void clear (); 691 void clear ();
639 692
640 bool load (int maxheight); 693 rxvt_fontprop properties ();
694
695 bool load (const rxvt_fontprop &prop);
641 696
642 void draw (int x, int y, 697 void draw (int x, int y,
643 const text_t *text, int len, 698 const text_t *text, int len,
644 int fg, int bg); 699 int fg, int bg);
645 700
… …
677 for (int i = 0; i < SWATHCOUNT; i++) 732 for (int i = 0; i < SWATHCOUNT; i++)
678 delete cvr[i]; 733 delete cvr[i];
679#endif 734#endif
680} 735}
681 736
737rxvt_fontprop
738rxvt_font_xft::properties ()
739{
740 rxvt_fontprop p;
741
742 FT_Face face = XftLockFace (f);
743
744 p.height = height;
745 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
746 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
747
748 XftUnlockFace (f);
749
750 return p;
751}
752
682bool 753bool
683rxvt_font_xft::load (int maxheight) 754rxvt_font_xft::load (const rxvt_fontprop &prop)
684{ 755{
685#if 0 756#if 0
686 for (int i = 0; i < SWATHCOUNT; i++) 757 for (int i = 0; i < SWATHCOUNT; i++)
687 cvr[i] = 0; 758 cvr[i] = 0;
688#endif 759#endif
689 760
690 clear (); 761 clear ();
691 762
692 f = XftFontOpenName (DISPLAY, DefaultScreen (DISPLAY), name); 763 FcPattern *p = FcNameParse ((FcChar8 *) name);
764
765 if (!p)
766 return false;
767
768 FcValue v;
769
770 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
771 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
772
773 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
774 FcPatternAddInteger (p, FC_SLANT, prop.slant);
775
776 //FcPatternAddBool (p, FC_MINSPACE, 1);
777
778 XftResult result;
779 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
780
781 FcPatternDestroy (p);
782
783 if (!match)
784 return false;
785
786 f = XftFontOpenPattern (DISPLAY, match);
693 787
694 if (!f) 788 if (!f)
789 {
790 FcPatternDestroy (match);
695 return false; 791 return false;
792 }
696 793
697 FT_Face face = XftLockFace (f); 794 FT_Face face = XftLockFace (f);
698 795
699 prop = !FT_IS_FIXED_WIDTH (face); 796 slow = !FT_IS_FIXED_WIDTH (face);
700 797
701 int ftheight = 0; 798 int ftheight = 0;
702 799
703 for (;;) 800 for (;;)
704 { 801 {
… …
706 FcChar8 c; 803 FcChar8 c;
707 804
708 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1); 805 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);
709 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2); 806 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);
710 807
711 prop = prop || g1.xOff != g2.xOff; // don't simply trust the font 808 if (g1.xOff != g2.xOff) // don't simply trust the font
809 slow = true;
712 810
713 width = g2.xOff; 811 width = g2.xOff;
714 ascent = (face->size->metrics.ascender + 63) >> 6; 812 ascent = (face->size->metrics.ascender + 63) >> 6;
715 descent = (-face->size->metrics.descender + 63) >> 6; 813 descent = (-face->size->metrics.descender + 63) >> 6;
716 height = ascent + descent; 814 height = ascent + descent;
717 815
718 if (height <= maxheight || !maxheight) 816 if (height <= prop.height || !prop.height)
719 break; 817 break;
720 818
721 if (ftheight) 819 if (ftheight)
722 { 820 {
723 // take smaller steps near the end 821 // take smaller steps near the end
724 if (height > maxheight + 1) ftheight++; 822 if (height > prop.height + 1) ftheight++;
725 if (height > maxheight + 2) ftheight++; 823 if (height > prop.height + 2) ftheight++;
726 if (height > maxheight + 3) ftheight++; 824 if (height > prop.height + 3) ftheight++;
727 825
728 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight); 826 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);
729 } 827 }
730 else 828 else
731 FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight); 829 FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);
732 } 830 }
733 831
734 XftUnlockFace (f); 832 XftUnlockFace (f);
735 833
736 return true; 834 return true;
… …
768 if (bg >= 0 && bg != Color_bg) 866 if (bg >= 0 && bg != Color_bg)
769 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); 867 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
770 else 868 else
771 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 869 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
772 870
773 if (!prop && width == r->TermWin.fwidth) 871 if (!slow && width == r->TermWin.fwidth)
774 { 872 {
775 if (sizeof (text_t) == sizeof (FcChar16)) 873 if (sizeof (text_t) == sizeof (FcChar16))
776 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 874 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
777 else 875 else
778 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); 876 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
… …
818 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 916 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)
819 FONT_UNREF (*i); 917 FONT_UNREF (*i);
820 918
821 fonts.clear (); 919 fonts.clear ();
822 base_id = 0; 920 base_id = 0;
823 height = 0x7fffffff; 921 base_prop.height = 0x7fffffff;
922 base_prop.weight = rxvt_fontprop::medium;
923 base_prop.slant = rxvt_fontprop::roman;
824 924
825 fallback = fallback_fonts; 925 fallback = fallback_fonts;
826} 926}
827 927
828rxvt_font * 928rxvt_font *
… …
915 if (fonts[i]->loaded) 1015 if (fonts[i]->loaded)
916 return true; 1016 return true;
917 1017
918 fonts[i]->loaded = true; 1018 fonts[i]->loaded = true;
919 1019
920 if (!fonts[i]->load (height)) 1020 if (!fonts[i]->load (base_prop))
921 { 1021 {
922 fonts[i]->cs = CS_UNKNOWN; 1022 fonts[i]->cs = CS_UNKNOWN;
923 return false; 1023 return false;
924 } 1024 }
925 1025
… …
938 1038
939 if (!base_id) 1039 if (!base_id)
940 base_id = 1; 1040 base_id = 1;
941 1041
942 // we currently need a base-font, no matter what 1042 // we currently need a base-font, no matter what
943 if (fonts.size () <= base_id) 1043 if (fonts.size () <= base_id || !realize_font (base_id))
944 { 1044 {
945 add_fonts ("fixed"); 1045 add_fonts ("fixed");
946 base_id = 1; 1046 base_id = fonts.size () - 1;
947 } 1047 }
948 1048
949 if (fonts.size () <= base_id || !realize_font (base_id)) 1049 if (fonts.size () <= base_id || !realize_font (base_id))
950 { 1050 {
951 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); 1051 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
952 exit (1); 1052 exit (1);
953 } 1053 }
954 1054
955 height = fonts[base_id]->height; 1055 base_prop = fonts[base_id]->properties ();
956
957 /*add_fonts ("-efont-fixed-medium-r-normal-*-14-*-*-*-*-*-iso10646-1,"*/
958} 1056}
959 1057
960int 1058int
961rxvt_fontset::find_font (uint32_t unicode) 1059rxvt_fontset::find_font (uint32_t unicode)
962{ 1060{

Diff Legend

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