--- rxvt-unicode/src/defaultfont.C 2004/03/04 03:04:53 1.33 +++ rxvt-unicode/src/defaultfont.C 2004/03/16 04:52:20 1.44 @@ -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; @@ -63,7 +63,7 @@ { 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_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, #endif @@ -196,63 +196,12 @@ #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 -}; - struct rxvt_font_default : rxvt_font { rxvt_fontprop properties () { @@ -270,18 +219,23 @@ 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) return true; + if (unicode >= 0x0080 && unicode <= 0x009f) return true; - if (unicode >= 0x2500 && unicode <= 0x257f - && linedraw_cmds[unicode - 0x2500]) + if (unicode >= 0x2500 && unicode <= 0x259f) + return true; + + if (IS_COMPOSE (unicode)) return true; switch (unicode) @@ -298,6 +252,30 @@ 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, @@ -305,53 +283,156 @@ { 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--) { +#if ENABLE_COMBINING + compose_char *cc; +#endif text_t t = *text++; - // is it in our linedrawing table? - if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) + 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++) { - const char *p = linedraw_cmds[t - 0x2500]; + 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 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 i1 = linedraw_offs[t - 0x2500]; + int i2 = linedraw_offs[t - 0x2500 + 1]; - XGCValues gcv; + XGCValues gcv; - while (*p) + gcv.cap_style = CapButt; + gcv.line_width = 0; + XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); + + if (i1 != i2) + { + while (i1 < i2) { - switch (*p++) + 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 '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); + 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; + } + } - 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; +#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 - gcv.line_width = 0; - XChangeGC (d.display->display, GC, GCLineWidth, &gcv); } +#if ENABLE_COMBINING + else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) + { + 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) @@ -361,8 +442,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; } @@ -381,7 +462,7 @@ bool load (const rxvt_fontprop &prop); - bool has_codepoint (uint32_t unicode); + bool has_codepoint (unicode_t unicode); void draw (rxvt_drawable &d, int x, int y, const text_t *text, int len, @@ -638,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); @@ -710,21 +791,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--; @@ -732,7 +813,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 @@ -741,21 +822,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--; @@ -763,7 +844,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); } } } @@ -790,7 +871,7 @@ 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; @@ -913,7 +994,7 @@ } bool -rxvt_font_xft::has_codepoint (uint32_t unicode) +rxvt_font_xft::has_codepoint (unicode_t unicode) { return XftCharExists (DISPLAY, f, unicode); } @@ -1019,6 +1100,7 @@ else f = new rxvt_font_x11; + f->fs = this; f->set_term (r); f->set_name (strdup (name)); @@ -1125,7 +1207,7 @@ } int -rxvt_fontset::find_font (uint32_t unicode) +rxvt_fontset::find_font (unicode_t unicode) { for (unsigned int i = 0; i < fonts.size (); i++) {