--- rxvt-unicode/src/rxvtfont.C 2004/08/15 00:37:04 1.1 +++ rxvt-unicode/src/rxvtfont.C 2006/10/03 10:28:25 1.104 @@ -1,7 +1,7 @@ -/*--------------------------------*-C-*---------------------------------* - * File: defaultfont.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,17 +16,27 @@ * * 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" #include -#define DISPLAY r->display->display -#define TGC r->TermWin.gc +#include + +#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width +#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts + +#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ + (prop)->slant >= rxvt_fontprop::italic \ + ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ + : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ + )) const struct rxvt_fallback_font { codeset cs; @@ -54,13 +64,28 @@ { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, + +# if XFT + { CS_KOI8_U, "xft::lang=ru" }, + + { CS_ISO8859_5, "xft::lang=ru" }, + { CS_ISO8859_6, "xft::lang=ar" }, + { CS_ISO8859_7, "xft::lang=el" }, + { CS_ISO8859_8, "xft::lang=he" }, + { CS_ISO8859_9, "xft::lang=tr" }, + { CS_ISO8859_10, "xft::lang=se" }, + { CS_ISO8859_11, "xft::lang=th" }, +# endif #endif // japanese #if ENCODING_JP || ENCODING_JP_EXT # if XFT // prefer xft for complex scripts - { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, + { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, + { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, + { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, + { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, # endif { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, @@ -70,16 +95,22 @@ { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, #endif -#if ENCODING_CN || ENCODING_CN_EXT +#if ENCODING_ZH || ENCODING_ZH_EXT # if XFT + { CS_GBK_0, "xft:AR PL KaitiM GB" }, + { CS_GBK_0, "xft:AR PL SungtiL GB" }, + { CS_GBK_0, "xft::lang=zh" }, { 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_GB2312_1980_0, "xft::lang=zh" }, # endif + { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, + { CS_GB2312_1980_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, @@ -91,62 +122,54 @@ { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, #endif -#if XFT - { CS_UNICODE, "xft:Andale Mono" }, - { CS_UNICODE, "xft:Arial Unicode MS" }, +#if ENCODING_KR + { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, + { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, +# if XFT + { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, + { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, +# endif #endif + { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, - { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, - { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, - { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, + //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. #if XFT - // FreeMono is usually uglier than x fonts, so try last only. - //{ CS_UNICODE, "xft:FreeMono" }, + { 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 after the others + { CS_UNICODE, "xft:FreeMono:autohint=true" }, #endif + // generic font fallback, put this last, as many iso10646 fonts have extents + // specified for all glyphs in the range they cover, but most are simply empty + //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, + //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, { CS_UNKNOWN, 0 } }; -///////////////////////////////////////////////////////////////////////////// - -#if XFT -rxvt_drawable::~rxvt_drawable () -{ - if (xftdrawable) - XftDrawDestroy (xftdrawable); -} +// these characters are used to guess the font height and width +// pango uses a similar algorithm and doesn't trust the font either. +static uint16_t extent_test_chars[] = { + '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', + 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ + 0x304c, 0x672c, // が本 +}; -rxvt_drawable::operator XftDraw *() -{ - if (!xftdrawable) - xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); +#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) - return xftdrawable; -} -#endif +#define dTermDisplay Display *disp = term->dpy +#define dTermGC GC gc = term->gc ///////////////////////////////////////////////////////////////////////////// -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--) { @@ -161,13 +184,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--) { @@ -184,54 +208,84 @@ buf++; } - return (XChar2b *)enc_buf; + return res; } ///////////////////////////////////////////////////////////////////////////// +rxvt_font::rxvt_font () +: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) +{ +} + void -rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) +rxvt_font::set_name (char *name) { - if (color == Color_bg) - XClearArea (d.display->display, d, x, y, w, h, FALSE); - else if (color >= 0) + if (this->name == name) + return; + + if (this->name) free (this->name); // let the compiler optimize + this->name = name; +} + +void +rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const +{ + dTermDisplay; + dTermGC; + + if (color < 0 || color == Color_bg) + XClearArea (disp, d, x, y, w, h, false); + else { #if XFT - XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); + XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); #else - XSetForeground (d.display->display, TGC, r->PixColors[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 } } +///////////////////////////////////////////////////////////////////////////// + #include "table/linedraw.h" struct rxvt_font_default : rxvt_font { + struct rxvt_fontset *fs; + + rxvt_font_default (rxvt_fontset *fs) + : rxvt_font () + { + this->fs = fs; + } rxvt_fontprop properties () { rxvt_fontprop p; p.width = p.height = 1; + p.ascent = rxvt_fontprop::unset; p.weight = rxvt_fontprop::medium; p.slant = rxvt_fontprop::roman; return p; } - bool load (const rxvt_fontprop &prop) + bool load (const rxvt_fontprop &prop, bool force_prop) { width = 1; height = 1; ascent = 1; descent = 0; - set_name (strdup ("built-in pseudofont")); + set_name (strdup ("built-in support font")); return true; } - bool has_codepoint (unicode_t unicode) + bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const { + careful = false; + if (unicode <= 0x001f) return true; @@ -241,7 +295,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)) @@ -250,6 +305,7 @@ switch (unicode) { case ZERO_WIDTH_CHAR: + case NOCHAR: return true; } @@ -266,16 +322,26 @@ const text_t *text, int len, int fg, int bg) { - clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); + dTermDisplay; + dTermGC; - XSetForeground (d.display->display, TGC, r->PixColors[fg]); + clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); - while (len--) + XSetForeground (disp, gc, term->pix_colors[fg]); + + while (len) { #if ENABLE_COMBINING compose_char *cc; #endif - text_t t = *text++; + const text_t *tp = text; + text_t t = *tp; + + while (++text, --len && *text == NOCHAR) + ; + + int width = text - tp; + int fwidth = term->fwidth * width; if (0x2500 <= t && t <= 0x259f) { @@ -283,8 +349,8 @@ uint32_t *a = linedraw_command + (offs >> 4); uint32_t *b = a + (offs & 15); - int W = r->TermWin.fwidth; - int H = r->TermWin.fheight; + int W = fwidth; + int H = term->fheight; int x_[16]; int y_[16]; @@ -302,7 +368,7 @@ gcv.cap_style = CapButt; gcv.line_width = 0; - XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); + XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv); while (a < b) { @@ -319,7 +385,7 @@ switch (op) { case 0: // line - XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); + XDrawLine (disp, d, gc, x1, y1, x2, y2); break; case 1: // rectangle, possibly stippled @@ -328,27 +394,27 @@ static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; gcv.fill_style = FillStippled; - gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); + gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); gcv.ts_x_origin = x; gcv.ts_y_origin = y; - XChangeGC (d.display->display, TGC, + XChangeGC (disp, gc, GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); } - XFillRectangle (d.display->display, 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 (d.display->display, gcv.stipple); + XFreePixmap (disp, gcv.stipple); gcv.stipple = 0; gcv.fill_style = FillSolid; - XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); + XChangeGC (disp, gc, GCFillStyle, &gcv); } break; case 2: // arc - XDrawArc (d.display->display, 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; @@ -358,40 +424,43 @@ #if ENABLE_COMBINING else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) { + min_it (width, 2); // we only support wcwidth up to 2 + + text_t chrs[2]; + chrs [1] = NOCHAR; + + *chrs = cc->c1; rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; - f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); + f1->draw (d, x, y, chrs, width, fg, bg); + if (cc->c2 != NOCHAR) { + bool careful; + // prefer font of first character, for no good reasons - rxvt_font *f2 = f1->has_codepoint (cc->c2) - ? f1 - : (*fs)[fs->find_font (cc->c2)]; + *chrs = cc->c2; + rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) + ? f1 + : (*fs)[fs->find_font (cc->c2)]; - f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); + f2->draw (d, x, y, chrs, width, fg, -1); } } #endif else switch (t) { + case '\t': case ZERO_WIDTH_CHAR: + case NOCHAR: break; default: - int w = 0; - while (len > 0 && *text == NOCHAR) - { - ++text; - --len; - w += r->TermWin.fwidth; - } - - XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, - w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); - x += w; + XDrawRectangle (disp, d, gc, x + 2, y + 2, + fwidth - 4, term->fheight - 4); } - x += r->TermWin.fwidth; + x += fwidth; } } @@ -404,31 +473,31 @@ rxvt_fontprop properties (); - bool load (const rxvt_fontprop &prop); + bool load (const rxvt_fontprop &prop, bool force_prop); - bool has_codepoint (unicode_t unicode); + 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, int fg, int bg); + bool slow; // wether this is a proportional font or has other funny characteristics XFontStruct *f; - codeset cs; bool enc2b, encm; - char *get_property (XFontStruct *f, const char *property, const char *repl) const; + char *get_property (XFontStruct *f, Atom 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); }; char * -rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const +rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const { unsigned long value; - if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) - return XGetAtomName (DISPLAY, value); + if (XGetFontProperty (f, property, &value)) + return XGetAtomName (term->dpy, value); else return rxvt_strdup (repl); } @@ -444,8 +513,11 @@ 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.width = width != rxvt_fontprop::unset ? 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; @@ -456,27 +528,35 @@ rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) { unsigned long height; - if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) + +#if 0 + if (!XGetFontProperty (f, XInternAtom (term->dpy, "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, term->xa [XA_AVERAGE_WIDTH], &avgwidth)) avgwidth = 0; - char *weight = get_property (f, "WEIGHT_NAME", "medium"); - char *slant = get_property (f, "SLANT", "r"); + char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium"); + char *slant = get_property (f, term->xa [XA_SLANT], "r"); set_properties (p, height, weight, slant, avgwidth); 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]; @@ -494,7 +574,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) { @@ -502,7 +582,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 @@ -510,83 +590,185 @@ } // fix the size of scalable fonts -static void -fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop) +static bool +replace_field (char *buf, const char *name, int index, const char old, const char *replace) { int slashes = 0; - const char *size; + const char *field, *end; for (const char *c = name; *c; c++) if (*c == '-') { - if (slashes == 6) - size = c + 1; + if (slashes == index) + field = c + 1; + + if (slashes == index + 1) + end = c; if (++slashes >= 13) break; } - if (slashes >= 13 && size[0] == '0') + if (slashes >= 13 && (!old || *field == old)) { - strncpy (buf, name, size - name); - buf += size - name; - buf += sprintf (buf, "%d", prop.height); - strcpy (buf, size + 1); + // TODO: check for overflow in font-name + strncpy (buf, name, field - name); + buf += field - name; + strcpy (buf, replace); + strcat (buf, end); + + return true; } else - strcpy (buf, name); + { + strcpy (buf, name); + + return false; + } } bool -rxvt_font_x11::load (const rxvt_fontprop &prop) +rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop) { + dTermDisplay; + clear (); + char field_str[64]; // enough for 128 bits + + // first morph the font if required + if (force_prop) + { + char fname[1024]; + + if (name[0] != '-') + { + f = XLoadQueryFont (disp, name); + + if (!f) + return false; + + char *new_name = get_property (f, XA_FONT, name); + + if (new_name) + set_name (new_name); + else + rxvt_warn ("font '%s' has no FONT property, continuing without.", name); + + XFreeFont (disp, f); + f = 0; + } + + if (prop.weight != rxvt_fontprop::unset) + { + replace_field (fname, name, 2, 0, + prop.weight < rxvt_fontprop::bold + ? "medium" : "bold"); + set_name (strdup (fname)); + } + + if (prop.slant != rxvt_fontprop::unset) + { + replace_field (fname, name, 3, 0, + prop.slant < rxvt_fontprop::italic + ? "r" : "i"); // TODO: handle "o"blique, too + set_name (strdup (fname)); + } + } + + sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset + ? 0 : prop.height); + + struct font_weight { + char *name; + int diff; + + void clear () + { + name = 0; + diff = 0x7fffffff; + } + + font_weight () { clear (); } + ~font_weight () { free (name); } + }; + char **list; int count; - list = XListFonts (DISPLAY, name, 1024, &count); + list = XListFonts (disp, name, 4000, &count); + set_name (0); if (!list) return false; - int bestdiff = 0x7fffffff; + font_weight *fonts = new font_weight[count]; + for (int i = 0; i < count; i++) { rxvt_fontprop p; char fname[1024]; - fix_scalable (fname, list[i], prop); + + int diff = 0; + + 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; - if (p.height > prop.height) // weed out too large fonts + if (prop.height != rxvt_fontprop::unset + && 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 (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; + if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); + if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); + //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); - if (!name // compare against best found so far - || diff < bestdiff) - { - set_name (strdup (fname)); - bestdiff = diff; - } + fonts[i].name = strdup (fname); + fonts[i].diff = diff; } XFreeFontNames (list); - if (!name) - return false; + // this loop only iterates when the guessed font-size is too small + for (;;) + { + font_weight *best = fonts + count - 1; - f = XLoadQueryFont (DISPLAY, name); + for (font_weight *w = best; w-- > fonts; ) + if (w->diff <= best->diff) + best = w; + + if (!best->name + || !(f = XLoadQueryFont (disp, best->name))) + break; + + set_name (best->name); + best->clear (); + + ascent = f->ascent; + descent = f->descent; + height = ascent + descent; + + if (prop.height == rxvt_fontprop::unset + || height <= prop.height) + break; // font is ready for use + + // PIXEL_SIZE small enough, but real height too large + clear (); + } + + delete [] fonts; if (!f) return false; - char *registry = get_property (f, "CHARSET_REGISTRY", 0); - char *encoding = get_property (f, "CHARSET_ENCODING", 0); + char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); + char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); if (registry && encoding) { @@ -597,7 +779,7 @@ } else { - const char *charset = get_property (f, "FONT", 0); + const char *charset = get_property (f, XA_FONT, 0); if (!charset) charset = name; @@ -619,15 +801,10 @@ encm = f->min_byte1 != 0 || f->max_byte1 != 0; enc2b = encm || f->max_char_or_byte2 > 255; - ascent = f->ascent; - descent = f->descent; - height = ascent + descent; - slow = false; - if (f->min_bounds.width == f->max_bounds.width) - width = f->min_bounds.width; - else if (f->per_char == NULL) +#if 1 // only used for slow detection, TODO optimize + if (f->min_bounds.width == f->max_bounds.width || !f->per_char) width = f->max_bounds.width; else { @@ -647,15 +824,47 @@ --N; } } +#endif + + width = 1; + + for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) + { + if (FROM_UNICODE (cs, *t) == NOCHAR) + continue; + + // ignore characters we wouldn't use anyways + bool careful; + if (!has_char (*t, &prop, careful)) + continue; + + XChar2b ch = { *t >> 8, *t }; + + XCharStruct g; + 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 - 1) / wcw; + + if (width < g.width) width = g.width; + } if (cs == CS_UNKNOWN) { fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); clear (); + return false; + } +#if 0 // do it per-character + if (prop && width > prop->width) + { + clear (); return false; } +#endif return true; } @@ -665,13 +874,13 @@ { if (f) { - XFreeFont (DISPLAY, f); + XFreeFont (term->dpy, f); f = 0; } } bool -rxvt_font_x11::has_codepoint (unicode_t unicode) +rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const { uint32_t ch = FROM_UNICODE (cs, unicode); @@ -690,29 +899,43 @@ || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) return false; - if (!f->per_char) - return true; - - int D = f->max_char_or_byte2 - f->min_char_or_byte2 + 1; - int N = (byte1 - f->min_byte1) * D + byte2 - f->min_char_or_byte2; + if (f->per_char) + { + int D = f->max_char_or_byte2 - f->min_char_or_byte2 + 1; + int N = (byte1 - f->min_byte1) * D + byte2 - f->min_char_or_byte2; - xcs = f->per_char + N; + xcs = f->per_char + N; + } + else + xcs = &f->max_bounds; } else { if (ch < f->min_char_or_byte2 || ch > f->max_char_or_byte2) return false; - if (!f->per_char) - return true; - - xcs = f->per_char + (ch - f->min_char_or_byte2); + if (f->per_char) + xcs = f->per_char + (ch - f->min_char_or_byte2); + else + xcs = &f->max_bounds; } if (xcs->lbearing == 0 && xcs->rbearing == 0 && xcs->width == 0 && xcs->ascent == 0 && xcs->descent == 0) return false; + if (!prop || prop->width == rxvt_fontprop::unset) + return true; + + // check wether character overlaps previous/next character + int w = xcs->rbearing - xcs->lbearing; + int wcw = max (WCWIDTH (unicode), 1); + + careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; + + if (careful && !OVERLAP_OK (w, wcw, prop)) + return false; + return true; } @@ -726,14 +949,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 = r->TermWin.fbase; + int base = ascent; // sorry, incorrect: term->fbase; XGCValues v; - v.foreground = r->PixColors[fg]; + v.foreground = term->pix_colors[fg]; v.font = f->fid; if (enc2b) @@ -742,30 +968,30 @@ if (bg == Color_bg && !slow) { - v.background = r->PixColors[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 @@ -774,30 +1000,30 @@ if (bg == Color_bg && !slow) { - v.background = r->PixColors[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); } } } @@ -805,11 +1031,6 @@ ///////////////////////////////////////////////////////////////////////////// #if XFT -#if 0 -#define UNIBITS 21 -//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables -#define SWATHBITS 8 -#endif struct rxvt_font_xft : rxvt_font { rxvt_font_xft () { f = 0; } @@ -818,13 +1039,13 @@ rxvt_fontprop properties (); - bool load (const rxvt_fontprop &prop); + bool load (const rxvt_fontprop &prop, bool force_prop); void draw (rxvt_drawable &d, int x, int y, const text_t *text, int len, int fg, int bg); - bool has_codepoint (unicode_t unicode); + bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; protected: XftFont *f; @@ -835,7 +1056,7 @@ { if (f) { - XftFontClose (DISPLAY, f); + XftFontClose (term->dpy, f); f = 0; } } @@ -849,6 +1070,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 @@ -860,12 +1082,9 @@ } bool -rxvt_font_xft::load (const rxvt_fontprop &prop) +rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop) { -#if 0 - for (int i = 0; i < SWATHCOUNT; i++) - cvr[i] = 0; -#endif + dTermDisplay; clear (); @@ -876,63 +1095,107 @@ FcValue v; - if (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch) + if (prop.height != rxvt_fontprop::unset + && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch + && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); - if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) + if (prop.weight != rxvt_fontprop::unset + && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)) FcPatternAddInteger (p, FC_WEIGHT, prop.weight); - if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) + if (prop.slant != rxvt_fontprop::unset + && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)) FcPatternAddInteger (p, FC_SLANT, prop.slant); - if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) - FcPatternAddBool (p, FC_MINSPACE, 1); - #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); + FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); #endif + if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) + FcPatternAddBool (p, FC_MINSPACE, 1); + + // store generated name so iso14755 view gives better results + set_name ((char *)FcNameUnparse (p)); + XftResult result; - FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); + FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result); FcPatternDestroy (p); if (!match) return false; - f = XftFontOpenPattern (DISPLAY, match); + int ftheight = 0; + bool success = true; - if (!f) + for (;;) { - FcPatternDestroy (match); - return false; - } + f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); - FT_Face face = XftLockFace (f); + if (!f) + { + success = false; + break; + } - slow = !FT_IS_FIXED_WIDTH (face); + FT_Face face = XftLockFace (f); - int ftheight = 0; + ascent = (face->size->metrics.ascender + 63) >> 6; + descent = (-face->size->metrics.descender + 63) >> 6; + height = max (ascent + descent, (face->size->metrics.height + 63) >> 6); + width = 0; - for (;;) - { - XGlyphInfo g1, g2; - FcChar8 c; + bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; - c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1); - c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2); + XftUnlockFace (f); - if (g1.xOff != g2.xOff) // don't simply trust the font - slow = true; + int glheight = height; - width = g2.xOff; - ascent = (face->size->metrics.ascender + 63) >> 6; - descent = (-face->size->metrics.descender + 63) >> 6; - height = ascent + descent; + for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) + { + FcChar16 ch = *t; + + if (cs != CS_UNICODE + && ch > 0x100 + && FROM_UNICODE (cs, ch) == NOCHAR) + continue; + + // ignore characters we wouldn't use anyways + bool careful; + if (!has_char (*t, &prop, careful)) + continue; + + XGlyphInfo g; + XftTextExtents16 (disp, f, &ch, 1, &g); + + g.width -= g.x; + + int wcw = WCWIDTH (ch); + 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 (glheight < g.height - g.y) glheight = g.height - g.y; + } - if (height <= prop.height || !prop.height) + 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 && glheight <= prop.height) + || height <= 2 + || !scalable) break; if (ftheight) @@ -942,21 +1205,58 @@ if (height > prop.height + 2) ftheight++; if (height > prop.height + 3) ftheight++; - FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height); + ftheight -= height - prop.height; } else - FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height); + ftheight = prop.height - 1; + + XftFontClose (disp, f); + FcPatternDel (match, FC_PIXEL_SIZE); + FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); } - XftUnlockFace (f); + FcPatternDestroy (match); - return true; +#if 0 // do it per-character + if (prop.width != rxvt_fontprop::unset && width > prop.width) + { + clear (); + success = false; + } +#endif + + return success; } bool -rxvt_font_xft::has_codepoint (unicode_t unicode) +rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const { - return XftCharExists (DISPLAY, f, unicode); + careful = false; + + if (!XftCharExists (term->dpy, f, unicode)) + return false; + + if (!prop || prop->width == rxvt_fontprop::unset) + return true; + + // check character against base font bounding box + FcChar32 ch = unicode; + XGlyphInfo g; + XftTextExtents32 (term->dpy, f, &ch, 1, &g); + + int w = g.width - g.x; + int wcw = max (WCWIDTH (unicode), 1); + + careful = g.x > 0 || w > prop->width * wcw; + + if (careful && !OVERLAP_OK (w, wcw, prop)) + return false; + + // this weeds out _totally_ broken fonts, or glyphs + if (!OVERLAP_OK (g.xOff, wcw, prop)) + return false; + + return true; } void @@ -964,53 +1264,113 @@ const text_t *text, int len, int fg, int bg) { - clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); + XGlyphInfo extents; + XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); + XftGlyphSpec *ep = enc; + + dTermDisplay; + dTermGC; + + int w = term->fwidth * len; + int h = term->fheight; + + bool buffered = bg >= 0 // we don't use a transparent bg +#ifndef FORCE_UNBUFFERED_XFT +# if defined(XPM_BACKGROUND) || defined(TRANSPARENT) + || !term->am_transparent // we aren't transparent + || term->am_pixmap_trans // we have a pixmap +# endif +#endif + ; - if (!slow && width == r->TermWin.fwidth && 0) + // cut trailing spaces + while (len && text [len - 1] == ' ') + len--; + + int x_ = buffered ? 0 : x; + int y_ = buffered ? 0 : y; + + while (len) { - if (sizeof (text_t) == sizeof (FcChar16)) - XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); - else - XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); + int cwidth = term->fwidth; + FcChar32 fc = *text++; len--; + + while (len && *text == NOCHAR) + text++, len--, cwidth += term->fwidth; + + if (fc != ' ') // skip spaces + { + FT_UInt glyph = XftCharIndex (disp, f, fc); + XftGlyphExtents (disp, f, &glyph, 1, &extents); + + ep->glyph = glyph; + ep->x = x_ + (cwidth - extents.xOff >> 1); + ep->y = y_ + ascent; + + if (extents.xOff == 0) + ep->x = x_ + cwidth; + + ep++; + } + + x_ += cwidth; } - else + + if (buffered) { - while (len) + if (ep != enc) { - if (*text != NOCHAR && *text != ' ') + rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); + + if (0) + ; +#ifdef TRANSPARENT + else if (bg < 0 && term->am_pixmap_trans) + XCopyArea (disp, term->pixmap, d2, gc, + x + term->window_vt_x, y + term->window_vt_y, + w, h, 0, 0); +#endif +#ifdef XPM_BACKGROUND + else if (bg < 0 && term->bgPixmap.pixmap) { - int fwidth = r->TermWin.fwidth; - if (len >= 2 && text[1] == NOCHAR) - fwidth *= 2; + XGCValues gcv; - XGlyphInfo extents; - if (sizeof (text_t) == sizeof (FcChar16)) - { - XftTextExtents16 (d.display->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 - { - XGlyphInfo extents; - XftTextExtents32 (d.display->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); - } + gcv.fill_style = FillTiled; + gcv.tile = term->pixmap; + gcv.ts_x_origin = -x; + gcv.ts_y_origin = -y; + + GC gc2 = XCreateGC (disp, d2, + GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, + &gcv); + + XFillRectangle (disp, d2, gc2, 0, 0, w, h); + + XFreeGC (disp, gc2); } +#endif + else + XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); - x += r->TermWin.fwidth; - text++; - len--; + XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); + XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); } + else + clear_rect (d, x, y, w, h, bg); + } + else + { + clear_rect (d, x, y, w, h, bg); + 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 (); } @@ -1023,16 +1383,19 @@ void rxvt_fontset::clear () { + prop.width = prop.height = prop.ascent = prop.weight = prop.slant + = rxvt_fontprop::unset; + force_prop = false; + for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) FONT_UNREF (*i); + for (pagemap **p = fmap.begin (); p != fmap.end (); p++) + delete *p; + free (fontdesc); fontdesc = 0; fonts.clear (); - base_id = 0; - base_prop.height = 0x7fffffff; - base_prop.weight = rxvt_fontprop::medium; - base_prop.slant = rxvt_fontprop::roman; fallback = fallback_fonts; } @@ -1045,13 +1408,13 @@ if (!name || !*name) { name = ""; - f = new rxvt_font_default; + f = new rxvt_font_default (this); } #if XFT else if (!strncmp (name, "xft:", 4)) { name += 4; - f = new rxvt_font_xft; + f = new rxvt_font_xft (); } #endif else if (!strncmp (name, "x:", 2)) @@ -1062,8 +1425,7 @@ else f = new rxvt_font_x11; - f->fs = this; - f->set_term (r); + f->set_term (term); f->set_name (strdup (name)); f->cs = cs; @@ -1084,22 +1446,32 @@ do { - while (*desc <= ' ') desc++; + while (*desc && *desc <= ' ') + desc++; + + codeset cs = CS_UNICODE; if (*desc == '[') { - fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); - - //const char *extra = desc++; // not yet used + char spec[256]; + const char *extra = ++desc; // not yet used desc = strchr (desc, ']'); if (!desc) { - fprintf (stderr, "ERROR: opening '[' without closing ']' in font specification.\n"); + rxvt_warn ("ERROR: opening '[' without closing ']' in font specification, trying to continue.\n"); break; } + memcpy (spec, extra, min (desc - extra, 255)); + spec[min (desc - extra, 255)] = 0; + + if (!strncmp (extra, "codeset=", sizeof ("codeset=") - 1)) + cs = codeset_from_name (spec + sizeof ("codeset=") - 1); + else + rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); + desc++; while (*desc <= ' ') desc++; } @@ -1113,8 +1485,10 @@ strncpy (buf, desc, end - desc); buf[end - desc] = 0; - fonts.push_back (new_font (buf, CS_UNICODE)); + fonts.push_back (new_font (buf, cs)); } + else + rxvt_warn ("fontset element too long (>511 bytes), ignored."); desc = end + 1; } @@ -1125,12 +1499,15 @@ bool rxvt_fontset::realize_font (int i) { + if (i < 0 || i >= fonts.size ()) + return false; + if (fonts[i]->loaded) return true; fonts[i]->loaded = true; - if (!fonts[i]->load (base_prop)) + if (!fonts[i]->load (prop, force_prop)) { fonts[i]->cs = CS_UNKNOWN; return false; @@ -1151,22 +1528,6 @@ add_fonts (desc); - if (!base_id) - base_id = 1; - - // we currently need a base-font, no matter what - 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 = fonts.size () - 1; - } - - if ((int)fonts.size () <= base_id || !realize_font (base_id)) - return false; - - base_prop = fonts[base_id]->properties (); - return true; } @@ -1181,12 +1542,21 @@ } int -rxvt_fontset::find_font (unicode_t unicode, bool bold) +rxvt_fontset::find_font (unicode_t unicode) { + if (unicode >= 1<<20) + return 0; + + unicode_t hi = unicode >> 8; + + if (hi < fmap.size () + && fmap[hi] + && (*fmap[hi])[unicode & 0xff] != 0xff) + return (*fmap[hi])[unicode & 0xff]; + + unsigned int i; - for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii - i < fonts.size (); - i++) + for (i = 0; i < fonts.size (); i++) { rxvt_font *f = fonts[i]; @@ -1197,16 +1567,22 @@ if (!realize_font (i)) goto next_font; + + if (prop.ascent != rxvt_fontprop::unset) + max_it (f->ascent, prop.ascent); } if (f->cs == CS_UNKNOWN) goto next_font; - if (bold && f->properties ().weight < rxvt_fontprop::bold) - goto next_font; + bool careful; + if (f->has_char (unicode, &prop, careful)) + { + if (careful) + i |= 128; - if (f->has_codepoint (unicode)) - return i; + goto found; + } next_font: if (i == fonts.size () - 1) @@ -1223,7 +1599,8 @@ // only xft currently supported, as there is no // way to configure this and xft is easier to hack in, // while x11 has more framework in place already. -#if XFT + // TODO: this is a real resource hog, xft takes ages(?) +#if XFT && USE_SLOW_LOOKUP // grab the first xft font that seems suitable FcPattern *p = FcPatternCreate (); @@ -1233,14 +1610,15 @@ // charsets don't help that much, as xft might return // a non-matching font even if a better font is available :/ - FcPatternAddInteger (p, FC_PIXEL_SIZE, base_prop.height); - FcPatternAddInteger (p, FC_WEIGHT, base_prop.weight); - FcPatternAddInteger (p, FC_SLANT, base_prop.slant); + x x x x TODO prop might have unset contents + FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); + FcPatternAddInteger (p, FC_WEIGHT, prop.weight); + FcPatternAddInteger (p, FC_SLANT, prop.slant); FcPatternAddBool (p, FC_MINSPACE, 1); //FcPatternAddBool (p, FC_ANTIALIAS, 1); XftResult result; - FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); + FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result); FcPatternDestroy (p); @@ -1265,11 +1643,26 @@ } } - // if no bold font found, use a regular one - if (bold) - return find_font (unicode); + /* we must return SOME font */ + i = 0; + +found: + // found a font, cache it + if (i < 255) + { + while (hi >= fmap.size ()) + fmap.push_back (0); + + if (!fmap[hi]) + { + fmap[hi] = (pagemap *)new pagemap; + memset (fmap[hi], 0xff, sizeof (pagemap)); + } + + (*fmap[hi])[unicode & 0xff] = i; + } - return 0; /* we must return SOME font */ + return i; }