--- rxvt-unicode/src/defaultfont.C 2004/03/15 07:10:47 1.43 +++ rxvt-unicode/src/defaultfont.C 2004/08/02 04:42:11 1.56 @@ -1,4 +1,4 @@ -/*--------------------------------*-C-*---------------------------------*; +/*--------------------------------*-C-*---------------------------------* * File: defaultfont.C *----------------------------------------------------------------------* * Copyright (c) 2003-2004 Marc Lehmann @@ -32,28 +32,28 @@ codeset cs; const char *name; } fallback_fonts[] = { - { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, - { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, - { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, - -#if ENCODING_EU - // cyrillic - { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, - { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, - - { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, - { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, - { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, - { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, - { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, - { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" }, - { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" }, - { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" }, - { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, - { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, - { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, - { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, - { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, + { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, + { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, + { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, + +#if ENCODING_EU + // cyrillic + { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, + { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, + + { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, + { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, + { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, + { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, + { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, + { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" }, + { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" }, + { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" }, + { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, + { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, + { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, + { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, + { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, #endif // japanese @@ -65,6 +65,9 @@ { 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" }, + { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, + { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, + { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, #endif #if ENCODING_CN || ENCODING_CN_EXT @@ -91,9 +94,9 @@ #if XFT { CS_UNICODE, "xft:Andale Mono" }, { CS_UNICODE, "xft:Arial Unicode MS" }, + { CS_UNICODE, "xft:FreeMono" }, #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" }, @@ -135,6 +138,7 @@ { free (enc_buf); enc_buf = malloc (len); + enc_len = len; } return enc_buf; @@ -202,70 +206,10 @@ } } -static const char *linedraw_cmds[128 + 32] = { - "1-", "2-", "1|", "2|", - 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", - "1H|", "2H1|", "1HV2v", "1Hv2V", - - // 2520 - "1H2|", "2Hv1V", "2HV1v", "2H|", - "1h|", "2h1|", "1hV2v", "1hv2V", - "1h2|", "2hv1V", "1v2hV", "2h|", - "1-V", "2h1HV", "2H1hV", "2-1V", - - // 2530 - "1-2V", "2hV1H", "1h2HV", "2-V", - "1-v", "1vH2h", "1hv2H", "1v2-", - "1-2v", "1H2hv", "1h2Hv", "2-v", - "1-|", "1|H2h", "1h|2H", "1|2-", - - // 2540 - "1-V2v", "1-v2V", "1-2|", "1HV2hv", - "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2-v", - "1v2-V", "1H2h|", "1h2H|", "2-|", - 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, "A", "B", "C", - - // 2570 - "D", "1/", "1\\", "1/\\", - "1h", "1v", "1H", "1V", - "2h", "2v", "2H", "2V", - "1h2H", "1v2V", "1H2h", "1V2v", - - // 2580 - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - - // 2590 - 0, 0, 0, 0, - 0, 0, "k", "l", - "i", "ikl", "il", "ijk", - "ijl", "j", "jk", "jkl", - - // to be done -}; +#include "table/linedraw.h" struct rxvt_font_default : rxvt_font { + rxvt_fontprop properties () { rxvt_fontprop p; @@ -282,7 +226,7 @@ width = 1; height = 1; ascent = 1; descent = 0; - set_name ("built-in pseudofont"); + set_name (strdup ("built-in pseudofont")); return true; } @@ -292,14 +236,13 @@ if (unicode <= 0x001f) return true; - if (unicode >= 0x0080 && unicode <= 0x009f) - return true; + if (unicode <= 0x007f) + return false; - if (unicode >= 0x2500 && unicode <= 0x257f - && linedraw_cmds[unicode - 0x2500]) + if (unicode <= 0x009f) return true; - if (unicode >= 0x2580 && unicode <= 0x259f) + if (unicode >= 0x2500 && unicode <= 0x259f) return true; if (IS_COMPOSE (unicode)) @@ -319,28 +262,6 @@ 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); -} - void rxvt_font_default::draw (rxvt_drawable &d, int x, int y, const text_t *text, int len, @@ -357,61 +278,84 @@ #endif text_t t = *text++; - 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; - - // is it in our linedrawing table? - if (t >= 0x2500 & t <= 0x259f && linedraw_cmds[t - 0x2500]) + if (0x2500 <= t && t <= 0x259f) { - const char *p = linedraw_cmds[t - 0x2500]; + uint16_t offs = linedraw_offs[t - 0x2500]; + uint32_t *a = linedraw_command + (offs >> 4); + uint32_t *b = a + (offs & 15); + + int W = r->TermWin.fwidth; + int H = r->TermWin.fheight; + + int x_[16]; + int y_[16]; + + 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; XGCValues gcv; - gcv.cap_style = CapNotLast; - XChangeGC (d.display->display, TGC, GCCapStyle, &gcv); + gcv.cap_style = CapButt; + gcv.line_width = 0; + XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); - while (*p) + while (a < b) { - switch (*p++) + uint32_t command = *a++; + + 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 '1': - gcv.line_width = 0; - XChangeGC (d.display->display, TGC, GCLineWidth, &gcv); + case 0: // line + XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); break; - case '2': - gcv.line_width = 3; - XChangeGC (d.display->display, TGC, GCLineWidth, &gcv); + case 1: // rectangle, possibly stippled + if (a) + { + 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.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.stipple = 0; + gcv.fill_style = FillSolid; + XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); + } + break; + case 2: // arc + XDrawArc (d.display->display, d, TGC, + x1 - W/2, y1 - H/2, W-1, H-1, + (a - 1) * 90*64, (b - 1) * 90*64); break; - - case 'h': XDrawLine (d.display->display, d, TGC, x0, y1, x1+1, y1 ); break; - case 'H': XDrawLine (d.display->display, d, TGC, x1, y1, x2 , y1 ); break; - case '-': XDrawLine (d.display->display, d, TGC, x0, y1, x2 , y1 ); break; - case 'v': XDrawLine (d.display->display, d, TGC, x1, y0, x1 , y1+1); break; - case 'V': XDrawLine (d.display->display, d, TGC, x1, y1, x1 , y2 ); break; - case '|': XDrawLine (d.display->display, d, TGC, x1, y0, x1 , y2 ); break; - - case '/' : XDrawLine (d.display->display, d, TGC, x0, y2, x2 , y0 ); break; - case '\\': XDrawLine (d.display->display, d, TGC, x0, y0, x2 , y2 ); break; - - 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; } } - - gcv.line_width = 0; - XChangeGC (d.display->display, TGC, GCLineWidth, &gcv); } - #if ENABLE_COMBINING else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) { @@ -434,31 +378,6 @@ case ZERO_WIDTH_CHAR: break; - 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; - default: int w = 0; while (len > 0 && *text == NOCHAR) @@ -498,13 +417,13 @@ codeset cs; bool enc2b, encm; - const char *get_property (XFontStruct *f, const char *property, const char *repl) 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 * +char * rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const { unsigned long value; @@ -512,7 +431,7 @@ if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) return XGetAtomName (DISPLAY, value); else - return repl; + return rxvt_strdup (repl); } rxvt_fontprop @@ -537,9 +456,6 @@ 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; @@ -548,7 +464,15 @@ if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) avgwidth = 0; - return set_properties (p, height, weight, slant, avgwidth); + char *weight = get_property (f, "WEIGHT_NAME", "medium"); + char *slant = get_property (f, "SLANT", "r"); + + set_properties (p, height, weight, slant, avgwidth); + + free (weight); + free (slant); + + return true; } bool @@ -662,8 +586,8 @@ if (!f) return false; - const char *registry = get_property (f, "CHARSET_REGISTRY", 0); - const char *encoding = get_property (f, "CHARSET_ENCODING", 0); + char *registry = get_property (f, "CHARSET_REGISTRY", 0); + char *encoding = get_property (f, "CHARSET_ENCODING", 0); if (registry && encoding) { @@ -687,6 +611,9 @@ cs = codeset_from_name (charset); } + free (registry); + free (encoding); + if (cs == CS_UNICODE) cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font @@ -808,7 +735,6 @@ XGCValues v; v.foreground = r->PixColors[fg]; - v.background = r->PixColors[bg]; v.font = f->fid; if (enc2b) @@ -817,6 +743,7 @@ 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); } @@ -848,6 +775,7 @@ 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); } @@ -1076,7 +1004,7 @@ ///////////////////////////////////////////////////////////////////////////// rxvt_fontset::rxvt_fontset (rxvt_t r) -: r (r) +: r (r), fontdesc (0) { clear (); } @@ -1092,6 +1020,8 @@ for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) FONT_UNREF (*i); + free (fontdesc); fontdesc = 0; + fonts.clear (); base_id = 0; base_prop.height = 0x7fffffff; @@ -1208,6 +1138,8 @@ { clear (); + fontdesc = strdup (desc); + fonts.push_back (new_font (0, CS_UNICODE)); realize_font (0); @@ -1233,9 +1165,11 @@ } int -rxvt_fontset::find_font (unicode_t unicode) +rxvt_fontset::find_font (unicode_t unicode, bool bold) { - for (unsigned int i = 0; i < fonts.size (); i++) + for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii + i < fonts.size (); + i++) { rxvt_font *f = fonts[i]; @@ -1248,7 +1182,13 @@ goto next_font; } - if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) + if (f->cs == CS_UNKNOWN) + goto next_font; + + if (bold && f->properties ().weight < rxvt_fontprop::bold) + goto next_font; + + if (f->has_codepoint (unicode)) return i; next_font: @@ -1260,6 +1200,10 @@ } } + // if no bold font found, use a regular one + if (bold) + return find_font (unicode); + return 0; /* we must return SOME font */ }