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.12 by pcg, Fri Dec 26 07:42:23 2003 UTC vs.
Revision 1.18 by pcg, Fri Feb 13 12:16:21 2004 UTC

… …
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 {
… …
514 f = XLoadQueryFont (DISPLAY, name); 515 f = XLoadQueryFont (DISPLAY, name);
515 516
516 if (!f) 517 if (!f)
517 return false; 518 return false;
518 519
519 unsigned long value;
520
521 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 520 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
522 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 521 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
523 522
524 if (registry && encoding) 523 if (registry && encoding)
525 { 524 {
… …
611 /* check wether the character exists in _this_ font. horrible. */ 610 /* check wether the character exists in _this_ font. horrible. */
612 XCharStruct *xcs; 611 XCharStruct *xcs;
613 612
614 if (encm) 613 if (encm)
615 { 614 {
616 int byte1 = ch >> 8; 615 unsigned char byte1 = ch >> 8;
617 int byte2 = ch & 255; 616 unsigned char byte2 = ch & 255;
618 617
619 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 618 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
620 || 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)
621 return false; 620 return false;
622 621
… …
892rxvt_font_xft::draw (int x, int y, 891rxvt_font_xft::draw (int x, int y,
893 const text_t *text, int len, 892 const text_t *text, int len,
894 int fg, int bg) 893 int fg, int bg)
895{ 894{
896 if (!d) 895 if (!d)
897 { 896 d = XftDrawCreate (DISPLAY, DRAWABLE, r->display->visual, r->display->cmap);
898 dR;
899 d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
900 }
901 897
902 if (bg >= 0 && bg != Color_bg) 898 if (bg >= 0 && bg != Color_bg)
903 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); 899 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
904 else 900 else
905 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 901 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
… …
915 { 911 {
916 while (len) 912 while (len)
917 { 913 {
918 if (*text != NOCHAR && *text != ' ') 914 if (*text != NOCHAR && *text != ' ')
919 { 915 {
916 int fwidth = r->TermWin.fwidth;
917 if (len >= 2 && text[1] == NOCHAR)
918 fwidth *= 2;
919
920 XGlyphInfo extents; 920 XGlyphInfo extents;
921 if (sizeof (text_t) == sizeof (FcChar16)) 921 if (sizeof (text_t) == sizeof (FcChar16))
922 { 922 {
923 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); 923 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents);
924 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (r->TermWin.fwidth - extents.width) / 2, 924 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
925 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 925 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
926 } 926 }
927 else 927 else
928 { 928 {
929 XGlyphInfo extents; 929 XGlyphInfo extents;
930 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); 930 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents);
931 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (r->TermWin.fwidth - extents.width) / 2, 931 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
932 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 932 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
933 } 933 }
934 } 934 }
935 935
936 x += r->TermWin.fwidth; 936 x += r->TermWin.fwidth;
… …
942#endif 942#endif
943 943
944///////////////////////////////////////////////////////////////////////////// 944/////////////////////////////////////////////////////////////////////////////
945 945
946rxvt_fontset::rxvt_fontset (rxvt_t r) 946rxvt_fontset::rxvt_fontset (rxvt_t r)
947#ifdef EXPLICIT_CONTEXT
948: r(r) 947: r (r)
949#endif
950{ 948{
951 clear (); 949 clear ();
952} 950}
953 951
954rxvt_fontset::~rxvt_fontset () 952rxvt_fontset::~rxvt_fontset ()
… …
957} 955}
958 956
959void 957void
960rxvt_fontset::clear () 958rxvt_fontset::clear ()
961{ 959{
962 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 960 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
963 FONT_UNREF (*i); 961 FONT_UNREF (*i);
964 962
965 fonts.clear (); 963 fonts.clear ();
966 base_id = 0; 964 base_id = 0;
967 base_prop.height = 0x7fffffff; 965 base_prop.height = 0x7fffffff;
… …
1021 1019
1022 if (*desc == '[') 1020 if (*desc == '[')
1023 { 1021 {
1024 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1022 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
1025 1023
1026 const char *extra = desc++; 1024 //const char *extra = desc++; // not yet used
1027 1025
1028 desc = strchr (desc, ']'); 1026 desc = strchr (desc, ']');
1029 1027
1030 if (!desc) 1028 if (!desc)
1031 { 1029 {
… …
1084 1082
1085 if (!base_id) 1083 if (!base_id)
1086 base_id = 1; 1084 base_id = 1;
1087 1085
1088 // we currently need a base-font, no matter what 1086 // we currently need a base-font, no matter what
1089 if (fonts.size () <= base_id || !realize_font (base_id)) 1087 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1090 { 1088 {
1089 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1091 add_fonts ("fixed"); 1090 add_fonts ("fixed");
1092 base_id = fonts.size () - 1; 1091 base_id = fonts.size () - 1;
1093 } 1092 }
1094 1093
1095 if (fonts.size () <= base_id || !realize_font (base_id)) 1094 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1096 { 1095 {
1097 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); 1096 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1098 exit (1); 1097 exit (1);
1099 } 1098 }
1100 1099
… …
1102} 1101}
1103 1102
1104int 1103int
1105rxvt_fontset::find_font (uint32_t unicode) 1104rxvt_fontset::find_font (uint32_t unicode)
1106{ 1105{
1107 for (int i = 0; i < fonts.size (); i++) 1106 for (unsigned int i = 0; i < fonts.size (); i++)
1108 { 1107 {
1109 rxvt_font *f = fonts[i]; 1108 rxvt_font *f = fonts[i];
1110 1109
1111 if (!f->loaded) 1110 if (!f->loaded)
1112 { 1111 {

Diff Legend

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