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.86 by root, Wed Jan 25 13:24:45 2006 UTC vs.
Revision 1.94 by root, Thu Feb 2 18:04:46 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
135 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 134 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
136 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 135 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
137 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
138 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
139#if XFT 136#if XFT
140 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 137 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
141 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 138 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
142 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
143 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 140 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
144 141
145 // FreeMono is usually uglier than x fonts, so try last only. 142 // FreeMono is usually uglier than x fonts, so try after the others
146 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 143 { CS_UNICODE, "xft:FreeMono:autohint=true" },
147#endif 144#endif
148 145
146 // generic font fallback, put this last, as many iso10646 fonts have extents
147 // specified for all glyphs in the range they cover, but most are simply empty
148 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
149 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
149 { CS_UNKNOWN, 0 } 150 { CS_UNKNOWN, 0 }
150}; 151};
151 152
152// these characters are used to guess the font height and width 153// these characters are used to guess the font height and width
153// pango uses a similar algorithm and doesn't trust the font either. 154// pango uses a similar algorithm and doesn't trust the font either.
… …
157 0x304c, 0x672c, // が本 158 0x304c, 0x672c, // が本
158}; 159};
159 160
160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 161#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
161 162
162#define dTermDisplay Display *disp = term->display->display 163#define dTermDisplay Display *disp = term->dpy
163#define dTermGC GC gc = term->gc 164#define dTermGC GC gc = term->gc
164 165
165///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
166 167
167#if XFT 168#if XFT
… …
172} 173}
173 174
174rxvt_drawable::operator XftDraw *() 175rxvt_drawable::operator XftDraw *()
175{ 176{
176 if (!xftdrawable) 177 if (!xftdrawable)
177 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); 178 xftdrawable = XftDrawCreate (screen->dpy, drawable, screen->visual, screen->cmap);
178 179
179 return xftdrawable; 180 return xftdrawable;
180} 181}
181#endif 182#endif
182 183
… …
227 228
228 return res; 229 return res;
229} 230}
230 231
231///////////////////////////////////////////////////////////////////////////// 232/////////////////////////////////////////////////////////////////////////////
233
234rxvt_font::rxvt_font ()
235: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
236{
237}
232 238
233void 239void
234rxvt_font::set_name (char *name) 240rxvt_font::set_name (char *name)
235{ 241{
236 if (this->name == name) 242 if (this->name == name)
… …
245{ 251{
246 dTermDisplay; 252 dTermDisplay;
247 dTermGC; 253 dTermGC;
248 254
249 if (color == Color_bg) 255 if (color == Color_bg)
250 XClearArea (disp, d, x, y, w, h, FALSE); 256 XClearArea (disp, d, x, y, w, h, false);
251 else if (color >= 0) 257 else if (color >= 0)
252 { 258 {
253#if XFT 259#if XFT
254 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 260 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
255#else 261#else
256 XSetForeground (disp, gc, term->pix_colors[color]); 262 XSetForeground (disp, gc, term->pix_colors[color]);
257 XFillRectangle (disp, d, gc, x, y, w, h); 263 XFillRectangle (disp, d, gc, x, y, w, h);
258#endif 264#endif
259 } 265 }
260} 266}
267
268/////////////////////////////////////////////////////////////////////////////
261 269
262#include "table/linedraw.h" 270#include "table/linedraw.h"
263 271
264struct rxvt_font_default : rxvt_font { 272struct rxvt_font_default : rxvt_font {
265 struct rxvt_fontset *fs; 273 struct rxvt_fontset *fs;
… …
432 } 440 }
433 } 441 }
434#if ENABLE_COMBINING 442#if ENABLE_COMBINING
435 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 443 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
436 { 444 {
445 min_it (width, 2); // we only support wcwidth up to 2
446
437 text_t chrs[2]; 447 text_t chrs[2];
438 width = min (2, width);
439 chrs [1] = NOCHAR; 448 chrs [1] = NOCHAR;
440 449
441 *chrs = cc->c1; 450 *chrs = cc->c1;
442 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 451 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
443 f1->draw (d, x, y, chrs, width, fg, bg); 452 f1->draw (d, x, y, chrs, width, fg, bg);
… …
493 bool slow; // wether this is a proportional font or has other funny characteristics 502 bool slow; // wether this is a proportional font or has other funny characteristics
494 XFontStruct *f; 503 XFontStruct *f;
495 codeset cs; 504 codeset cs;
496 bool enc2b, encm; 505 bool enc2b, encm;
497 506
498 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 507 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
499 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 508 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
500 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 509 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
501 bool set_properties (rxvt_fontprop &p, const char *name); 510 bool set_properties (rxvt_fontprop &p, const char *name);
502}; 511};
503 512
504char * 513char *
505rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 514rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
506{ 515{
507 unsigned long value; 516 unsigned long value;
508 517
509 if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value)) 518 if (XGetFontProperty (f, property, &value))
510 return XGetAtomName (term->display->display, value); 519 return XGetAtomName (term->dpy, value);
511 else 520 else
512 return rxvt_strdup (repl); 521 return rxvt_strdup (repl);
513} 522}
514 523
515rxvt_fontprop 524rxvt_fontprop
… …
521} 530}
522 531
523bool 532bool
524rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 533rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
525{ 534{
526 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 535 p.width = width != rxvt_fontprop::unset ? width
536 : avgwidth ? (avgwidth + 1) / 10
537 : (height + 1) / 2;
527 p.height = height; 538 p.height = height;
528 p.ascent = rxvt_fontprop::unset; 539 p.ascent = rxvt_fontprop::unset;
529 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 540 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; 541 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
531 542
… …
536rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 547rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
537{ 548{
538 unsigned long height; 549 unsigned long height;
539 550
540#if 0 551#if 0
541 if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height)) 552 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
542 return false; 553 return false;
543#else 554#else
544 height = f->ascent + f->descent; 555 height = f->ascent + f->descent;
545#endif 556#endif
546 557
547 unsigned long avgwidth; 558 unsigned long avgwidth;
548 if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth)) 559 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
549 avgwidth = 0; 560 avgwidth = 0;
550 561
551 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 562 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
552 char *slant = get_property (f, "SLANT", "r"); 563 char *slant = get_property (f, term->xa [XA_SLANT], "r");
553 564
554 set_properties (p, height, weight, slant, avgwidth); 565 set_properties (p, height, weight, slant, avgwidth);
555 566
556 free (weight); 567 free (weight);
557 free (slant); 568 free (slant);
… …
655 f = XLoadQueryFont (disp, name); 666 f = XLoadQueryFont (disp, name);
656 667
657 if (!f) 668 if (!f)
658 return false; 669 return false;
659 670
660 char *new_name = get_property (f, "FONT", name); 671 char *new_name = get_property (f, XA_FONT, name);
661 672
662 if (new_name) 673 if (new_name)
663 set_name (new_name); 674 set_name (new_name);
664 else 675 else
665 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
774 delete [] fonts; 785 delete [] fonts;
775 786
776 if (!f) 787 if (!f)
777 return false; 788 return false;
778 789
779 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 790 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
780 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 791 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
781 792
782 if (registry && encoding) 793 if (registry && encoding)
783 { 794 {
784 char charset[64]; 795 char charset[64];
785 snprintf (charset, 64, "%s-%s", registry, encoding); 796 snprintf (charset, 64, "%s-%s", registry, encoding);
786 797
787 cs = codeset_from_name (charset); 798 cs = codeset_from_name (charset);
788 } 799 }
789 else 800 else
790 { 801 {
791 const char *charset = get_property (f, "FONT", 0); 802 const char *charset = get_property (f, XA_FONT, 0);
792 803
793 if (!charset) 804 if (!charset)
794 charset = name; 805 charset = name;
795 806
796 int count = 13; 807 int count = 13;
… …
811 enc2b = encm || f->max_char_or_byte2 > 255; 822 enc2b = encm || f->max_char_or_byte2 > 255;
812 823
813 slow = false; 824 slow = false;
814 825
815#if 1 // only used for slow detection, TODO optimize 826#if 1 // only used for slow detection, TODO optimize
816 if (f->min_bounds.width == f->max_bounds.width) 827 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; 828 width = f->max_bounds.width;
820 else 829 else
821 { 830 {
822 slow = true; 831 slow = true;
823 832
… …
839 848
840 width = 1; 849 width = 1;
841 850
842 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 851 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
843 { 852 {
844 if (cs != CS_UNICODE
845 && *t > 0x100
846 && FROM_UNICODE (cs, *t) == NOCHAR) 853 if (FROM_UNICODE (cs, *t) == NOCHAR)
847 continue; 854 continue;
848 855
849 // ignore characters we wouldn't use anyways 856 // ignore characters we wouldn't use anyways
850 bool careful; 857 bool careful;
851 if (!has_char (*t, &prop, careful)) 858 if (!has_char (*t, &prop, careful))
… …
855 862
856 XCharStruct g; 863 XCharStruct g;
857 int dir_ret, asc_ret, des_ret; 864 int dir_ret, asc_ret, des_ret;
858 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 865 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
859 866
867 int wcw = WCWIDTH (*t);
860 int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 868 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
861 869
862 if (width < g.width) width = g.width; 870 if (width < g.width) width = g.width;
863 } 871 }
864 872
865 if (cs == CS_UNKNOWN) 873 if (cs == CS_UNKNOWN)
866 { 874 {
867 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 875 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
884void 892void
885rxvt_font_x11::clear () 893rxvt_font_x11::clear ()
886{ 894{
887 if (f) 895 if (f)
888 { 896 {
889 XFreeFont (term->display->display, f); 897 XFreeFont (term->dpy, f);
890 f = 0; 898 f = 0;
891 } 899 }
892} 900}
893 901
894bool 902bool
… …
937 return false; 945 return false;
938 946
939 if (!prop || prop->width == rxvt_fontprop::unset) 947 if (!prop || prop->width == rxvt_fontprop::unset)
940 return true; 948 return true;
941 949
942 // check character against base font bounding box 950 // check wether character overlaps previous/next character
943 int w = xcs->rbearing - xcs->lbearing; 951 int w = xcs->rbearing - xcs->lbearing;
944 int wcw = WCWIDTH (unicode); 952 int wcw = max (WCWIDTH (unicode), 1);
945 if (wcw > 0) w = (w + wcw - 1) / wcw;
946 953
947 careful = w > prop->width; 954 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
955
948 if (careful && OVERLAP_OK (w, prop)) 956 if (careful && !OVERLAP_OK (w, wcw, prop))
949 return false; 957 return false;
950 958
951 return true; 959 return true;
952} 960}
953 961
… …
1066void 1074void
1067rxvt_font_xft::clear () 1075rxvt_font_xft::clear ()
1068{ 1076{
1069 if (f) 1077 if (f)
1070 { 1078 {
1071 XftFontClose (term->display->display, f); 1079 XftFontClose (term->dpy, f);
1072 f = 0; 1080 f = 0;
1073 } 1081 }
1074} 1082}
1075 1083
1076rxvt_fontprop 1084rxvt_fontprop
… …
1243bool 1251bool
1244rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1252rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1245{ 1253{
1246 careful = false; 1254 careful = false;
1247 1255
1248 if (!XftCharExists (term->display->display, f, unicode)) 1256 if (!XftCharExists (term->dpy, f, unicode))
1249 return false; 1257 return false;
1250 1258
1251 if (!prop || prop->width == rxvt_fontprop::unset) 1259 if (!prop || prop->width == rxvt_fontprop::unset)
1252 return true; 1260 return true;
1253 1261
1254 // check character against base font bounding box 1262 // check character against base font bounding box
1255 FcChar32 ch = unicode; 1263 FcChar32 ch = unicode;
1256 XGlyphInfo g; 1264 XGlyphInfo g;
1257 XftTextExtents32 (term->display->display, f, &ch, 1, &g); 1265 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1258 1266
1259 int w = g.width - g.x; 1267 int w = g.width - g.x;
1260 int wcw = WCWIDTH (unicode); 1268 int wcw = max (WCWIDTH (unicode), 1);
1261 if (wcw > 0) w = (w + wcw - 1) / wcw;
1262 1269
1263 careful = w > prop->width; 1270 careful = g.x > 0 || w > prop->width * wcw;
1271
1264 if (careful && OVERLAP_OK (w, prop)) 1272 if (careful && !OVERLAP_OK (w, wcw, prop))
1273 return false;
1274
1275 // this weeds out _totally_ broken fonts, or glyphs
1276 if (!OVERLAP_OK (g.xOff, wcw, prop))
1265 return false; 1277 return false;
1266 1278
1267 return true; 1279 return true;
1268} 1280}
1269 1281
… …
1299 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1311 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1300 1312
1301 ep->glyph = glyph; 1313 ep->glyph = glyph;
1302 ep->x = x + (cwidth - extents.xOff >> 1); 1314 ep->x = x + (cwidth - extents.xOff >> 1);
1303 ep->y = y + ascent; 1315 ep->y = y + ascent;
1316
1317 if (extents.xOff == 0)
1318 ep->x = x + cwidth;
1319
1304 ep++; 1320 ep++;
1305 } 1321 }
1306 1322
1307 x += cwidth; 1323 x += cwidth;
1308 } 1324 }
… …
1560 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1576 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1561 FcPatternAddBool (p, FC_MINSPACE, 1); 1577 FcPatternAddBool (p, FC_MINSPACE, 1);
1562 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1578 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1563 1579
1564 XftResult result; 1580 XftResult result;
1565 FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result); 1581 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1566 1582
1567 FcPatternDestroy (p); 1583 FcPatternDestroy (p);
1568 1584
1569 if (match) 1585 if (match)
1570 { 1586 {

Diff Legend

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