--- rxvt-unicode/src/defaultfont.C 2003/12/24 06:26:52 1.9 +++ rxvt-unicode/src/defaultfont.C 2004/02/24 23:58:12 1.25 @@ -1,7 +1,7 @@ /*--------------------------------*-C-*---------------------------------*; * File: defaultfont.C *----------------------------------------------------------------------* - * Copyright (c) 2003 Marc Lehmann rxvt@plan9.de> + * Copyright (c) 2003-2004 Marc Lehmann * - original version. * * This program is free software; you can redistribute it and/or modify @@ -25,8 +25,7 @@ #include -#define DISPLAY r->Xdisplay -#define DRAWABLE r->TermWin.vt +#define DISPLAY r->display->display #define GC r->TermWin.gc const struct rxvt_fallback_font { @@ -75,14 +74,15 @@ { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, # endif - { 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" }, + { 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 @@ -100,11 +100,27 @@ ///////////////////////////////////////////////////////////////////////////// +rxvt_drawable::~rxvt_drawable () +{ + if (xftdrawable) + XftDrawDestroy (xftdrawable); +} + +rxvt_drawable::operator XftDraw *() +{ + if (!xftdrawable) + xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); + + return xftdrawable; +} + +///////////////////////////////////////////////////////////////////////////// + static void *enc_buf; static uint32_t enc_len; static inline void * -get_enc_buf (int len) +get_enc_buf (uint32_t len) { if (len > enc_len) { @@ -116,7 +132,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); @@ -137,7 +153,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)); @@ -162,14 +178,18 @@ ///////////////////////////////////////////////////////////////////////////// void -rxvt_font::clear_rect (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) { if (color == Color_bg) - XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); + XClearArea (d.display->display, d, x, y, w, h, FALSE); else if (color >= 0) { - XSetForeground (DISPLAY, GC, r->PixColors[color]); - XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); +#if XFT + XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); +#else + XSetForeground (d.display->display, GC, r->PixColors[color]); + XFillRectangle (d.display->display, d, GC, x, y, w, h); +#endif } } @@ -229,7 +249,7 @@ { rxvt_fontprop p; - p.height = 1; + p.width = p.height = 1; p.weight = rxvt_fontprop::medium; p.slant = rxvt_fontprop::roman; @@ -264,19 +284,19 @@ return false; } - void draw (int x, int y, + void draw (rxvt_drawable &d, int x, int y, const text_t *text, int len, int fg, int bg); }; void -rxvt_font_default::draw (int x, int y, +rxvt_font_default::draw (rxvt_drawable &d, int x, int y, const text_t *text, int len, int fg, int bg) { - clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); + clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); - XSetForeground (DISPLAY, GC, r->PixColors[fg]); + XSetForeground (d.display->display, GC, r->PixColors[fg]); while (len--) { @@ -286,8 +306,8 @@ { 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; + int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1; + int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1; XGCValues gcv; @@ -297,25 +317,25 @@ { case '1': gcv.line_width = 0; - XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); + XChangeGC (d.display->display, GC, GCLineWidth, &gcv); break; case '2': gcv.line_width = 2; - XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); + XChangeGC (d.display->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; + case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; + case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; + case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; + case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; + case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break; + case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break; } } gcv.line_width = 0; - XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); + XChangeGC (d.display->display, GC, GCLineWidth, &gcv); } else switch (*text++) @@ -324,7 +344,7 @@ case ZERO_WIDTH_CHAR: break; default: - XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); + XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); } x += r->TermWin.fwidth; @@ -339,13 +359,12 @@ void clear (); rxvt_fontprop properties (); - rxvt_fontprop properties (XFontStruct *f); bool load (const rxvt_fontprop &prop); bool has_codepoint (uint32_t unicode); - void draw (int x, int y, + void draw (rxvt_drawable &d, int x, int y, const text_t *text, int len, int fg, int bg); @@ -354,6 +373,9 @@ bool enc2b, encm; 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 * @@ -370,22 +392,100 @@ rxvt_fontprop rxvt_font_x11::properties () { - return properties (f); + rxvt_fontprop p; + set_properties (p, f); + return p; } -rxvt_fontprop -rxvt_font_x11::properties (XFontStruct *f) +bool +rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) { - rxvt_fontprop p; + 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"); - 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; + unsigned long height; + if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) + return false; - return p; + 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 exist 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 @@ -395,48 +495,47 @@ 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; int bestdiff = 0x7fffffff; - XFontStruct *best = 0; for (int i = 0; i < count; i++) { - XFontStruct *f = info + 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 (f->ascent + f->descent <= prop.height) // weed out too large fonts + if (!name // compare against best found so far + || diff < bestdiff) { - rxvt_fontprop p = properties (f); - int diff = (prop.height - f->ascent + f->descent) * 32 - + abs (prop.weight - p.weight) - + abs (prop.slant - p.slant ); - - if (!best // compare against best found so far - || diff < bestdiff) - { - best = f; - bestdiff = diff; - } + set_name (strdup (fname)); + bestdiff = diff; } } - if (!best) - return false; - - 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 (f, "CHARSET_REGISTRY", 0); const char *encoding = get_property (f, "CHARSET_ENCODING", 0); @@ -532,8 +631,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) @@ -566,7 +665,7 @@ } void -rxvt_font_x11::draw (int x, int y, +rxvt_font_x11::draw (rxvt_drawable &d, int x, int y, const text_t *text, int len, int fg, int bg) { @@ -592,21 +691,21 @@ if (bg == Color_bg && !slow) { - XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); - XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); + XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); + XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); } else { - clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); + clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); - XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); + XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); if (slow) { do { if (xc->byte1 || xc->byte2) - XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); + XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); x += r->TermWin.fwidth; xc++; len--; @@ -614,7 +713,7 @@ while (len); } else - XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); + XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); } } else @@ -623,21 +722,21 @@ if (bg == Color_bg && !slow) { - XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); - XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); + XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); + XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); } else { - clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); + clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); - XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); + XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); if (slow) { do { if (*xc) - XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); + XDrawString (d.display->display, d, GC, x, y + base, xc, 1); x += r->TermWin.fwidth; xc++; len--; @@ -645,7 +744,7 @@ while (len); } else - XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); + XDrawString (d.display->display, d, GC, x, y + base, xc, len); } } } @@ -660,33 +759,7 @@ #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; } + rxvt_font_xft () { f = 0; } void clear (); @@ -694,7 +767,7 @@ bool load (const rxvt_fontprop &prop); - void draw (int x, int y, + void draw (rxvt_drawable &d, int x, int y, const text_t *text, int len, int fg, int bg); @@ -702,15 +775,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 @@ -721,17 +785,6 @@ XftFontClose (DISPLAY, f); f = 0; } - - if (d) - { - XftDrawDestroy (d); - d = 0; - } - -#if 0 - for (int i = 0; i < SWATHCOUNT; i++) - delete cvr[i]; -#endif } rxvt_fontprop @@ -741,7 +794,7 @@ FT_Face face = XftLockFace (f); - p.height = height; + 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; @@ -773,6 +826,12 @@ 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; @@ -834,18 +893,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) { @@ -853,22 +900,13 @@ } void -rxvt_font_xft::draw (int x, int y, +rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, const text_t *text, int len, int fg, int bg) { - if (!d) - { - dR; - d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP); - } + clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); - 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 (!slow && 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); @@ -881,10 +919,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 (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 - XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1); + { + 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); + } } x += r->TermWin.fwidth; @@ -898,9 +950,7 @@ ///////////////////////////////////////////////////////////////////////////// rxvt_fontset::rxvt_fontset (rxvt_t r) -#ifdef EXPLICIT_CONTEXT -: r(r) -#endif +: r (r) { clear (); } @@ -913,7 +963,7 @@ 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 (); @@ -977,7 +1027,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, ']'); @@ -1026,7 +1076,7 @@ return true; } -void +bool rxvt_fontset::populate (const char *desc) { clear (); @@ -1040,25 +1090,25 @@ base_id = 1; // we currently need a base-font, no matter what - if (fonts.size () <= base_id || !realize_font (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 = fonts.size () - 1; } - if (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); - } + if ((int)fonts.size () <= base_id || !realize_font (base_id)) + return false; base_prop = fonts[base_id]->properties (); + + return true; } 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];