--- rxvt-unicode/src/defaultfont.C 2003/12/17 22:29:03 1.6 +++ rxvt-unicode/src/defaultfont.C 2004/02/13 12:16:21 1.18 @@ -23,7 +23,9 @@ #include "rxvt.h" #include "defaultfont.h" -#define DISPLAY r->Xdisplay +#include + +#define DISPLAY r->display->display #define DRAWABLE r->TermWin.vt #define GC r->TermWin.gc @@ -59,38 +61,40 @@ #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-*-gb2312*-0" }, + { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, + { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, + { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, + { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, + { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" }, + { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, + { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, + { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-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 } }; @@ -101,7 +105,7 @@ static uint32_t enc_len; static inline void * -get_enc_buf (int len) +get_enc_buf (uint32_t len) { if (len > enc_len) { @@ -113,7 +117,7 @@ } static const char * -enc_char (const text_t *text, int len, codeset cs, bool &zero) +enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) { uint8_t *buf = (uint8_t *)get_enc_buf (len); @@ -134,7 +138,7 @@ } static const XChar2b * -enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) +enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) { XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); @@ -222,7 +226,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; @@ -324,7 +339,9 @@ void clear (); - bool load (int maxheight); + rxvt_fontprop properties (); + + bool load (const rxvt_fontprop &prop); bool has_codepoint (uint32_t unicode); @@ -336,11 +353,14 @@ 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; + bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); + bool set_properties (rxvt_fontprop &p, XFontStruct *f); + bool set_properties (rxvt_fontprop &p, const char *name); }; 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; @@ -350,42 +370,155 @@ return repl; } +rxvt_fontprop +rxvt_font_x11::properties () +{ + rxvt_fontprop p; + set_properties (p, f); + return p; +} + +bool +rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) +{ + p.width = avgwidth ? (avgwidth + 1) / 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 true; +} + bool -rxvt_font_x11::load (int maxheight) +rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) +{ + const char *weight = get_property (f, "WEIGHT_NAME", "medium"); + const char *slant = get_property (f, "SLANT", "r"); + + unsigned long height; + if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) + return false; + + unsigned long avgwidth; + if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) + avgwidth = 0; + + return set_properties (p, height, weight, slant, avgwidth); +} + +bool +rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) +{ + int slashes = 0; + const char *comp[12]; + + for (const char *c = name; *c; c++) + if (*c == '-') + { + comp[slashes++] = c + 1; + if (slashes >= 13) + break; + } + + /* can we short-circuit the costly XLoadQueryFont? */ + if (slashes >= 13 + && (*comp[ 6] >= '1' && *comp[ 6] <= '9') + && (*comp[11] >= '0' && *comp[11] <= '9')) + return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); + + XFontStruct *f = XLoadQueryFont (DISPLAY, name); + + if (f) + { + // the font should really exists now. if not, we have a problem + // (e.g. if the user did xset fp rehash just when we were searching fonts). + // in that case, just return garbage. + bool ret = set_properties (p, f); + XFreeFont (DISPLAY, f); + return ret; + } + else + return false; +} + +// fix the size of scalable fonts +static void +fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop) +{ + int slashes = 0; + const char *size; + + for (const char *c = name; *c; c++) + if (*c == '-') + { + if (slashes == 6) + size = c + 1; + + if (++slashes >= 13) + break; + } + + if (slashes >= 13 && size[0] == '0') + { + strncpy (buf, name, size - name); + buf += size - name; + buf += sprintf (buf, "%d", prop.height); + strcpy (buf, size + 1); + } + else + strcpy (buf, name); +} + +bool +rxvt_font_x11::load (const rxvt_fontprop &prop) { clear (); char **list; int count; - XFontStruct *info; - list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info); + list = XListFonts (DISPLAY, name, 512, &count); + set_name (0); if (!list) return false; - XFontStruct *best = 0; + int bestdiff = 0x7fffffff; for (int i = 0; i < count; i++) { - XFontStruct *f = info + i; - if (f->ascent + f->descent <= maxheight) // weed out too large fonts - if (!best // compare against best found so far - || best->ascent + best->descent < f->ascent + f->descent) - best = f; + rxvt_fontprop p; + char fname[1024]; + fix_scalable (fname, list[i], prop); + + if (!set_properties (p, fname)) + continue; + + if (p.height > prop.height) // weed out too large fonts + continue; + + int diff = (prop.height - p.height) * 32 + + abs (prop.weight - p.weight) + + abs (prop.slant - p.slant ); + + if (!name // compare against best found so far + || diff < bestdiff) + { + set_name (strdup (fname)); + bestdiff = diff; + } } - set_name (strdup (list[best - info])); + XFreeFontNames (list); - XFreeFontInfo (list, info, count); + if (!name) + return false; f = XLoadQueryFont (DISPLAY, name); if (!f) return false; - 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) { @@ -396,7 +529,7 @@ } else { - const char *charset = get_property ("FONT", 0); + const char *charset = get_property (f, "FONT", 0); if (!charset) charset = name; @@ -419,7 +552,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; @@ -427,7 +560,7 @@ width = f->max_bounds.width; else { - prop = true; + slow = true; int N = f->max_char_or_byte2 - f->min_char_or_byte2; @@ -479,8 +612,8 @@ if (encm) { - int byte1 = ch >> 8; - int byte2 = ch & 255; + unsigned char byte1 = ch >> 8; + unsigned char byte2 = ch & 255; if (byte1 < f->min_byte1 || byte1 > f->max_byte1 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) @@ -522,7 +655,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; @@ -607,37 +740,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, @@ -648,14 +757,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 @@ -672,15 +773,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++) @@ -689,14 +801,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; @@ -708,27 +852,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); @@ -736,18 +881,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) { @@ -760,17 +893,14 @@ int fg, int bg) { if (!d) - { - dR; - d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP); - } + d = XftDrawCreate (DISPLAY, DRAWABLE, r->display->visual, r->display->cmap); if (bg >= 0 && bg != Color_bg) XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); 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 && 0) { if (sizeof (text_t) == sizeof (FcChar16)) XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); @@ -783,10 +913,24 @@ { if (*text != NOCHAR && *text != ' ') { + int fwidth = r->TermWin.fwidth; + if (len >= 2 && text[1] == NOCHAR) + fwidth *= 2; + + XGlyphInfo extents; if (sizeof (text_t) == sizeof (FcChar16)) - XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1); + { + XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); + XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, + y + r->TermWin.fbase, (const FcChar16 *)text, 1); + } else - XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1); + { + XGlyphInfo extents; + XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); + XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, + y + r->TermWin.fbase, (const FcChar32 *)text, 1); + } } x += r->TermWin.fwidth; @@ -800,9 +944,7 @@ ///////////////////////////////////////////////////////////////////////////// rxvt_fontset::rxvt_fontset (rxvt_t r) -#ifdef EXPLICIT_CONTEXT -: r(r) -#endif +: r (r) { clear (); } @@ -815,12 +957,14 @@ void rxvt_fontset::clear () { - for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) + for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) FONT_UNREF (*i); 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; } @@ -877,7 +1021,7 @@ { fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); - const char *extra = desc++; + //const char *extra = desc++; // not yet used desc = strchr (desc, ']'); @@ -917,7 +1061,7 @@ fonts[i]->loaded = true; - if (!fonts[i]->load (height)) + if (!fonts[i]->load (base_prop)) { fonts[i]->cs = CS_UNKNOWN; return false; @@ -940,27 +1084,26 @@ base_id = 1; // we currently need a base-font, no matter what - if (fonts.size () <= base_id) + if ((int)fonts.size () <= base_id || !realize_font (base_id)) { + puts ("unable to load specified font (s), falling back to 'fixed'\n"); add_fonts ("fixed"); - base_id = 1; + base_id = fonts.size () - 1; } - if (fonts.size () <= base_id || !realize_font (base_id)) + if ((int)fonts.size () <= base_id || !realize_font (base_id)) { fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); exit (1); } - height = fonts[base_id]->height; - - /*add_fonts ("-efont-fixed-medium-r-normal-*-14-*-*-*-*-*-iso10646-1,"*/ + base_prop = fonts[base_id]->properties (); } int rxvt_fontset::find_font (uint32_t unicode) { - for (int i = 0; i < fonts.size (); i++) + for (unsigned int i = 0; i < fonts.size (); i++) { rxvt_font *f = fonts[i];