--- rxvt-unicode/src/defaultfont.C 2003/11/24 17:28:08 1.1 +++ rxvt-unicode/src/defaultfont.C 2003/12/26 07:42:23 1.12 @@ -23,9 +23,11 @@ #include "rxvt.h" #include "defaultfont.h" -#define DISPLAY R->Xdisplay -#define DRAWABLE R->TermWin.vt -#define GC R->TermWin.gc +#include + +#define DISPLAY r->Xdisplay +#define DRAWABLE r->TermWin.vt +#define GC r->TermWin.gc const struct rxvt_fallback_font { codeset cs; @@ -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 } }; @@ -165,13 +168,75 @@ XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); else if (color >= 0) { - XSetForeground (DISPLAY, GC, R->PixColors[color]); + XSetForeground (DISPLAY, GC, r->PixColors[color]); XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); } } +static const char *linedraw_cmds[128] = { + "1hH", "2hH", "1vV", "2vV", + 0, 0, 0, 0, + 0, 0, 0, 0, + "1HV", "2H1V", "1H2V", "2HV", + + // 2510 + "1hV", "2h1V", "1h2V", "2hV", + "1Hv", "2H1v", "1H2v", "2Hv", + "1hv", "2h1v", "1h2v", "2hv", + "1HvV", "2H1vV", "1HV2v", "1Hv2V", + + // 2520 + "1H2vV", "2Hv1V", "2HV1v", "2HvV", + "1hvV", "2h1vV", "1hV2v", "1hv2V", + "1h2vV", "2hv1V", "1v2hV", "2hvV", + "1hHV", "2h1HV", "2H1hV", "2hH1V", + + // 2530 + "1hH2V", "2hV1H", "1h2HV", "2hHV", + "1hHv", "1vH2h", "1hv2H", "1v2hH", + "1hH2v", "1H2hv", "1h2Hv", "2hHv", + "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH", + + // 2540 + "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv", + "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv", + "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV", + 0, 0, 0, 0, + + // 2550 + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + + // 2560 + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + + // 2570 + 0, "1a", "1b", "1ab", + "1h", "1v", "1H", "1V", + "2h", "2v", "2H", "2V", + "1h2H", "1v2V", "1H2h", "1V2v" + + // to be done +}; + 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; @@ -181,8 +246,13 @@ bool has_codepoint (uint32_t unicode) { - if (unicode <= 0x001f - || (unicode >= 0x80 && unicode <= 0x9f)) + if (unicode <= 0x001f) + return true; + if (unicode >= 0x0080 && unicode <= 0x009f) + return true; + + if (unicode >= 0x2500 && unicode <= 0x257f + && linedraw_cmds[unicode - 0x2500]) return true; switch (unicode) @@ -204,21 +274,60 @@ const text_t *text, int len, int fg, int bg) { - clear_rect (x, y, R->TermWin.fwidth * len, R->TermWin.fheight, bg); + clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); + + XSetForeground (DISPLAY, GC, r->PixColors[fg]); while (len--) { - switch (*text++) + text_t t = *text++; + + if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) { - case NOCHAR: - case ZERO_WIDTH_CHAR: - break; - default: - XSetForeground (DISPLAY, GC, R->PixColors[fg]); - XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, R->TermWin.fwidth - 5, R->TermWin.fheight - 5); + const char *p = linedraw_cmds[t - 0x2500]; + + 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; + + while (*p) + { + switch (*p++) + { + case '1': + gcv.line_width = 0; + XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); + break; + + case '2': + gcv.line_width = 2; + XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); + break; + + case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; + case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; + case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; + case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; + case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break; + case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break; + } + } + + gcv.line_width = 0; + XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); } + else + switch (*text++) + { + case NOCHAR: + case ZERO_WIDTH_CHAR: + break; + default: + XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); + } - x += R->TermWin.fwidth; + x += r->TermWin.fwidth; } } @@ -229,7 +338,9 @@ void clear (); - bool load (int maxheight); + rxvt_fontprop properties (); + + bool load (const rxvt_fontprop &prop); bool has_codepoint (uint32_t unicode); @@ -241,11 +352,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; @@ -255,11 +369,148 @@ 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::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::load (int maxheight) +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; + list = XListFonts (DISPLAY, name, 512, &count); + set_name (0); + + if (!list) + return false; + + int bestdiff = 0x7fffffff; + for (int i = 0; i < count; i++) + { + 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; + } + } + + XFreeFontNames (list); + + if (!name) + return false; + f = XLoadQueryFont (DISPLAY, name); if (!f) @@ -267,8 +518,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) { @@ -279,7 +530,7 @@ } else { - const char *charset = get_property ("FONT", 0); + const char *charset = get_property (f, "FONT", 0); if (!charset) charset = name; @@ -302,7 +553,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; @@ -310,7 +561,7 @@ width = f->max_bounds.width; else { - prop = true; + slow = true; int N = f->max_char_or_byte2 - f->min_char_or_byte2; @@ -405,15 +656,15 @@ // yet we are trying to be perfect /. // but the result still isn't perfect /. - bool slow = prop - || width != R->TermWin.fwidth - || height != R->TermWin.fheight; + bool slow = this->slow + || width != r->TermWin.fwidth + || height != r->TermWin.fheight; - int base = R->TermWin.fbase; + int base = r->TermWin.fbase; XGCValues v; - v.foreground = R->PixColors[fg]; - v.background = R->PixColors[bg]; + v.foreground = r->PixColors[fg]; + v.background = r->PixColors[bg]; v.font = f->fid; if (enc2b) @@ -427,7 +678,7 @@ } else { - clear_rect (x, y, R->TermWin.fwidth * len, R->TermWin.fheight, bg); + clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); @@ -438,7 +689,7 @@ if (xc->byte1 || xc->byte2) XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); - x += R->TermWin.fwidth; + x += r->TermWin.fwidth; xc++; len--; } while (len); @@ -458,7 +709,7 @@ } else { - clear_rect (x, y, R->TermWin.fwidth * len, R->TermWin.fheight, bg); + clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); @@ -469,7 +720,7 @@ if (*xc) XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); - x += R->TermWin.fwidth; + x += r->TermWin.fwidth; xc++; len--; } while (len); @@ -490,37 +741,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, @@ -531,14 +758,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 @@ -546,7 +765,7 @@ { if (f) { - XftFontClose (R->Xdisplay, f); + XftFontClose (DISPLAY, f); f = 0; } @@ -555,15 +774,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++) @@ -572,14 +802,46 @@ clear (); - f = XftFontOpenName (R->Xdisplay, DefaultScreen (R->Xdisplay), 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; @@ -588,30 +850,31 @@ XGlyphInfo g1, g2; FcChar8 c; - c = 'i'; XftTextExtents8 (R->Xdisplay, f, &c, 1, &g1); - c = 'W'; XftTextExtents8 (R->Xdisplay, f, &c, 1, &g2); + 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); @@ -619,22 +882,10 @@ 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) { - return XftCharExists (R->Xdisplay, f, unicode); + return XftCharExists (DISPLAY, f, unicode); } void @@ -643,19 +894,22 @@ int fg, int bg) { if (!d) - d = XftDrawCreate (R->Xdisplay, DRAWABLE, XVISUAL, XCMAP); + { + dR; + d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP); + } if (bg >= 0 && bg != Color_bg) - XftDrawRect (d, &R->PixColors[bg].c, x, y, R->TermWin.fwidth * len, R->TermWin.fheight); + 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); + 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); + 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); + XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); } else { @@ -663,13 +917,23 @@ { if (*text != NOCHAR && *text != ' ') { + 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 + (r->TermWin.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 + (r->TermWin.fwidth - extents.width) / 2, + y + r->TermWin.fbase, (const FcChar32 *)text, 1); + } } - x += R->TermWin.fwidth; + x += r->TermWin.fwidth; text++; len--; } @@ -679,9 +943,9 @@ ///////////////////////////////////////////////////////////////////////////// -rxvt_fontset::rxvt_fontset (pR) +rxvt_fontset::rxvt_fontset (rxvt_t r) #ifdef EXPLICIT_CONTEXT -: rxvt_term(R) +: r(r) #endif { clear (); @@ -700,7 +964,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; } @@ -730,7 +996,7 @@ else f = new rxvt_font_x11; - f->set_term (aR); + f->set_term (r); f->set_name (strdup (name)); f->cs = cs; @@ -795,13 +1061,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 @@ -818,10 +1086,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)) @@ -830,9 +1098,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 @@ -848,15 +1114,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: @@ -864,6 +1125,7 @@ { fonts.push_back (new_font (fallback->name, fallback->cs)); fallback++; + i = 0; } }