--- rxvt-unicode/src/defaultfont.C 2003/11/25 15:25:17 1.2 +++ rxvt-unicode/src/defaultfont.C 2004/03/16 04:52:20 1.44 @@ -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 @@ -23,9 +23,10 @@ #include "rxvt.h" #include "defaultfont.h" -#define DISPLAY r->Xdisplay -#define DRAWABLE r->TermWin.vt -#define GC r->TermWin.gc +#include + +#define DISPLAY r->display->display +#define TGC r->TermWin.gc const struct rxvt_fallback_font { codeset cs; @@ -59,49 +60,76 @@ #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_1990_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_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, + { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, + { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, + { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, + { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, + { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, + { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, + { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, + { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" }, + { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, + { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, + { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, #endif #if XFT - { CS_UNICODE, "xft:Andale Mono" }, - { CS_UNICODE, "xft:Arial Unicode MS" }, + { CS_UNICODE, "xft:Andale Mono" }, + { CS_UNICODE, "xft:Arial Unicode MS" }, +#endif + { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-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" }, + +#if UNICODE_3 && XFT + { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters #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_UNKNOWN, 0 } }; ///////////////////////////////////////////////////////////////////////////// +#if XFT +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; +} +#endif + +///////////////////////////////////////////////////////////////////////////// + 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) { @@ -113,7 +141,7 @@ } static const char * -enc_char (const text_t *text, int len, codeset cs, bool &zero) +enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) { uint8_t *buf = (uint8_t *)get_enc_buf (len); @@ -134,7 +162,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)); @@ -159,30 +187,55 @@ ///////////////////////////////////////////////////////////////////////////// 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, TGC, r->PixColors[color]); + XFillRectangle (d.display->display, d, TGC, x, y, w, h); +#endif } } 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; + set_name ("built-in pseudofont"); + return true; } - bool has_codepoint (uint32_t unicode) + bool has_codepoint (unicode_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 <= 0x259f) + return true; + + if (IS_COMPOSE (unicode)) return true; switch (unicode) @@ -194,29 +247,205 @@ 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); }; +static void rect_stipple (Display *display, Drawable d, GC gc, int s1, int s2, int x, int y, int w, int h) +{ + XGCValues gcv; + char bm[2] = { s1, s2 }; + + gcv.fill_style = FillStippled; + gcv.stipple = XCreateBitmapFromData (display, d, bm, 2, 2); + gcv.ts_x_origin = x; + gcv.ts_y_origin = y; + + if (!gcv.stipple) + return; + + XChangeGC (display, gc, GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); + XFillRectangle (display, d, gc, x, y, w, h); + + XFreePixmap (display, gcv.stipple); + + gcv.fill_style = FillSolid; + XChangeGC (display, gc, GCFillStyle, &gcv); +} + +#include "table/linedraw.h" + 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 (d.display->display, TGC, r->PixColors[fg]); while (len--) { - switch (*text++) +#if ENABLE_COMBINING + compose_char *cc; +#endif + text_t t = *text++; + + int x_[16]; + int y_[16]; + + int W = r->TermWin.fwidth , w = (W - 1) / 2; + int H = r->TermWin.fheight, h = (H - 1) / 2; + int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ; + int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight; + + for (int i = 0; i <= 8; i++) + { + x_[i] = x + ((W-1) * i + (i*7/8)) / 8; + y_[i] = y + ((H-1) * i + (i*7/8)) / 8; + } + + x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1; + y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1; + + int i1 = linedraw_offs[t - 0x2500]; + int i2 = linedraw_offs[t - 0x2500 + 1]; + + XGCValues gcv; + + gcv.cap_style = CapButt; + gcv.line_width = 0; + XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); + + if (i1 != i2) + { + while (i1 < i2) + { + uint32_t command = linedraw_command [i1++]; + + int op = (command >> 24) & 255; + int a = (command >> 20) & 15; + int b = (command >> 16) & 15; + int x1 = x_[(command >> 12) & 15]; + int y1 = y_[(command >> 8) & 15]; + int x2 = x_[(command >> 4) & 15]; + int y2 = y_[(command >> 0) & 15]; + + switch (op) + { + case 0: // line + XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); + break; + + case 1: // rectangle, possibly stippled + if (a) + { + static char bm[] = { 0,0 , 1,3 , 2,1 , 0,1 }; + + gcv.fill_style = FillStippled; + gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); + gcv.ts_x_origin = x; + gcv.ts_y_origin = y; + + XChangeGC (d.display->display, TGC, + GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, + &gcv); + } + + + XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); + + if (a) + { + XFreePixmap (d.display->display, gcv.stipple); + gcv.fill_style = FillSolid; + XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); + } + + break; + case 2: // arc + break; + } + } + +#if 0 + case 'A': XDrawArc (d.display->display, d, TGC, x1 , y1 , W-1, H-1, 90*64, 90*64); break; + case 'B': XDrawArc (d.display->display, d, TGC, x1-W+1, y1 , W-1, H-1, 0*64, 90*64); break; + case 'C': XDrawArc (d.display->display, d, TGC, x1-W+1, y1-H+1, W-1, H-1, 0*64, -90*64); break; + case 'D': XDrawArc (d.display->display, d, TGC, x1 , y1-H+1, W-1, H-1, -90*64, -90*64); break; + + case 'i': XFillRectangle (d.display->display, d, TGC, x0, y0, x1 - x0 + 1, y1 - y0 + 1); break; + case 'j': XFillRectangle (d.display->display, d, TGC, x1, y0, x2 - x1, y1 - y0 + 1); break; + case 'k': XFillRectangle (d.display->display, d, TGC, x0, y1, x1 - x0 + 1, y2 - y1); break; + case 'l': XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1, y2 - y1); break; + } + } +#endif + + } +#if ENABLE_COMBINING + else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) { - 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); + rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; + f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); + if (cc->c2 != NOCHAR) + { + // prefer font of first character, for no good reasons + rxvt_font *f2 = f1->has_codepoint (cc->c2) + ? f1 + : (*fs)[fs->find_font (cc->c2)]; + + f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); + } } +#endif + else + switch (t) + { + case ZERO_WIDTH_CHAR: + break; + +#if 0 + case 0x2580: XFillRectangle (d.display->display, d, TGC, x0, y0, W, y1 - y0 + 1); break; + case 0x2581: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 7 - 1) / 8, W, H - (H * 7 - 1) / 8); break; + case 0x2582: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 6 - 2) / 8, W, H - (H * 6 - 2) / 8); break; + case 0x2583: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 5 - 3) / 8, W, H - (H * 5 - 3) / 8); break; + case 0x2584: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 4 - 4) / 8, W, H - (H * 4 - 4) / 8); break; + case 0x2585: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 3 - 5) / 8, W, H - (H * 3 - 5) / 8); break; + case 0x2586: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 2 - 6) / 8, W, H - (H * 2 - 6) / 8); break; + case 0x2587: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 1 - 7) / 8, W, H - (H * 1 - 7) / 8); break; + case 0x2588: XFillRectangle (d.display->display, d, TGC, x0, y0, W, H); break; + case 0x2589: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 7 - 1) / 8, H); break; + case 0x258a: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 6 - 2) / 8, H); break; + case 0x258b: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 5 - 3) / 8, H); break; + case 0x258c: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 4 - 4) / 8, H); break; + case 0x258d: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 3 - 5) / 8, H); break; + case 0x258e: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 2 - 6) / 8, H); break; + case 0x258f: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 1 - 7) / 8, H); break; + case 0x2590: XFillRectangle (d.display->display, d, TGC, x1, y0, x2 - x1, H); break; + + case 0x2591: rect_stipple (d.display->display, d, TGC, 0x00, 0x01, x0, y0, W, H); break; + case 0x2592: rect_stipple (d.display->display, d, TGC, 0x02, 0x01, x0, y0, W, H); break; + case 0x2593: rect_stipple (d.display->display, d, TGC, 0x01, 0x03, x0, y0, W, H); break; + + case 0x2594: XFillRectangle (d.display->display, d, TGC, x0, y0, W, (H * 1 - 7) / 8); break; + case 0x2595: XFillRectangle (d.display->display, d, TGC, x0 + (W * 7 - 1) / 8, y0, W - (W * 7 - 1) / 8, H); break; +#endif + + 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; + } x += r->TermWin.fwidth; } @@ -229,11 +458,13 @@ void clear (); - bool load (int maxheight); + rxvt_fontprop properties (); - bool has_codepoint (uint32_t unicode); + bool load (const rxvt_fontprop &prop); - void draw (int x, int y, + bool has_codepoint (unicode_t unicode); + + void draw (rxvt_drawable &d, int x, int y, const text_t *text, int len, int fg, int bg); @@ -241,11 +472,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,20 +489,155 @@ return repl; } +rxvt_fontprop +rxvt_font_x11::properties () +{ + rxvt_fontprop p; + set_properties (p, f); + return p; +} + bool -rxvt_font_x11::load (int maxheight) +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::set_properties (rxvt_fontprop &p, const char *name) +{ + int slashes = 0; + const char *comp[13]; + + 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 +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) return false; - unsigned long value; - - const char *registry = get_property ("CHARSET_REGISTRY", 0); - const char *encoding = get_property ("CHARSET_ENCODING", 0); + const char *registry = get_property (f, "CHARSET_REGISTRY", 0); + const char *encoding = get_property (f, "CHARSET_ENCODING", 0); if (registry && encoding) { @@ -279,7 +648,7 @@ } else { - const char *charset = get_property ("FONT", 0); + const char *charset = get_property (f, "FONT", 0); if (!charset) charset = name; @@ -302,7 +671,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 +679,7 @@ width = f->max_bounds.width; else { - prop = true; + slow = true; int N = f->max_char_or_byte2 - f->min_char_or_byte2; @@ -350,7 +719,7 @@ } bool -rxvt_font_x11::has_codepoint (uint32_t unicode) +rxvt_font_x11::has_codepoint (unicode_t unicode) { uint32_t ch = FROM_UNICODE (cs, unicode); @@ -362,8 +731,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) @@ -396,7 +765,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) { @@ -405,7 +774,7 @@ // yet we are trying to be perfect /. // but the result still isn't perfect /. - bool slow = prop + bool slow = this->slow || width != r->TermWin.fwidth || height != r->TermWin.fheight; @@ -422,21 +791,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, TGC, GCForeground | GCBackground | GCFont, &v); + XDrawImageString16 (d.display->display, d, TGC, 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, TGC, 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, TGC, x, y + base, xc, 1); x += r->TermWin.fwidth; xc++; len--; @@ -444,7 +813,7 @@ while (len); } else - XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); + XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); } } else @@ -453,21 +822,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, TGC, GCForeground | GCBackground | GCFont, &v); + XDrawImageString (d.display->display, d, TGC, 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, TGC, GCForeground | GCFont, &v); if (slow) { do { if (*xc) - XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); + XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); x += r->TermWin.fwidth; xc++; len--; @@ -475,7 +844,7 @@ while (len); } else - XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); + XDrawString (d.display->display, d, TGC, x, y + base, xc, len); } } } @@ -490,55 +859,22 @@ #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 (); - bool load (int maxheight); + rxvt_fontprop properties (); + + 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); - bool has_codepoint (uint32_t unicode); + bool has_codepoint (unicode_t unicode); 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 @@ -549,21 +885,26 @@ XftFontClose (DISPLAY, f); f = 0; } +} - if (d) - { - XftDrawDestroy (d); - d = 0; - } +rxvt_fontprop +rxvt_font_xft::properties () +{ + rxvt_fontprop p; -#if 0 - for (int i = 0; i < SWATHCOUNT; i++) - delete cvr[i]; -#endif + 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 +913,46 @@ clear (); - f = XftFontOpenName (DISPLAY, DefaultScreen (DISPLAY), name); + FcPattern *p = FcNameParse ((FcChar8 *) name); - if (!f) + if (!p) return false; + FcValue v; + + if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) + FcPatternAddInteger (p, FC_WEIGHT, prop.weight); + + if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) + FcPatternAddInteger (p, FC_SLANT, prop.slant); + +#if 0 // clipping unfortunately destroys our precious double-width-characters + // clip width, we can't do better, or can we? + if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) + FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); +#endif + + //FcPatternAddBool (p, FC_MINSPACE, 1); + + XftResult result; + FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); + + FcPatternDestroy (p); + + if (!match) + return false; + + f = XftFontOpenPattern (DISPLAY, match); + + if (!f) + { + FcPatternDestroy (match); + return false; + } + FT_Face face = XftLockFace (f); - prop = !FT_IS_FIXED_WIDTH (face); + slow = !FT_IS_FIXED_WIDTH (face); int ftheight = 0; @@ -591,27 +964,28 @@ c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1); c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2); - prop = prop || g1.xOff != g2.xOff; // don't simply trust the font + if (g1.xOff != g2.xOff) // don't simply trust the font + slow = true; width = g2.xOff; ascent = (face->size->metrics.ascender + 63) >> 6; descent = (-face->size->metrics.descender + 63) >> 6; height = ascent + descent; - if (height <= maxheight || !maxheight) + if (height <= prop.height || !prop.height) break; if (ftheight) { // take smaller steps near the end - if (height > maxheight + 1) ftheight++; - if (height > maxheight + 2) ftheight++; - if (height > maxheight + 3) ftheight++; + if (height > prop.height + 1) ftheight++; + if (height > prop.height + 2) ftheight++; + if (height > prop.height + 3) ftheight++; - FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight); + FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height); } else - FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight); + FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height); } XftUnlockFace (f); @@ -619,41 +993,20 @@ 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) +rxvt_font_xft::has_codepoint (unicode_t unicode) { return XftCharExists (DISPLAY, f, unicode); } 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); - } - - 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); + clear_rect (d, 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); @@ -666,10 +1019,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; @@ -683,9 +1050,7 @@ ///////////////////////////////////////////////////////////////////////////// rxvt_fontset::rxvt_fontset (rxvt_t r) -#ifdef EXPLICIT_CONTEXT -: r(r) -#endif +: r (r) { clear (); } @@ -698,12 +1063,14 @@ void rxvt_fontset::clear () { - for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) + for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) FONT_UNREF (*i); fonts.clear (); base_id = 0; - height = 0x7fffffff; + base_prop.height = 0x7fffffff; + base_prop.weight = rxvt_fontprop::medium; + base_prop.slant = rxvt_fontprop::roman; fallback = fallback_fonts; } @@ -733,6 +1100,7 @@ else f = new rxvt_font_x11; + f->fs = this; f->set_term (r); f->set_name (strdup (name)); @@ -760,7 +1128,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, ']'); @@ -798,16 +1166,18 @@ 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 +bool rxvt_fontset::populate (const char *desc) { clear (); @@ -821,27 +1191,25 @@ base_id = 1; // we currently need a base-font, no matter what - if (fonts.size () <= base_id) + if ((int)fonts.size () <= base_id || !realize_font (base_id)) { + puts ("unable to load specified font (s), falling back to 'fixed'\n"); add_fonts ("fixed"); - base_id = 1; + base_id = fonts.size () - 1; } - if (fonts.size () <= base_id || !realize_font (base_id)) - { - 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; - height = fonts[base_id]->height; + base_prop = fonts[base_id]->properties (); - /*add_fonts ("-efont-fixed-medium-r-normal-*-14-*-*-*-*-*-iso10646-1,"*/ + return true; } int -rxvt_fontset::find_font (uint32_t unicode) +rxvt_fontset::find_font (unicode_t unicode) { - for (int i = 0; i < fonts.size (); i++) + for (unsigned int i = 0; i < fonts.size (); i++) { rxvt_font *f = fonts[i]; @@ -851,15 +1219,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: @@ -867,6 +1230,7 @@ { fonts.push_back (new_font (fallback->name, fallback->cs)); fallback++; + i = 0; } }