ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtfont.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.90 by root, Mon Jan 30 02:21:20 2006 UTC vs.
Revision 1.91 by root, Mon Jan 30 04:27:17 2006 UTC

… …
24#include "rxvtlib.h" 24#include "rxvtlib.h"
25#include "rxvtutil.h" 25#include "rxvtutil.h"
26#include "rxvtfont.h" 26#include "rxvtfont.h"
27 27
28#include <cstdlib> 28#include <cstdlib>
29#include <wchar.h> 29
30#include <inttypes.h> 30#include <inttypes.h>
31 31
32#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width 32#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
33#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts 33#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34 34
35#define OVERLAP_OK(w,prop) (w) > ( \ 35#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36 prop->slant >= rxvt_fontprop::italic \ 36 (prop)->slant >= rxvt_fontprop::italic \
37 ? (prop->width * MAX_OVERLAP_ITALIC + 7) >> 3 \ 37 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : (prop->width * MAX_OVERLAP_ROMAN + 7) >> 3 \ 38 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 ) 39 ))
40 40
41const struct rxvt_fallback_font { 41const struct rxvt_fallback_font {
42 codeset cs; 42 codeset cs;
43 const char *name; 43 const char *name;
44} fallback_fonts[] = { 44} fallback_fonts[] = {
… …
64 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 64 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
67 67
68# if XFT 68# if XFT
69 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 69 { CS_KOI8_U, "xft::lang=ru" },
70 70
71 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 71 { CS_ISO8859_5, "xft::lang=ru" },
72 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 72 { CS_ISO8859_6, "xft::lang=ar" },
73 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 73 { CS_ISO8859_7, "xft::lang=el" },
74 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 74 { CS_ISO8859_8, "xft::lang=he" },
75 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 75 { CS_ISO8859_9, "xft::lang=tr" },
76 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 76 { CS_ISO8859_10, "xft::lang=se" },
77 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 77 { CS_ISO8859_11, "xft::lang=th" },
78# endif 78# endif
79#endif 79#endif
80 80
81 // japanese 81 // japanese
82#if ENCODING_JP || ENCODING_JP_EXT 82#if ENCODING_JP || ENCODING_JP_EXT
83# if XFT 83# if XFT
84 // prefer xft for complex scripts 84 // prefer xft for complex scripts
85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, 86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89# endif 89# endif
90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
92 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 92 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
93 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
… …
97 97
98#if ENCODING_ZH || ENCODING_ZH_EXT 98#if ENCODING_ZH || ENCODING_ZH_EXT
99# if XFT 99# if XFT
100 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 100 { CS_GBK_0, "xft:AR PL KaitiM GB" },
101 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 101 { CS_GBK_0, "xft:AR PL SungtiL GB" },
102 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 102 { CS_GBK_0, "xft::lang=zh" },
103 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
104 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 104 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
105 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
106 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 106 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
107 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 107 { CS_GB2312_1980_0, "xft::lang=zh" },
108# endif 108# endif
109 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 109 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
110 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 110 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
111 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 111 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
112 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 112 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
125#if ENCODING_KR 125#if ENCODING_KR
126 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 126 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
127 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 127 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
128# if XFT 128# if XFT
129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
130 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
131# endif 131# endif
132#endif 132#endif
133 133
134 // generic font fallback 134 // generic font fallback
135 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 135 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
… …
228 return res; 228 return res;
229} 229}
230 230
231///////////////////////////////////////////////////////////////////////////// 231/////////////////////////////////////////////////////////////////////////////
232 232
233rxvt_font::rxvt_font ()
234: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
235{
236}
237
233void 238void
234rxvt_font::set_name (char *name) 239rxvt_font::set_name (char *name)
235{ 240{
236 if (this->name == name) 241 if (this->name == name)
237 return; 242 return;
… …
256 XSetForeground (disp, gc, term->pix_colors[color]); 261 XSetForeground (disp, gc, term->pix_colors[color]);
257 XFillRectangle (disp, d, gc, x, y, w, h); 262 XFillRectangle (disp, d, gc, x, y, w, h);
258#endif 263#endif
259 } 264 }
260} 265}
266
267/////////////////////////////////////////////////////////////////////////////
261 268
262#include "table/linedraw.h" 269#include "table/linedraw.h"
263 270
264struct rxvt_font_default : rxvt_font { 271struct rxvt_font_default : rxvt_font {
265 struct rxvt_fontset *fs; 272 struct rxvt_fontset *fs;
… …
432 } 439 }
433 } 440 }
434#if ENABLE_COMBINING 441#if ENABLE_COMBINING
435 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 442 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
436 { 443 {
444 min_it (width, 2); // we only support wcwidth up to 2
445
437 text_t chrs[2]; 446 text_t chrs[2];
438 width = min (2, width);
439 chrs [1] = NOCHAR; 447 chrs [1] = NOCHAR;
440 448
441 *chrs = cc->c1; 449 *chrs = cc->c1;
442 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 450 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
443 f1->draw (d, x, y, chrs, width, fg, bg); 451 f1->draw (d, x, y, chrs, width, fg, bg);
… …
521} 529}
522 530
523bool 531bool
524rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 532rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
525{ 533{
526 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 534 p.width = width != rxvt_fontprop::unset ? width
535 : avgwidth ? (avgwidth + 1) / 10
536 : (height + 1) / 2;
527 p.height = height; 537 p.height = height;
528 p.ascent = rxvt_fontprop::unset; 538 p.ascent = rxvt_fontprop::unset;
529 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 539 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
530 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 540 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
531 541
… …
811 enc2b = encm || f->max_char_or_byte2 > 255; 821 enc2b = encm || f->max_char_or_byte2 > 255;
812 822
813 slow = false; 823 slow = false;
814 824
815#if 1 // only used for slow detection, TODO optimize 825#if 1 // only used for slow detection, TODO optimize
816 if (f->min_bounds.width == f->max_bounds.width) 826 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
817 width = f->min_bounds.width;
818 else if (f->per_char == NULL)
819 width = f->max_bounds.width; 827 width = f->max_bounds.width;
820 else 828 else
821 { 829 {
822 slow = true; 830 slow = true;
823 831
… …
839 847
840 width = 1; 848 width = 1;
841 849
842 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 850 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
843 { 851 {
844 if (cs != CS_UNICODE
845 && *t > 0x100
846 && FROM_UNICODE (cs, *t) == NOCHAR) 852 if (FROM_UNICODE (cs, *t) == NOCHAR)
847 continue; 853 continue;
848 854
849 // ignore characters we wouldn't use anyways 855 // ignore characters we wouldn't use anyways
850 bool careful; 856 bool careful;
851 if (!has_char (*t, &prop, careful)) 857 if (!has_char (*t, &prop, careful))
… …
857 int dir_ret, asc_ret, des_ret; 863 int dir_ret, asc_ret, des_ret;
858 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 864 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
859 865
860 int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 866 int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
861 867
862 if (width < g.width) width = g.width; 868 if (width < g.width) width = g.width;
863 } 869 }
864 870
865 if (cs == CS_UNKNOWN) 871 if (cs == CS_UNKNOWN)
866 { 872 {
867 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 873 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
937 return false; 943 return false;
938 944
939 if (!prop || prop->width == rxvt_fontprop::unset) 945 if (!prop || prop->width == rxvt_fontprop::unset)
940 return true; 946 return true;
941 947
942 // check character against base font bounding box 948 // check wether character overlaps previous/next character
943 int w = xcs->rbearing - xcs->lbearing; 949 int w = xcs->rbearing - xcs->lbearing;
944 int wcw = WCWIDTH (unicode); 950 int wcw = WCWIDTH (unicode);
945 if (wcw > 0) w = (w + wcw - 1) / wcw;
946 951
947 careful = w > prop->width; 952 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
953
948 if (careful && OVERLAP_OK (w, prop)) 954 if (careful && !OVERLAP_OK (w, wcw, prop))
949 return false; 955 return false;
950 956
951 return true; 957 return true;
952} 958}
953 959
… …
1256 XGlyphInfo g; 1262 XGlyphInfo g;
1257 XftTextExtents32 (term->xdisp, f, &ch, 1, &g); 1263 XftTextExtents32 (term->xdisp, f, &ch, 1, &g);
1258 1264
1259 int w = g.width - g.x; 1265 int w = g.width - g.x;
1260 int wcw = WCWIDTH (unicode); 1266 int wcw = WCWIDTH (unicode);
1261 if (wcw > 0) w = (w + wcw - 1) / wcw;
1262 1267
1263 careful = w > prop->width; 1268 careful = g.x > 0 || w > prop->width * wcw;
1269
1264 if (careful && OVERLAP_OK (w, prop)) 1270 if (careful && !OVERLAP_OK (w, wcw, prop))
1271 return false;
1272
1273 // this weeds out _totally_ broken fonts, or glyphs
1274 if (!OVERLAP_OK (g.xOff, wcw, prop))
1265 return false; 1275 return false;
1266 1276
1267 return true; 1277 return true;
1268} 1278}
1269 1279
… …
1296 if (fc != ' ') // skip spaces 1306 if (fc != ' ') // skip spaces
1297 { 1307 {
1298 FT_UInt glyph = XftCharIndex (disp, f, fc); 1308 FT_UInt glyph = XftCharIndex (disp, f, fc);
1299 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1309 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1300 1310
1311
1301 ep->glyph = glyph; 1312 ep->glyph = glyph;
1302 ep->x = x + (cwidth - extents.xOff >> 1); 1313 ep->x = x + (cwidth - extents.xOff >> 1);
1303 ep->y = y + ascent; 1314 ep->y = y + ascent;
1315
1316 if (extents.xOff == 0)
1317 ep->x = x + cwidth;
1318
1304 ep++; 1319 ep++;
1305 } 1320 }
1306 1321
1307 x += cwidth; 1322 x += cwidth;
1308 } 1323 }

Diff Legend

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