--- rxvt-unicode/src/defaultfont.C 2003/11/27 20:09:00 1.3 +++ rxvt-unicode/src/defaultfont.C 2003/12/24 09:40:30 1.11 @@ -23,6 +23,8 @@ #include "rxvt.h" #include "defaultfont.h" +#include + #define DISPLAY r->Xdisplay #define DRAWABLE r->TermWin.vt #define GC r->TermWin.gc @@ -59,38 +61,39 @@ #if ENCODING_JP || ENCODING_JP_EXT # if XFT // prefer xft for complex scripts - { CS_UNICODE, "xft:Kochi Gothic" }, + { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, # endif - { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, - { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, - { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, + { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, + { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, + { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, #endif #if ENCODING_CN || ENCODING_CN_EXT # if XFT - { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, - { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, - { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, - { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, + { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, + { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, + { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, + { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, # endif - { CS_CNS11643_1992_1, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-1" }, - { CS_CNS11643_1992_2, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-2" }, - { CS_CNS11643_1992_3, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-3" }, - { CS_CNS11643_1992_4, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-4" }, - { CS_CNS11643_1992_5, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-5" }, - { CS_CNS11643_1992_6, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-6" }, - { CS_CNS11643_1992_7, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-7" }, - { CS_CNS11643_1992_F, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-f" }, + { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-1" }, + { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-2" }, + { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-3" }, + { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-4" }, + { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-5" }, + { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-6" }, + { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-7" }, + { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-f" }, #endif #if XFT - { CS_UNICODE, "xft:Andale Mono" }, - { CS_UNICODE, "xft:Arial Unicode MS" }, + { CS_UNICODE, "xft:Andale Mono" }, + { CS_UNICODE, "xft:Arial Unicode MS" }, #endif - { CS_UNICODE, "-*-lucidatypewriter-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, - { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, - { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, - { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, + { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, + { CS_UNICODE, "xft:FreeMono" }, + { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, + { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, + { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, { CS_UNKNOWN, 0 } }; @@ -222,7 +225,18 @@ }; struct rxvt_font_default : rxvt_font { - bool load (int maxheight) + rxvt_fontprop properties () + { + rxvt_fontprop p; + + p.width = p.height = 1; + p.weight = rxvt_fontprop::medium; + p.slant = rxvt_fontprop::roman; + + return p; + } + + bool load (const rxvt_fontprop &prop) { width = 1; height = 1; ascent = 1; descent = 0; @@ -272,14 +286,11 @@ { const char *p = linedraw_cmds[t - 0x2500]; - int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1; - int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1; + int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; + int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight; XGCValues gcv; - gcv.cap_style = CapButt; - XChangeGC (DISPLAY, GC, GCCapStyle, &gcv); - while (*p) { switch (*p++) @@ -327,7 +338,10 @@ void clear (); - bool load (int maxheight); + rxvt_fontprop properties (); + rxvt_fontprop properties (XFontStruct *f); + + bool load (const rxvt_fontprop &prop); bool has_codepoint (uint32_t unicode); @@ -339,11 +353,11 @@ codeset cs; bool enc2b, encm; - const char *get_property (const char *property, const char *repl) const; + const char *get_property (XFontStruct *f, const char *property, const char *repl) const; }; const char * -rxvt_font_x11::get_property (const char *property, const char *repl) const +rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const { unsigned long value; @@ -353,11 +367,73 @@ return repl; } +rxvt_fontprop +rxvt_font_x11::properties () +{ + return properties (f); +} + +rxvt_fontprop +rxvt_font_x11::properties (XFontStruct *f) +{ + rxvt_fontprop p; + + const char *weight = get_property (f, "WEIGHT_NAME", "medium"); + const char *slant = get_property (f, "SLANT", "r"); + + unsigned long avgwidth; + p.width = XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth) + ? avgwidth / 10 + : (height + 1) / 2; + p.height = height; + p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; + p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; + + return p; +} + bool -rxvt_font_x11::load (int maxheight) +rxvt_font_x11::load (const rxvt_fontprop &prop) { clear (); + char **list; + int count; + XFontStruct *info; + list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info); + + if (!list) + return false; + + int bestdiff = 0x7fffffff; + XFontStruct *best = 0; + for (int i = 0; i < count; i++) + { + XFontStruct *f = info + i; + + if (f->ascent + f->descent <= prop.height) // weed out too large fonts + { + rxvt_fontprop p = properties (f); + int diff = (prop.height - f->ascent + f->descent) * 32 + + abs (prop.weight - p.weight) + + abs (prop.slant - p.slant ); + + if (!best // compare against best found so far + || diff < bestdiff) + { + best = f; + bestdiff = diff; + } + } + } + + if (!best) + return false; + + set_name (strdup (list[best - info])); + + XFreeFontInfo (list, info, count); + f = XLoadQueryFont (DISPLAY, name); if (!f) @@ -365,8 +441,8 @@ unsigned long value; - const char *registry = get_property ("CHARSET_REGISTRY", 0); - const char *encoding = get_property ("CHARSET_ENCODING", 0); + const char *registry = get_property (f, "CHARSET_REGISTRY", 0); + const char *encoding = get_property (f, "CHARSET_ENCODING", 0); if (registry && encoding) { @@ -377,7 +453,7 @@ } else { - const char *charset = get_property ("FONT", 0); + const char *charset = get_property (f, "FONT", 0); if (!charset) charset = name; @@ -400,7 +476,7 @@ descent = f->descent; height = ascent + descent; - prop = false; + slow = false; if (f->min_bounds.width == f->max_bounds.width) width = f->min_bounds.width; @@ -408,7 +484,7 @@ width = f->max_bounds.width; else { - prop = true; + slow = true; int N = f->max_char_or_byte2 - f->min_char_or_byte2; @@ -503,7 +579,7 @@ // yet we are trying to be perfect /. // but the result still isn't perfect /. - bool slow = prop + bool slow = this->slow || width != r->TermWin.fwidth || height != r->TermWin.fheight; @@ -588,37 +664,13 @@ #endif struct rxvt_font_xft : rxvt_font { -#if 0 - enum { - SWATHCOUNT = 1 << (21 - UNIBITS), - SWATHSIZE = 1 << (SWATHBITS - 5) - }; - typedef uint32_t swath[SWATHSIZE]; - - swath *cvr[SWATHCOUNT]; -#endif - -#if 0 - void gen_coverage_swath (unsigned int page); - - bool has_char (uint32_t ch) - { - unsigned int page = ch >> SWATHBITS; - unsigned int idx = ch & ((1 << SWATHBITS) - 1); - - if (page >= SWATHCOUNT) - return false; - - if (!cvr[page]) gen_coverage_swath (page); - - return cvr[page][idx >> 5] & (1 << (idx & 31)); - } -#endif rxvt_font_xft () { f = 0; d = 0; } void clear (); - bool load (int maxheight); + rxvt_fontprop properties (); + + bool load (const rxvt_fontprop &prop); void draw (int x, int y, const text_t *text, int len, @@ -629,14 +681,6 @@ protected: XftFont *f; XftDraw *d; - -#if 0 - virtual void populate_coverage_swath (uint32_t lo, uint32_t hi) = 0; - void set_swath (uint32_t ch) - { - cvr[ch >> SWATHBITS] |= 1 << (ch & ((1 << SWATHBITS) - 1)); - } -#endif }; void @@ -653,15 +697,26 @@ XftDrawDestroy (d); d = 0; } +} -#if 0 - for (int i = 0; i < SWATHCOUNT; i++) - delete cvr[i]; -#endif +rxvt_fontprop +rxvt_font_xft::properties () +{ + rxvt_fontprop p; + + FT_Face face = XftLockFace (f); + + p.width = width; p.height = height; + p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; + p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman; + + XftUnlockFace (f); + + return p; } bool -rxvt_font_xft::load (int maxheight) +rxvt_font_xft::load (const rxvt_fontprop &prop) { #if 0 for (int i = 0; i < SWATHCOUNT; i++) @@ -670,14 +725,46 @@ clear (); - f = XftFontOpenName (DISPLAY, DefaultScreen (DISPLAY), name); + FcPattern *p = FcNameParse ((FcChar8 *) name); - if (!f) + if (!p) + return false; + + FcValue v; + + if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) + FcPatternAddInteger (p, FC_WEIGHT, prop.weight); + + if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) + FcPatternAddInteger (p, FC_SLANT, prop.slant); + +#if 0 // clipping unfortunately destroys our precious double-width-characters + // clip width, we can't do better, or can we? + if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) + FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); +#endif + + //FcPatternAddBool (p, FC_MINSPACE, 1); + + XftResult result; + FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); + + FcPatternDestroy (p); + + if (!match) return false; + f = XftFontOpenPattern (DISPLAY, match); + + if (!f) + { + FcPatternDestroy (match); + return false; + } + FT_Face face = XftLockFace (f); - prop = !FT_IS_FIXED_WIDTH (face); + slow = !FT_IS_FIXED_WIDTH (face); int ftheight = 0; @@ -689,27 +776,28 @@ c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1); c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2); - prop = prop || g1.xOff != g2.xOff; // don't simply trust the font + if (g1.xOff != g2.xOff) // don't simply trust the font + slow = true; width = g2.xOff; ascent = (face->size->metrics.ascender + 63) >> 6; descent = (-face->size->metrics.descender + 63) >> 6; height = ascent + descent; - if (height <= maxheight || !maxheight) + if (height <= prop.height || !prop.height) break; if (ftheight) { // take smaller steps near the end - if (height > maxheight + 1) ftheight++; - if (height > maxheight + 2) ftheight++; - if (height > maxheight + 3) ftheight++; + if (height > prop.height + 1) ftheight++; + if (height > prop.height + 2) ftheight++; + if (height > prop.height + 3) ftheight++; - FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight); + FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height); } else - FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight); + FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height); } XftUnlockFace (f); @@ -717,18 +805,6 @@ return true; } -#if 0 -void rxvt_font::gen_coverage_swath (unsigned int page) -{ - cvr[page] = new swath; - - for (int i = 0; i < SWATHSIZE; i++) - cvr[page][i] = 0; - - populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1); -} -#endif - bool rxvt_font_xft::has_codepoint (uint32_t unicode) { @@ -751,7 +827,7 @@ else clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); - if (!prop && width == r->TermWin.fwidth) + if (!slow && width == r->TermWin.fwidth) { if (sizeof (text_t) == sizeof (FcChar16)) XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); @@ -801,7 +877,9 @@ fonts.clear (); base_id = 0; - height = 0x7fffffff; + base_prop.height = 0x7fffffff; + base_prop.weight = rxvt_fontprop::medium; + base_prop.slant = rxvt_fontprop::roman; fallback = fallback_fonts; } @@ -896,13 +974,15 @@ if (fonts[i]->loaded) return true; - if (fonts[i]->load (height)) - return fonts[i]->loaded = true; + fonts[i]->loaded = true; - delete fonts[i]; - fonts.erase (fonts.begin () + i); + if (!fonts[i]->load (base_prop)) + { + fonts[i]->cs = CS_UNKNOWN; + return false; + } - return false; + return true; } void @@ -919,10 +999,10 @@ base_id = 1; // we currently need a base-font, no matter what - if (fonts.size () <= base_id) + if (fonts.size () <= base_id || !realize_font (base_id)) { add_fonts ("fixed"); - base_id = 1; + base_id = fonts.size () - 1; } if (fonts.size () <= base_id || !realize_font (base_id)) @@ -931,9 +1011,7 @@ exit (1); } - height = fonts[base_id]->height; - - /*add_fonts ("-efont-fixed-medium-r-normal-*-14-*-*-*-*-*-iso10646-1,"*/ + base_prop = fonts[base_id]->properties (); } int @@ -949,15 +1027,10 @@ goto next_font; if (!realize_font (i)) - { - --i; - goto next_font; - } - - //printf ("added font %s for %04lx\n", f->name, unicode); + goto next_font; } - if (f->has_codepoint (unicode)) + if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) return i; next_font: @@ -965,6 +1038,7 @@ { fonts.push_back (new_font (fallback->name, fallback->cs)); fallback++; + i = 0; } }