--- rxvt-unicode/src/defaultfont.C 2004/03/16 04:52:20 1.44 +++ rxvt-unicode/src/defaultfont.C 2004/03/28 02:07:08 1.50 @@ -202,7 +202,10 @@ } } +#include "table/linedraw.h" + struct rxvt_font_default : rxvt_font { + rxvt_fontprop properties () { rxvt_fontprop p; @@ -219,7 +222,7 @@ width = 1; height = 1; ascent = 1; descent = 0; - set_name ("built-in pseudofont"); + set_name (strdup ("built-in pseudofont")); return true; } @@ -229,7 +232,10 @@ if (unicode <= 0x001f) return true; - if (unicode >= 0x0080 && unicode <= 0x009f) + if (unicode <= 0x007f) + return false; + + if (unicode <= 0x009f) return true; if (unicode >= 0x2500 && unicode <= 0x259f) @@ -252,30 +258,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); -} - -#include "table/linedraw.h" - void rxvt_font_default::draw (rxvt_drawable &d, int x, int y, const text_t *text, int len, @@ -292,37 +274,36 @@ #endif text_t t = *text++; - int x_[16]; - int y_[16]; + if (0x2500 <= t && t <= 0x259f) + { + 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 , 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; + int W = r->TermWin.fwidth; + int H = 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; - } + int x_[16]; + int y_[16]; - 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; + 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; + } - int i1 = linedraw_offs[t - 0x2500]; - int i2 = linedraw_offs[t - 0x2500 + 1]; + 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; + XGCValues gcv; - gcv.cap_style = CapButt; - gcv.line_width = 0; - XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); + gcv.cap_style = CapButt; + gcv.line_width = 0; + XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); - if (i1 != i2) - { - while (i1 < i2) + while (a < b) { - uint32_t command = linedraw_command [i1++]; + uint32_t command = *a++; int op = (command >> 24) & 255; int a = (command >> 20) & 15; @@ -341,7 +322,7 @@ case 1: // rectangle, possibly stippled if (a) { - static char bm[] = { 0,0 , 1,3 , 2,1 , 0,1 }; + 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); @@ -353,36 +334,23 @@ &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; } } - -#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])) @@ -406,33 +374,6 @@ 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) @@ -472,13 +413,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; @@ -486,7 +427,7 @@ if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) return XGetAtomName (DISPLAY, value); else - return repl; + return rxvt_strdup (repl); } rxvt_fontprop @@ -511,9 +452,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; @@ -522,7 +460,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 @@ -636,8 +582,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) { @@ -661,6 +607,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 @@ -782,7 +731,6 @@ XGCValues v; v.foreground = r->PixColors[fg]; - v.background = r->PixColors[bg]; v.font = f->fid; if (enc2b) @@ -791,6 +739,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); } @@ -822,6 +771,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); } @@ -1209,7 +1159,9 @@ int rxvt_fontset::find_font (unicode_t unicode) { - 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];