--- rxvt-unicode/src/defaultfont.C 2004/03/04 00:59:10 1.32 +++ rxvt-unicode/src/defaultfont.C 2004/03/28 02:07:08 1.50 @@ -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,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,18 +222,26 @@ width = 1; height = 1; ascent = 1; descent = 0; + set_name (strdup ("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) + + if (unicode <= 0x007f) + return false; + + if (unicode <= 0x009f) + return true; + + if (unicode >= 0x2500 && unicode <= 0x259f) return true; - if (unicode >= 0x2500 && unicode <= 0x257f - && linedraw_cmds[unicode - 0x2500]) + if (IS_COMPOSE (unicode)) return true; switch (unicode) @@ -305,53 +265,115 @@ { 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]) + 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; + } - 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; + 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); + 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, 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 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)]; - gcv.line_width = 0; - XChangeGC (d.display->display, GC, GCLineWidth, &gcv); + f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); + } } +#endif else switch (t) { case ZERO_WIDTH_CHAR: break; + default: int w = 0; while (len > 0 && *text == NOCHAR) @@ -361,8 +383,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 +403,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, @@ -391,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; @@ -405,7 +427,7 @@ if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) return XGetAtomName (DISPLAY, value); else - return repl; + return rxvt_strdup (repl); } rxvt_fontprop @@ -430,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; @@ -441,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 @@ -555,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) { @@ -580,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 @@ -638,7 +668,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); @@ -701,7 +731,6 @@ XGCValues v; v.foreground = r->PixColors[fg]; - v.background = r->PixColors[bg]; v.font = f->fid; if (enc2b) @@ -710,21 +739,22 @@ 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); + 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); } 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 +762,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 +771,22 @@ 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); + 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); } 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 +794,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 +821,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 +944,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 +1050,7 @@ else f = new rxvt_font_x11; + f->fs = this; f->set_term (r); f->set_name (strdup (name)); @@ -1099,7 +1131,6 @@ rxvt_fontset::populate (const char *desc) { clear (); - printf ("P(%s)\n",desc); fonts.push_back (new_font (0, CS_UNICODE)); realize_font (0); @@ -1126,9 +1157,11 @@ } int -rxvt_fontset::find_font (uint32_t unicode) +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];