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.10 by pcg, Wed Dec 24 09:07:01 2003 UTC vs.
Revision 1.22 by pcg, Sat Feb 21 22:14:00 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
23#include "rxvt.h" 23#include "rxvt.h"
24#include "defaultfont.h" 24#include "defaultfont.h"
25 25
26#include <cstdlib> 26#include <cstdlib>
27 27
28#define DISPLAY r->Xdisplay 28#define DISPLAY r->display->display
29#define DRAWABLE r->TermWin.vt 29#define DRAWABLE r->TermWin.vt
30#define GC r->TermWin.gc 30#define GC r->TermWin.gc
31 31
32const struct rxvt_fallback_font { 32const struct rxvt_fallback_font {
33 codeset cs; 33 codeset cs;
73 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 73 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
74 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 74 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
75 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 75 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
76 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 76 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
77# endif 77# endif
78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-1" }, 79 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
79 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-2" }, 80 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
80 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-3" }, 81 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
81 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-4" }, 82 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
82 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-5" }, 83 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
83 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-6" }, 84 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
84 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-7" }, 85 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
85 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-f" }, 86 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
86#endif 87#endif
87 88
88#if XFT 89#if XFT
89 { CS_UNICODE, "xft:Andale Mono" }, 90 { CS_UNICODE, "xft:Andale Mono" },
90 { CS_UNICODE, "xft:Arial Unicode MS" }, 91 { CS_UNICODE, "xft:Arial Unicode MS" },
102 103
103static void *enc_buf; 104static void *enc_buf;
104static uint32_t enc_len; 105static uint32_t enc_len;
105 106
106static inline void * 107static inline void *
107get_enc_buf (int len) 108get_enc_buf (uint32_t len)
108{ 109{
109 if (len > enc_len) 110 if (len > enc_len)
110 { 111 {
111 free (enc_buf); 112 free (enc_buf);
112 enc_buf = malloc (len); 113 enc_buf = malloc (len);
114 115
115 return enc_buf; 116 return enc_buf;
116} 117}
117 118
118static const char * 119static const char *
119enc_char (const text_t *text, int len, codeset cs, bool &zero) 120enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
120{ 121{
121 uint8_t *buf = (uint8_t *)get_enc_buf (len); 122 uint8_t *buf = (uint8_t *)get_enc_buf (len);
122 123
123 while (len--) 124 while (len--)
124 { 125 {
135 136
136 return (const char *)enc_buf; 137 return (const char *)enc_buf;
137} 138}
138 139
139static const XChar2b * 140static const XChar2b *
140enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 141enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
141{ 142{
142 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 143 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
143 144
144 while (len--) 145 while (len--)
145 { 146 {
337 rxvt_font_x11 () { f = 0; } 338 rxvt_font_x11 () { f = 0; }
338 339
339 void clear (); 340 void clear ();
340 341
341 rxvt_fontprop properties (); 342 rxvt_fontprop properties ();
342 rxvt_fontprop properties (XFontStruct *f);
343 343
344 bool load (const rxvt_fontprop &prop); 344 bool load (const rxvt_fontprop &prop);
345 345
346 bool has_codepoint (uint32_t unicode); 346 bool has_codepoint (uint32_t unicode);
347 347
352 XFontStruct *f; 352 XFontStruct *f;
353 codeset cs; 353 codeset cs;
354 bool enc2b, encm; 354 bool enc2b, encm;
355 355
356 const char *get_property (XFontStruct *f, const char *property, const char *repl) const; 356 const char *get_property (XFontStruct *f, const char *property, const char *repl) const;
357 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
358 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
359 bool set_properties (rxvt_fontprop &p, const char *name);
357}; 360};
358 361
359const char * 362const char *
360rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 363rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
361{ 364{
368} 371}
369 372
370rxvt_fontprop 373rxvt_fontprop
371rxvt_font_x11::properties () 374rxvt_font_x11::properties ()
372{ 375{
373 return properties (f);
374}
375
376rxvt_fontprop
377rxvt_font_x11::properties (XFontStruct *f)
378{
379 rxvt_fontprop p; 376 rxvt_fontprop p;
377 set_properties (p, f);
378 return p;
379}
380 380
381bool
382rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
383{
384 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
385 p.height = height;
386 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
387 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
388
389 return true;
390}
391
392bool
393rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
394{
381 const char *weight = get_property (f, "WEIGHT_NAME", "medium"); 395 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
382 const char *slant = get_property (f, "SLANT", "r"); 396 const char *slant = get_property (f, "SLANT", "r");
383 397
398 unsigned long height;
399 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
400 return false;
401
384 unsigned long avgwidth; 402 unsigned long avgwidth;
385 p.width = XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth) 403 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
386 ? avgwidth / 10 404 avgwidth = 0;
387 : (height + 1) / 2;
388 p.height = height;
389 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
390 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
391 405
392 return p; 406 return set_properties (p, height, weight, slant, avgwidth);
407}
408
409bool
410rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
411{
412 int slashes = 0;
413 const char *comp[12];
414
415 for (const char *c = name; *c; c++)
416 if (*c == '-')
417 {
418 comp[slashes++] = c + 1;
419 if (slashes >= 13)
420 break;
421 }
422
423 /* can we short-circuit the costly XLoadQueryFont? */
424 if (slashes >= 13
425 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
426 && (*comp[11] >= '0' && *comp[11] <= '9'))
427 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
428
429 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
430
431 if (f)
432 {
433 // the font should really exist now. if not, we have a problem
434 // (e.g. if the user did xset fp rehash just when we were searching fonts).
435 // in that case, just return garbage.
436 bool ret = set_properties (p, f);
437 XFreeFont (DISPLAY, f);
438 return ret;
439 }
440 else
441 return false;
442}
443
444// fix the size of scalable fonts
445static void
446fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop)
447{
448 int slashes = 0;
449 const char *size;
450
451 for (const char *c = name; *c; c++)
452 if (*c == '-')
453 {
454 if (slashes == 6)
455 size = c + 1;
456
457 if (++slashes >= 13)
458 break;
459 }
460
461 if (slashes >= 13 && size[0] == '0')
462 {
463 strncpy (buf, name, size - name);
464 buf += size - name;
465 buf += sprintf (buf, "%d", prop.height);
466 strcpy (buf, size + 1);
467 }
468 else
469 strcpy (buf, name);
393} 470}
394 471
395bool 472bool
396rxvt_font_x11::load (const rxvt_fontprop &prop) 473rxvt_font_x11::load (const rxvt_fontprop &prop)
397{ 474{
398 clear (); 475 clear ();
399 476
400 char **list; 477 char **list;
401 int count; 478 int count;
402 XFontStruct *info;
403 list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info); 479 list = XListFonts (DISPLAY, name, 512, &count);
480 set_name (0);
404 481
405 if (!list) 482 if (!list)
406 return false; 483 return false;
407 484
408 int bestdiff = 0x7fffffff; 485 int bestdiff = 0x7fffffff;
409 XFontStruct *best = 0;
410 for (int i = 0; i < count; i++) 486 for (int i = 0; i < count; i++)
411 { 487 {
412 XFontStruct *f = info + i; 488 rxvt_fontprop p;
489 char fname[1024];
490 fix_scalable (fname, list[i], prop);
413 491
492 if (!set_properties (p, fname))
493 continue;
494
414 if (f->ascent + f->descent <= prop.height) // weed out too large fonts 495 if (p.height > prop.height) // weed out too large fonts
415 { 496 continue;
416 rxvt_fontprop p = properties (f); 497
417 int diff = (prop.height - f->ascent + f->descent) * 32 498 int diff = (prop.height - p.height) * 32
418 + abs (prop.weight - p.weight) 499 + abs (prop.weight - p.weight)
419 + abs (prop.slant - p.slant ); 500 + abs (prop.slant - p.slant );
420 501
421 if (!best // compare against best found so far 502 if (!name // compare against best found so far
422 || diff < bestdiff) 503 || diff < bestdiff)
423 { 504 {
424 best = f; 505 set_name (strdup (fname));
425 bestdiff = diff; 506 bestdiff = diff;
426 } 507 }
427 }
428 } 508 }
429 509
510 XFreeFontNames (list);
511
430 if (!best) 512 if (!name)
431 return false; 513 return false;
432
433 set_name (strdup (list[best - info]));
434
435 XFreeFontInfo (list, info, count);
436 514
437 f = XLoadQueryFont (DISPLAY, name); 515 f = XLoadQueryFont (DISPLAY, name);
438 516
439 if (!f) 517 if (!f)
440 return false; 518 return false;
441
442 unsigned long value;
443 519
444 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 520 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
445 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 521 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
446 522
447 if (registry && encoding) 523 if (registry && encoding)
534 /* check wether the character exists in _this_ font. horrible. */ 610 /* check wether the character exists in _this_ font. horrible. */
535 XCharStruct *xcs; 611 XCharStruct *xcs;
536 612
537 if (encm) 613 if (encm)
538 { 614 {
539 int byte1 = ch >> 8; 615 unsigned char byte1 = ch >> 8;
540 int byte2 = ch & 255; 616 unsigned char byte2 = ch & 255;
541 617
542 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 618 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
543 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 619 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
544 return false; 620 return false;
545 621
684}; 760};
685 761
686void 762void
687rxvt_font_xft::clear () 763rxvt_font_xft::clear ()
688{ 764{
765 if (d)
766 {
767 XftDrawDestroy (d);
768 d = 0;
769 }
770
689 if (f) 771 if (f)
690 { 772 {
691 XftFontClose (DISPLAY, f); 773 XftFontClose (DISPLAY, f);
692 f = 0; 774 f = 0;
693 }
694
695 if (d)
696 {
697 XftDrawDestroy (d);
698 d = 0;
699 } 775 }
700} 776}
701 777
702rxvt_fontprop 778rxvt_fontprop
703rxvt_font_xft::properties () 779rxvt_font_xft::properties ()
736 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 812 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
737 813
738 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 814 if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
739 FcPatternAddInteger (p, FC_SLANT, prop.slant); 815 FcPatternAddInteger (p, FC_SLANT, prop.slant);
740 816
817#if 0 // clipping unfortunately destroys our precious double-width-characters
741 // clip width, we can't do better, or can we? 818 // clip width, we can't do better, or can we?
742 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 819 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
743 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); 820 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
821#endif
744 822
745 //FcPatternAddBool (p, FC_MINSPACE, 1); 823 //FcPatternAddBool (p, FC_MINSPACE, 1);
746 824
747 XftResult result; 825 XftResult result;
748 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 826 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
812void 890void
813rxvt_font_xft::draw (int x, int y, 891rxvt_font_xft::draw (int x, int y,
814 const text_t *text, int len, 892 const text_t *text, int len,
815 int fg, int bg) 893 int fg, int bg)
816{ 894{
817 if (!d) 895 d = XftDrawCreate (DISPLAY, DRAWABLE, r->display->visual, r->display->cmap);
818 {
819 dR;
820 d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
821 }
822 896
823 if (bg >= 0 && bg != Color_bg) 897 if (bg >= 0 && bg != Color_bg)
824 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); 898 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
825 else 899 else
826 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 900 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
827 901
828 if (!slow && width == r->TermWin.fwidth) 902 if (!slow && width == r->TermWin.fwidth && 0)
829 { 903 {
830 if (sizeof (text_t) == sizeof (FcChar16)) 904 if (sizeof (text_t) == sizeof (FcChar16))
831 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 905 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
832 else 906 else
833 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); 907 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
836 { 910 {
837 while (len) 911 while (len)
838 { 912 {
839 if (*text != NOCHAR && *text != ' ') 913 if (*text != NOCHAR && *text != ' ')
840 { 914 {
915 int fwidth = r->TermWin.fwidth;
916 if (len >= 2 && text[1] == NOCHAR)
917 fwidth *= 2;
918
919 XGlyphInfo extents;
841 if (sizeof (text_t) == sizeof (FcChar16)) 920 if (sizeof (text_t) == sizeof (FcChar16))
842 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1); 921 {
922 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents);
923 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
924 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
925 }
843 else 926 else
844 XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1); 927 {
928 XGlyphInfo extents;
929 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents);
930 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
931 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
932 }
845 } 933 }
846 934
847 x += r->TermWin.fwidth; 935 x += r->TermWin.fwidth;
848 text++; 936 text++;
849 len--; 937 len--;
853#endif 941#endif
854 942
855///////////////////////////////////////////////////////////////////////////// 943/////////////////////////////////////////////////////////////////////////////
856 944
857rxvt_fontset::rxvt_fontset (rxvt_t r) 945rxvt_fontset::rxvt_fontset (rxvt_t r)
858#ifdef EXPLICIT_CONTEXT
859: r(r) 946: r (r)
860#endif
861{ 947{
862 clear (); 948 clear ();
863} 949}
864 950
865rxvt_fontset::~rxvt_fontset () 951rxvt_fontset::~rxvt_fontset ()
868} 954}
869 955
870void 956void
871rxvt_fontset::clear () 957rxvt_fontset::clear ()
872{ 958{
873 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 959 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
874 FONT_UNREF (*i); 960 FONT_UNREF (*i);
875 961
876 fonts.clear (); 962 fonts.clear ();
877 base_id = 0; 963 base_id = 0;
878 base_prop.height = 0x7fffffff; 964 base_prop.height = 0x7fffffff;
932 1018
933 if (*desc == '[') 1019 if (*desc == '[')
934 { 1020 {
935 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1021 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
936 1022
937 const char *extra = desc++; 1023 //const char *extra = desc++; // not yet used
938 1024
939 desc = strchr (desc, ']'); 1025 desc = strchr (desc, ']');
940 1026
941 if (!desc) 1027 if (!desc)
942 { 1028 {
995 1081
996 if (!base_id) 1082 if (!base_id)
997 base_id = 1; 1083 base_id = 1;
998 1084
999 // we currently need a base-font, no matter what 1085 // we currently need a base-font, no matter what
1000 if (fonts.size () <= base_id || !realize_font (base_id)) 1086 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1001 { 1087 {
1088 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1002 add_fonts ("fixed"); 1089 add_fonts ("fixed");
1003 base_id = fonts.size () - 1; 1090 base_id = fonts.size () - 1;
1004 } 1091 }
1005 1092
1006 if (fonts.size () <= base_id || !realize_font (base_id)) 1093 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1007 { 1094 {
1008 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); 1095 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1009 exit (1); 1096 exit (1);
1010 } 1097 }
1011 1098
1013} 1100}
1014 1101
1015int 1102int
1016rxvt_fontset::find_font (uint32_t unicode) 1103rxvt_fontset::find_font (uint32_t unicode)
1017{ 1104{
1018 for (int i = 0; i < fonts.size (); i++) 1105 for (unsigned int i = 0; i < fonts.size (); i++)
1019 { 1106 {
1020 rxvt_font *f = fonts[i]; 1107 rxvt_font *f = fonts[i];
1021 1108
1022 if (!f->loaded) 1109 if (!f->loaded)
1023 { 1110 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines