--- rxvt-unicode/src/rxvtfont.C 2005/02/11 05:51:14 1.66 +++ rxvt-unicode/src/rxvtfont.C 2006/01/25 00:42:21 1.85 @@ -1,7 +1,7 @@ /*--------------------------------*-C-*---------------------------------* * File: rxvtfont.C *----------------------------------------------------------------------* - * Copyright (c) 2003-2004 Marc Lehmann + * Copyright (c) 2003-2006 Marc Lehmann * - original version. * * This program is free software; you can redistribute it and/or modify @@ -16,11 +16,12 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *---------------------------------------------------------------------*/ #include "../config.h" #include "rxvt.h" +#include "rxvtlib.h" #include "rxvtutil.h" #include "rxvtfont.h" @@ -28,9 +29,6 @@ #include #include -#define DISPLAY r->display->display -#define TGC r->TermWin.gc - #define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width const struct rxvt_fallback_font { @@ -132,10 +130,10 @@ { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, #if XFT - { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"}, - { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, - { CS_UNICODE, "xft:Andale Mono:antialias=false" }, - { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, + { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, + { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, + { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, + { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, // FreeMono is usually uglier than x fonts, so try last only. { CS_UNICODE, "xft:FreeMono:autohint=true" }, @@ -154,6 +152,9 @@ #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) +#define dTermDisplay Display *disp = term->display->display +#define dTermGC GC gc = term->gc + ///////////////////////////////////////////////////////////////////////////// #if XFT @@ -174,26 +175,11 @@ ///////////////////////////////////////////////////////////////////////////// -static void *enc_buf; -static uint32_t enc_len; - -static inline void * -get_enc_buf (uint32_t len) -{ - if (len > enc_len) - { - free (enc_buf); - enc_buf = malloc (len); - enc_len = len; - } - - return enc_buf; -} - static const char * enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) { - uint8_t *buf = (uint8_t *)get_enc_buf (len); + uint8_t *buf = rxvt_temp_buf (len); + uint8_t *res = buf; while (len--) { @@ -208,13 +194,14 @@ *buf++ = c; } - return (const char *)enc_buf; + return (const char *)res; } static const XChar2b * enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) { - XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); + XChar2b *buf = rxvt_temp_buf (len); + XChar2b *res = buf; while (len--) { @@ -231,7 +218,7 @@ buf++; } - return (XChar2b *)enc_buf; + return res; } ///////////////////////////////////////////////////////////////////////////// @@ -247,17 +234,20 @@ } void -rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) +rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const { + dTermDisplay; + dTermGC; + if (color == Color_bg) - XClearArea (d.display->display, d, x, y, w, h, FALSE); + XClearArea (disp, d, x, y, w, h, FALSE); else if (color >= 0) { #if XFT - XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); + XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); #else - XSetForeground (d.display->display, TGC, r->pix_colors[color]); - XFillRectangle (d.display->display, d, TGC, x, y, w, h); + XSetForeground (disp, gc, term->pix_colors[color]); + XFillRectangle (disp, d, gc, x, y, w, h); #endif } } @@ -278,6 +268,7 @@ rxvt_fontprop p; p.width = p.height = 1; + p.ascent = rxvt_fontprop::unset; p.weight = rxvt_fontprop::medium; p.slant = rxvt_fontprop::roman; @@ -294,7 +285,7 @@ return true; } - bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) + bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const { careful = false; @@ -307,7 +298,8 @@ if (unicode <= 0x009f) return true; - if (unicode >= 0x2500 && unicode <= 0x259f) + if (unicode >= 0x2500 && unicode <= 0x259f && + !term->option (Opt_skipBuiltinGlyphs)) return true; if (IS_COMPOSE (unicode)) @@ -333,11 +325,12 @@ const text_t *text, int len, int fg, int bg) { - Display *disp = d.display->display; + dTermDisplay; + dTermGC; - clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); + clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); - XSetForeground (disp, TGC, r->pix_colors[fg]); + XSetForeground (disp, gc, term->pix_colors[fg]); while (len) { @@ -351,7 +344,7 @@ ; int width = text - tp; - int fwidth = r->TermWin.fwidth * width; + int fwidth = term->fwidth * width; if (0x2500 <= t && t <= 0x259f) { @@ -360,7 +353,7 @@ uint32_t *b = a + (offs & 15); int W = fwidth; - int H = r->TermWin.fheight; + int H = term->fheight; int x_[16]; int y_[16]; @@ -378,7 +371,7 @@ gcv.cap_style = CapButt; gcv.line_width = 0; - XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); + XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv); while (a < b) { @@ -395,7 +388,7 @@ switch (op) { case 0: // line - XDrawLine (disp, d, TGC, x1, y1, x2, y2); + XDrawLine (disp, d, gc, x1, y1, x2, y2); break; case 1: // rectangle, possibly stippled @@ -408,23 +401,23 @@ gcv.ts_x_origin = x; gcv.ts_y_origin = y; - XChangeGC (disp, TGC, + XChangeGC (disp, gc, GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); } - XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); + XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1); if (a) { XFreePixmap (disp, gcv.stipple); gcv.stipple = 0; gcv.fill_style = FillSolid; - XChangeGC (disp, TGC, GCFillStyle, &gcv); + XChangeGC (disp, gc, GCFillStyle, &gcv); } break; case 2: // arc - XDrawArc (disp, d, TGC, + XDrawArc (disp, d, gc, x1 - W/2, y1 - H/2, W-1, H-1, (a - 1) * 90*64, (b - 1) * 90*64); break; @@ -465,8 +458,8 @@ break; default: - XDrawRectangle (disp, d, TGC, x + 2, y + 2, - fwidth - 4, r->TermWin.fheight - 4); + XDrawRectangle (disp, d, gc, x + 2, y + 2, + fwidth - 4, term->fheight - 4); } x += fwidth; @@ -484,7 +477,7 @@ bool load (const rxvt_fontprop &prop); - bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); + bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; void draw (rxvt_drawable &d, int x, int y, const text_t *text, int len, @@ -506,8 +499,8 @@ { unsigned long value; - if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) - return XGetAtomName (DISPLAY, value); + if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value)) + return XGetAtomName (term->display->display, value); else return rxvt_strdup (repl); } @@ -525,6 +518,7 @@ { p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; p.height = height; + p.ascent = rxvt_fontprop::unset; p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; @@ -537,14 +531,14 @@ unsigned long height; #if 0 - if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) + if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height)) return false; #else height = f->ascent + f->descent; #endif unsigned long avgwidth; - if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) + if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth)) avgwidth = 0; char *weight = get_property (f, "WEIGHT_NAME", "medium"); @@ -555,12 +549,15 @@ free (weight); free (slant); + p.ascent = f->ascent; + return true; } bool rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) { + dTermDisplay; int slashes = 0; const char *comp[13]; @@ -578,7 +575,7 @@ && (*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); + XFontStruct *f = XLoadQueryFont (disp, name); if (f) { @@ -586,7 +583,7 @@ // (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); + XFreeFont (disp, f); return ret; } else @@ -634,7 +631,7 @@ bool rxvt_font_x11::load (const rxvt_fontprop &prop) { - Display *disp = DISPLAY; + dTermDisplay; clear (); @@ -718,6 +715,8 @@ if (replace_field (fname, list[i], 6, '0', field_str)) diff += 10; // slightly penalize scalable fonts + else if (replace_field (fname, list[i], 11, '0', "0")) + diff += 300; // more heavily penalize what looks like scaled bitmap fonts if (!set_properties (p, fname)) continue; @@ -743,7 +742,7 @@ font_weight *best = fonts + count - 1; for (font_weight *w = best; w-- > fonts; ) - if (w->diff < best->diff) + if (w->diff <= best->diff) best = w; if (!best->name @@ -851,7 +850,7 @@ int dir_ret, asc_ret, des_ret; XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); - int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; + int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; if (width < g.width) width = g.width; } @@ -880,13 +879,13 @@ { if (f) { - XFreeFont (DISPLAY, f); + XFreeFont (term->display->display, f); f = 0; } } bool -rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) +rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const { uint32_t ch = FROM_UNICODE (cs, unicode); @@ -936,7 +935,7 @@ // check character against base font bounding box int w = xcs->width; int wcw = wcwidth (unicode); - if (wcw > 0) w /= wcw; + if (wcw > 0) w = (w + wcw - 1) / wcw; careful = w > prop->width; if (careful && w > prop->width * MAX_OVERLAP >> 2) @@ -955,14 +954,17 @@ // yet we are trying to be perfect /. // but the result still isn't perfect /. + dTermDisplay; + dTermGC; + bool slow = this->slow - || width != r->TermWin.fwidth - || height != r->TermWin.fheight; + || width != term->fwidth + || height != term->fheight; - int base = ascent; // sorry, incorrect: r->TermWin.fbase; + int base = ascent; // sorry, incorrect: term->fbase; XGCValues v; - v.foreground = r->pix_colors[fg]; + v.foreground = term->pix_colors[fg]; v.font = f->fid; if (enc2b) @@ -971,30 +973,30 @@ if (bg == Color_bg && !slow) { - v.background = r->pix_colors[bg]; - XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); - XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); + v.background = term->pix_colors[bg]; + XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v); + XDrawImageString16 (disp, d, gc, x, y + base, xc, len); } else { - clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); + clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); - XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); + XChangeGC (disp, gc, GCForeground | GCFont, &v); if (slow) { do { if (xc->byte1 || xc->byte2) - XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); + XDrawString16 (disp, d, gc, x, y + base, xc, 1); - x += r->TermWin.fwidth; + x += term->fwidth; xc++; len--; } while (len); } else - XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); + XDrawString16 (disp, d, gc, x, y + base, xc, len); } } else @@ -1003,30 +1005,30 @@ if (bg == Color_bg && !slow) { - v.background = r->pix_colors[bg]; - XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); - XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); + v.background = term->pix_colors[bg]; + XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v); + XDrawImageString (disp, d, gc, x, y + base, xc, len); } else { - clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); + clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); - XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); + XChangeGC (disp, gc, GCForeground | GCFont, &v); if (slow) { do { if (*xc) - XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); + XDrawString (disp, d, gc, x, y + base, xc, 1); - x += r->TermWin.fwidth; + x += term->fwidth; xc++; len--; } while (len); } else - XDrawString (d.display->display, d, TGC, x, y + base, xc, len); + XDrawString (disp, d, gc, x, y + base, xc, len); } } } @@ -1048,7 +1050,7 @@ const text_t *text, int len, int fg, int bg); - bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); + bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; protected: XftFont *f; @@ -1059,7 +1061,7 @@ { if (f) { - XftFontClose (DISPLAY, f); + XftFontClose (term->display->display, f); f = 0; } } @@ -1073,6 +1075,7 @@ p.width = width; p.height = height; + p.ascent = ascent; p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC @@ -1086,7 +1089,7 @@ bool rxvt_font_xft::load (const rxvt_fontprop &prop) { - Display *disp = DISPLAY; + dTermDisplay; clear (); @@ -1098,7 +1101,7 @@ FcValue v; if (prop.height != rxvt_fontprop::unset - || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch + && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); @@ -1123,7 +1126,7 @@ set_name ((char *)FcNameUnparse (p)); XftResult result; - FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); + FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result); FcPatternDestroy (p); @@ -1154,6 +1157,8 @@ XftUnlockFace (f); + int glheight = height; + for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) { FcChar16 ch = *t; @@ -1171,15 +1176,29 @@ XGlyphInfo g; XftTextExtents16 (disp, f, &ch, 1, &g); + g.width -= g.x; + int wcw = wcwidth (ch); - if (wcw > 0) g.width = g.width / wcw; + if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; - if (width < g.width) width = g.width; - if (height < g.height) height = g.height; + if (width < g.width ) width = g.width; + if (height < g.height ) height = g.height; + if (glheight < g.height - g.y) glheight = g.height - g.y; + } + + if (!width) + { + rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); + + XftFontClose (disp, f); + f = 0; + + success = false; + break; } if (prop.height == rxvt_fontprop::unset - || height <= prop.height + || (height <= prop.height && glheight <= prop.height) || height <= 2 || !scalable) break; @@ -1196,9 +1215,9 @@ else ftheight = prop.height - 1; - XftFontClose (disp, f); - FcPatternDel (match, FC_PIXEL_SIZE); - FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); + XftFontClose (disp, f); + FcPatternDel (match, FC_PIXEL_SIZE); + FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); } FcPatternDestroy (match); @@ -1215,11 +1234,11 @@ } bool -rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) +rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const { careful = false; - if (!XftCharExists (DISPLAY, f, unicode)) + if (!XftCharExists (term->display->display, f, unicode)) return false; if (!prop || prop->width == rxvt_fontprop::unset) @@ -1228,11 +1247,11 @@ // check character against base font bounding box FcChar32 ch = unicode; XGlyphInfo g; - XftTextExtents32 (DISPLAY, f, &ch, 1, &g); + XftTextExtents32 (term->display->display, f, &ch, 1, &g); - int w = g.width; + int w = g.width - g.x; int wcw = wcwidth (unicode); - if (wcw > 0) w /= wcw; + if (wcw > 0) w = (w + wcw - 1) / wcw; careful = w > prop->width; if (careful && w > prop->width * MAX_OVERLAP >> 2) @@ -1246,69 +1265,50 @@ const text_t *text, int len, int fg, int bg) { - clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); - - int base = ascent; // should be fbase, but that is incorrect + clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); XGlyphInfo extents; - FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); - FcChar32 *ep = enc; - int ewidth = 0; - int xoff = 0; + XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); + XftGlyphSpec *ep = enc; + + dTermDisplay; + dTermGC; + + // cut trailing spaces + while (len && text [len - 1] == ' ') + len--; while (len) { - int cwidth = r->TermWin.fwidth; + int cwidth = term->fwidth; FcChar32 fc = *text++; len--; - FT_UInt gl; while (len && *text == NOCHAR) - text++, len--, cwidth += r->TermWin.fwidth; + text++, len--, cwidth += term->fwidth; - gl = XftCharIndex (d.display->display, f, fc); - XftGlyphExtents (d.display->display, f, &gl, 1, &extents); - - if (extents.xOff != cwidth && ep != enc) + if (fc != ' ') // skip spaces { - if (xoff > ewidth) xoff = ewidth; - XftDrawGlyphs (d, &r->pix_colors[fg].c, f, - x + (ewidth - xoff >> 1), - y + base, enc, ep - enc); - x += ewidth; + FT_UInt glyph = XftCharIndex (disp, f, fc); + XftGlyphExtents (disp, f, &glyph, 1, &extents); - ep = enc; - ewidth = 0; - xoff = 0; + ep->glyph = glyph; + ep->x = x + (cwidth - extents.xOff >> 1); + ep->y = y + ascent; + ep++; } - if (fc == ' ' && ep == enc) // skip leading spaces - { - x += cwidth; - continue; - } - - else - { - *ep++ = gl; - ewidth += cwidth; - xoff += extents.xOff; - } + x += cwidth; } if (ep != enc) - { - if (xoff > ewidth) xoff = ewidth; - XftDrawGlyphs (d, &r->pix_colors[fg].c, f, - x + (ewidth - xoff >> 1), - y + base, enc, ep - enc); - } + XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); } #endif ///////////////////////////////////////////////////////////////////////////// -rxvt_fontset::rxvt_fontset (rxvt_t r) -: r (r), fontdesc (0) +rxvt_fontset::rxvt_fontset (rxvt_term *term) +: fontdesc (0), term (term) { clear (); } @@ -1321,7 +1321,7 @@ void rxvt_fontset::clear () { - prop.width = prop.height = prop.weight = prop.slant + prop.width = prop.height = prop.ascent = prop.weight = prop.slant = rxvt_fontprop::unset; for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) @@ -1362,7 +1362,7 @@ else f = new rxvt_font_x11; - f->set_term (r); + f->set_term (term); f->set_name (strdup (name)); f->cs = cs; @@ -1383,7 +1383,8 @@ do { - while (*desc <= ' ') desc++; + while (*desc && *desc <= ' ') + desc++; codeset cs = CS_UNICODE; @@ -1503,6 +1504,9 @@ if (!realize_font (i)) goto next_font; + + if (prop.ascent != rxvt_fontprop::unset) + max_it (f->ascent, prop.ascent); } if (f->cs == CS_UNKNOWN) @@ -1551,7 +1555,7 @@ //FcPatternAddBool (p, FC_ANTIALIAS, 1); XftResult result; - FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); + FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result); FcPatternDestroy (p);