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.5 by pcg, Thu Dec 4 00:43:26 2003 UTC vs.
Revision 1.8 by pcg, Thu Dec 18 04:27:36 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
… …
220 222
221 // to be done 223 // to be done
222}; 224};
223 225
224struct rxvt_font_default : rxvt_font { 226struct rxvt_font_default : rxvt_font {
225 bool load (int maxheight) 227 rxvt_fontprop properties ()
228 {
229 rxvt_fontprop p;
230
231 p.height = 1;
232 p.weight = rxvt_fontprop::medium;
233 p.slant = rxvt_fontprop::roman;
234
235 return p;
236 }
237
238 bool load (const rxvt_fontprop &prop)
226 { 239 {
227 width = 1; height = 1; 240 width = 1; height = 1;
228 ascent = 1; descent = 0; 241 ascent = 1; descent = 0;
229 242
230 return true; 243 return true;
… …
322struct rxvt_font_x11 : rxvt_font { 335struct rxvt_font_x11 : rxvt_font {
323 rxvt_font_x11 () { f = 0; } 336 rxvt_font_x11 () { f = 0; }
324 337
325 void clear (); 338 void clear ();
326 339
327 bool load (int maxheight); 340 rxvt_fontprop properties ();
341 rxvt_fontprop properties (XFontStruct *f);
342
343 bool load (const rxvt_fontprop &prop);
328 344
329 bool has_codepoint (uint32_t unicode); 345 bool has_codepoint (uint32_t unicode);
330 346
331 void draw (int x, int y, 347 void draw (int x, int y,
332 const text_t *text, int len, 348 const text_t *text, int len,
… …
334 350
335 XFontStruct *f; 351 XFontStruct *f;
336 codeset cs; 352 codeset cs;
337 bool enc2b, encm; 353 bool enc2b, encm;
338 354
339 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;
340}; 356};
341 357
342const char * 358const char *
343rxvt_font_x11::get_property (const char *property, const char *repl) const 359rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
344{ 360{
345 unsigned long value; 361 unsigned long value;
346 362
347 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 363 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
348 return XGetAtomName (DISPLAY, value); 364 return XGetAtomName (DISPLAY, value);
349 else 365 else
350 return repl; 366 return repl;
351} 367}
352 368
369rxvt_fontprop
370rxvt_font_x11::properties ()
371{
372 return properties (f);
373}
374
375rxvt_fontprop
376rxvt_font_x11::properties (XFontStruct *f)
377{
378 rxvt_fontprop p;
379
380 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
381 const char *slant = get_property (f, "SLANT", "r");
382
383 p.height = height;
384 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
385 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
386
387 return p;
388}
389
353bool 390bool
354rxvt_font_x11::load (int maxheight) 391rxvt_font_x11::load (const rxvt_fontprop &prop)
355{ 392{
356 clear (); 393 clear ();
394
395 char **list;
396 int count;
397 XFontStruct *info;
398 list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info);
399
400 if (!list)
401 return false;
402
403 int bestdiff = 0x7fffffff;
404 XFontStruct *best = 0;
405 for (int i = 0; i < count; i++)
406 {
407 XFontStruct *f = info + i;
408
409 if (f->ascent + f->descent <= prop.height) // weed out too large fonts
410 {
411 rxvt_fontprop p = properties (f);
412 int diff = (prop.height - f->ascent + f->descent) * 32
413 + abs (prop.weight - p.weight)
414 + abs (prop.slant - p.slant );
415
416 if (!best // compare against best found so far
417 || diff < bestdiff)
418 {
419 best = f;
420 bestdiff = diff;
421 }
422 }
423 }
424
425 set_name (strdup (list[best - info]));
426
427 XFreeFontInfo (list, info, count);
357 428
358 f = XLoadQueryFont (DISPLAY, name); 429 f = XLoadQueryFont (DISPLAY, name);
359 430
360 if (!f) 431 if (!f)
361 return false; 432 return false;
362 433
363 unsigned long value; 434 unsigned long value;
364 435
365 const char *registry = get_property ("CHARSET_REGISTRY", 0); 436 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
366 const char *encoding = get_property ("CHARSET_ENCODING", 0); 437 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
367 438
368 if (registry && encoding) 439 if (registry && encoding)
369 { 440 {
370 char charset[64]; 441 char charset[64];
371 snprintf (charset, 64, "%s-%s", registry, encoding); 442 snprintf (charset, 64, "%s-%s", registry, encoding);
372 443
373 cs = codeset_from_name (charset); 444 cs = codeset_from_name (charset);
374 } 445 }
375 else 446 else
376 { 447 {
377 const char *charset = get_property ("FONT", 0); 448 const char *charset = get_property (f, "FONT", 0);
378 449
379 if (!charset) 450 if (!charset)
380 charset = name; 451 charset = name;
381 452
382 int count = 13; 453 int count = 13;
… …
395 466
396 ascent = f->ascent; 467 ascent = f->ascent;
397 descent = f->descent; 468 descent = f->descent;
398 height = ascent + descent; 469 height = ascent + descent;
399 470
400 prop = false; 471 slow = false;
401 472
402 if (f->min_bounds.width == f->max_bounds.width) 473 if (f->min_bounds.width == f->max_bounds.width)
403 width = f->min_bounds.width; 474 width = f->min_bounds.width;
404 else if (f->per_char == NULL) 475 else if (f->per_char == NULL)
405 width = f->max_bounds.width; 476 width = f->max_bounds.width;
406 else 477 else
407 { 478 {
408 prop = true; 479 slow = true;
409 480
410 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 481 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
411 482
412 if (encm) 483 if (encm)
413 N += (f->max_byte1 - f->min_byte1) 484 N += (f->max_byte1 - f->min_byte1)
… …
498 // this looks like a mess /. 569 // this looks like a mess /.
499 // and it is a mess /. 570 // and it is a mess /.
500 // yet we are trying to be perfect /. 571 // yet we are trying to be perfect /.
501 // but the result still isn't perfect /. 572 // but the result still isn't perfect /.
502 573
503 bool slow = prop 574 bool slow = this->slow
504 || width != r->TermWin.fwidth 575 || width != r->TermWin.fwidth
505 || height != r->TermWin.fheight; 576 || height != r->TermWin.fheight;
506 577
507 int base = r->TermWin.fbase; 578 int base = r->TermWin.fbase;
508 579
… …
613#endif 684#endif
614 rxvt_font_xft () { f = 0; d = 0; } 685 rxvt_font_xft () { f = 0; d = 0; }
615 686
616 void clear (); 687 void clear ();
617 688
618 bool load (int maxheight); 689 rxvt_fontprop properties ();
690
691 bool load (const rxvt_fontprop &prop);
619 692
620 void draw (int x, int y, 693 void draw (int x, int y,
621 const text_t *text, int len, 694 const text_t *text, int len,
622 int fg, int bg); 695 int fg, int bg);
623 696
… …
655 for (int i = 0; i < SWATHCOUNT; i++) 728 for (int i = 0; i < SWATHCOUNT; i++)
656 delete cvr[i]; 729 delete cvr[i];
657#endif 730#endif
658} 731}
659 732
733rxvt_fontprop
734rxvt_font_xft::properties ()
735{
736 rxvt_fontprop p;
737
738 FT_Face face = XftLockFace (f);
739
740 p.height = height;
741 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
742 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
743
744 XftUnlockFace (f);
745
746 return p;
747}
748
660bool 749bool
661rxvt_font_xft::load (int maxheight) 750rxvt_font_xft::load (const rxvt_fontprop &prop)
662{ 751{
663#if 0 752#if 0
664 for (int i = 0; i < SWATHCOUNT; i++) 753 for (int i = 0; i < SWATHCOUNT; i++)
665 cvr[i] = 0; 754 cvr[i] = 0;
666#endif 755#endif
667 756
668 clear (); 757 clear ();
669 758
670 f = XftFontOpenName (DISPLAY, DefaultScreen (DISPLAY), name); 759 FcPattern *p = FcNameParse ((FcChar8 *) name);
760
761 if (!p)
762 return false;
763
764 FcValue v;
765
766 if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
767 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
768
769 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
770 FcPatternAddInteger (p, FC_SLANT, prop.slant);
771
772 //FcPatternAddBool (p, FC_MINSPACE, 1);
773
774 XftResult result;
775 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
776
777 FcPatternDestroy (p);
778
779 if (!match)
780 return false;
781
782 f = XftFontOpenPattern (DISPLAY, match);
671 783
672 if (!f) 784 if (!f)
785 {
786 FcPatternDestroy (match);
673 return false; 787 return false;
788 }
674 789
675 FT_Face face = XftLockFace (f); 790 FT_Face face = XftLockFace (f);
676 791
677 prop = !FT_IS_FIXED_WIDTH (face); 792 slow = !FT_IS_FIXED_WIDTH (face);
678 793
679 int ftheight = 0; 794 int ftheight = 0;
680 795
681 for (;;) 796 for (;;)
682 { 797 {
… …
684 FcChar8 c; 799 FcChar8 c;
685 800
686 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1); 801 c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);
687 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2); 802 c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);
688 803
689 prop = prop || g1.xOff != g2.xOff; // don't simply trust the font 804 if (g1.xOff != g2.xOff) // don't simply trust the font
805 slow = true;
690 806
691 width = g2.xOff; 807 width = g2.xOff;
692 ascent = (face->size->metrics.ascender + 63) >> 6; 808 ascent = (face->size->metrics.ascender + 63) >> 6;
693 descent = (-face->size->metrics.descender + 63) >> 6; 809 descent = (-face->size->metrics.descender + 63) >> 6;
694 height = ascent + descent; 810 height = ascent + descent;
695 811
696 if (height <= maxheight || !maxheight) 812 if (height <= prop.height || !prop.height)
697 break; 813 break;
698 814
699 if (ftheight) 815 if (ftheight)
700 { 816 {
701 // take smaller steps near the end 817 // take smaller steps near the end
702 if (height > maxheight + 1) ftheight++; 818 if (height > prop.height + 1) ftheight++;
703 if (height > maxheight + 2) ftheight++; 819 if (height > prop.height + 2) ftheight++;
704 if (height > maxheight + 3) ftheight++; 820 if (height > prop.height + 3) ftheight++;
705 821
706 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight); 822 FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);
707 } 823 }
708 else 824 else
709 FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight); 825 FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);
710 } 826 }
711 827
712 XftUnlockFace (f); 828 XftUnlockFace (f);
713 829
714 return true; 830 return true;
… …
746 if (bg >= 0 && bg != Color_bg) 862 if (bg >= 0 && bg != Color_bg)
747 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); 863 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
748 else 864 else
749 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 865 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
750 866
751 if (!prop && width == r->TermWin.fwidth) 867 if (!slow && width == r->TermWin.fwidth)
752 { 868 {
753 if (sizeof (text_t) == sizeof (FcChar16)) 869 if (sizeof (text_t) == sizeof (FcChar16))
754 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 870 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
755 else 871 else
756 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); 872 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
… …
796 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 912 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)
797 FONT_UNREF (*i); 913 FONT_UNREF (*i);
798 914
799 fonts.clear (); 915 fonts.clear ();
800 base_id = 0; 916 base_id = 0;
801 height = 0x7fffffff; 917 base_prop.height = 0x7fffffff;
918 base_prop.weight = rxvt_fontprop::medium;
919 base_prop.slant = rxvt_fontprop::roman;
802 920
803 fallback = fallback_fonts; 921 fallback = fallback_fonts;
804} 922}
805 923
806rxvt_font * 924rxvt_font *
… …
893 if (fonts[i]->loaded) 1011 if (fonts[i]->loaded)
894 return true; 1012 return true;
895 1013
896 fonts[i]->loaded = true; 1014 fonts[i]->loaded = true;
897 1015
898 if (!fonts[i]->load (height)) 1016 if (!fonts[i]->load (base_prop))
899 { 1017 {
900 fonts[i]->cs = CS_UNKNOWN; 1018 fonts[i]->cs = CS_UNKNOWN;
901 return false; 1019 return false;
902 } 1020 }
903 1021
… …
916 1034
917 if (!base_id) 1035 if (!base_id)
918 base_id = 1; 1036 base_id = 1;
919 1037
920 // we currently need a base-font, no matter what 1038 // we currently need a base-font, no matter what
921 if (fonts.size () <= base_id) 1039 if (fonts.size () <= base_id || !realize_font (base_id))
922 { 1040 {
923 add_fonts ("fixed"); 1041 add_fonts ("fixed");
924 base_id = 1; 1042 base_id = fonts.size () - 1;
925 } 1043 }
926 1044
927 if (fonts.size () <= base_id || !realize_font (base_id)) 1045 if (fonts.size () <= base_id || !realize_font (base_id))
928 { 1046 {
929 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); 1047 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
930 exit (1); 1048 exit (1);
931 } 1049 }
932 1050
933 height = fonts[base_id]->height; 1051 base_prop = fonts[base_id]->properties ();
934
935 /*add_fonts ("-efont-fixed-medium-r-normal-*-14-*-*-*-*-*-iso10646-1,"*/
936} 1052}
937 1053
938int 1054int
939rxvt_fontset::find_font (uint32_t unicode) 1055rxvt_fontset::find_font (uint32_t unicode)
940{ 1056{

Diff Legend

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