--- rxvt-unicode/src/defaultfont.C 2004/03/15 01:27:46 1.41 +++ rxvt-unicode/src/defaultfont.C 2004/03/16 05:51:36 1.45 @@ -26,7 +26,7 @@ #include #define DISPLAY r->display->display -#define GC r->TermWin.gc +#define TGC r->TermWin.gc const struct rxvt_fallback_font { codeset cs; @@ -196,64 +196,16 @@ #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); + XSetForeground (d.display->display, TGC, r->PixColors[color]); + XFillRectangle (d.display->display, d, TGC, x, y, w, h); #endif } } -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 -}; +#include "table/linedraw.h" struct rxvt_font_default : rxvt_font { + rxvt_fontprop properties () { rxvt_fontprop p; @@ -270,7 +222,7 @@ width = 1; height = 1; ascent = 1; descent = 0; - set_name ("built-in pseudofont"); + set_name (strdup ("built-in pseudofont")); return true; } @@ -283,8 +235,8 @@ if (unicode >= 0x0080 && unicode <= 0x009f) return true; - if (unicode >= 0x2500 && unicode <= 0x257f - && linedraw_cmds[unicode - 0x2500]) + if (unicode >= 0x2500 && unicode <= 0x259f + && linedraw_offs[unicode - 0x2500] & 15) return true; if (IS_COMPOSE (unicode)) @@ -309,9 +261,10 @@ const text_t *text, int len, int fg, int bg) { +return; clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); - XSetForeground (d.display->display, GC, r->PixColors[fg]); + XSetForeground (d.display->display, TGC, r->PixColors[fg]); while (len--) { @@ -320,41 +273,88 @@ #endif text_t t = *text++; - // is it in our linedrawing table? - if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) + 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; + + if (0x2500 <= t && t <= 0x259f + && linedraw_offs[t - 0x2500] & 15) { - 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 x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1; - int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1; + 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; - while (*p) + gcv.cap_style = CapButt; + gcv.line_width = 0; + XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); + + 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, GC, GCLineWidth, &gcv); + case 0: // line + XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); break; - case '2': - gcv.line_width = 2; - XChangeGC (d.display->display, GC, GCLineWidth, &gcv); - break; + 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); + } - 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; + 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; } } - - gcv.line_width = 0; - XChangeGC (d.display->display, GC, GCLineWidth, &gcv); } #if ENABLE_COMBINING else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) @@ -377,6 +377,7 @@ { case ZERO_WIDTH_CHAR: break; + default: int w = 0; while (len > 0 && *text == NOCHAR) @@ -386,8 +387,8 @@ w += r->TermWin.fwidth; } - XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, - w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); + XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, + w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); x += w; } @@ -735,21 +736,21 @@ if (bg == Color_bg && !slow) { - XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); - XDrawImageString16 (d.display->display, d, 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 (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); - XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); + XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); if (slow) { do { if (xc->byte1 || xc->byte2) - XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); + XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); x += r->TermWin.fwidth; xc++; len--; @@ -757,7 +758,7 @@ while (len); } else - XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); + XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); } } else @@ -766,21 +767,21 @@ if (bg == Color_bg && !slow) { - XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); - XDrawImageString (d.display->display, d, 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 (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); - XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); + XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); if (slow) { do { if (*xc) - XDrawString (d.display->display, d, GC, x, y + base, xc, 1); + XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); x += r->TermWin.fwidth; xc++; len--; @@ -788,7 +789,7 @@ while (len); } else - XDrawString (d.display->display, d, GC, x, y + base, xc, len); + XDrawString (d.display->display, d, TGC, x, y + base, xc, len); } } }