--- rxvt-unicode/src/defaultfont.C 2003/12/24 09:07:01 1.10 +++ rxvt-unicode/src/defaultfont.C 2004/03/15 01:27:46 1.41 @@ -1,7 +1,7 @@ /*--------------------------------*-C-*---------------------------------*; * File: defaultfont.C *----------------------------------------------------------------------* - * Copyright (c) 2003 Marc Lehmann rxvt@plan9.de> + * Copyright (c) 2003-2004 Marc Lehmann * - original version. * * This program is free software; you can redistribute it and/or modify @@ -25,8 +25,7 @@ #include -#define DISPLAY r->Xdisplay -#define DRAWABLE r->TermWin.vt +#define DISPLAY r->display->display #define GC r->TermWin.gc const struct rxvt_fallback_font { @@ -64,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 @@ -75,14 +74,18 @@ { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, # endif - { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-1" }, - { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-2" }, - { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-3" }, - { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-4" }, - { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-5" }, - { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-6" }, - { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-7" }, - { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-f" }, + { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, + { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, + { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, + { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, + { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, + { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, + { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, + { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, + { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" }, + { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, + { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, + { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, #endif #if XFT @@ -95,16 +98,38 @@ { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, +#if UNICODE_3 && XFT + { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters +#endif + { CS_UNKNOWN, 0 } }; ///////////////////////////////////////////////////////////////////////////// +#if XFT +rxvt_drawable::~rxvt_drawable () +{ + if (xftdrawable) + XftDrawDestroy (xftdrawable); +} + +rxvt_drawable::operator XftDraw *() +{ + if (!xftdrawable) + xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); + + return xftdrawable; +} +#endif + +///////////////////////////////////////////////////////////////////////////// + static void *enc_buf; static uint32_t enc_len; static inline void * -get_enc_buf (int len) +get_enc_buf (uint32_t len) { if (len > enc_len) { @@ -116,7 +141,7 @@ } static const char * -enc_char (const text_t *text, int len, codeset cs, bool &zero) +enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) { uint8_t *buf = (uint8_t *)get_enc_buf (len); @@ -137,7 +162,7 @@ } static const XChar2b * -enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) +enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) { XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); @@ -162,14 +187,18 @@ ///////////////////////////////////////////////////////////////////////////// void -rxvt_font::clear_rect (int x, int y, int w, int h, int color) +rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) { if (color == Color_bg) - XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); + XClearArea (d.display->display, d, x, y, w, h, FALSE); else if (color >= 0) { - XSetForeground (DISPLAY, GC, r->PixColors[color]); - XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); +#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); +#endif } } @@ -241,13 +270,16 @@ 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; @@ -255,6 +287,9 @@ && linedraw_cmds[unicode - 0x2500]) return true; + if (IS_COMPOSE (unicode)) + return true; + switch (unicode) { case ZERO_WIDTH_CHAR: @@ -264,30 +299,34 @@ return false; } - void draw (int x, int y, + void draw (rxvt_drawable &d, int x, int y, const text_t *text, int len, int fg, int bg); }; void -rxvt_font_default::draw (int x, int y, +rxvt_font_default::draw (rxvt_drawable &d, int x, int y, const text_t *text, int len, int fg, int bg) { - clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); + clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); - XSetForeground (DISPLAY, GC, r->PixColors[fg]); + XSetForeground (d.display->display, GC, 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]) { const char *p = linedraw_cmds[t - 0x2500]; - int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; - int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight; + 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; XGCValues gcv; @@ -297,34 +336,59 @@ { case '1': gcv.line_width = 0; - XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); + XChangeGC (d.display->display, GC, GCLineWidth, &gcv); break; case '2': gcv.line_width = 2; - XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); + XChangeGC (d.display->display, GC, GCLineWidth, &gcv); break; - case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; - case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; - case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; - case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; - case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break; - case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); 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; } } gcv.line_width = 0; - XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); + 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 (*text++) + switch (t) { - case NOCHAR: case ZERO_WIDTH_CHAR: break; default: - XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); + int w = 0; + while (len > 0 && *text == NOCHAR) + { + ++text; + --len; + w += r->TermWin.fwidth; + } + + XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, + w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); + x += w; } x += r->TermWin.fwidth; @@ -339,13 +403,12 @@ void clear (); rxvt_fontprop properties (); - rxvt_fontprop properties (XFontStruct *f); bool load (const rxvt_fontprop &prop); - bool has_codepoint (uint32_t unicode); + bool has_codepoint (unicode_t unicode); - void draw (int x, int y, + void draw (rxvt_drawable &d, int x, int y, const text_t *text, int len, int fg, int bg); @@ -354,6 +417,9 @@ bool enc2b, encm; 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 * @@ -370,26 +436,100 @@ rxvt_fontprop rxvt_font_x11::properties () { - return properties (f); + rxvt_fontprop p; + set_properties (p, f); + return p; } -rxvt_fontprop -rxvt_font_x11::properties (XFontStruct *f) +bool +rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) { - rxvt_fontprop p; + p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; + p.height = height; + p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; + p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; + + return true; +} +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; + unsigned long avgwidth; - p.width = XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth) - ? avgwidth / 10 - : (height + 1) / 2; - p.height = height; - p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; - p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; + if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) + avgwidth = 0; - return p; + return set_properties (p, height, weight, slant, avgwidth); +} + +bool +rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) +{ + int slashes = 0; + const char *comp[13]; + + for (const char *c = name; *c; c++) + if (*c == '-') + { + comp[slashes++] = c + 1; + if (slashes >= 13) + break; + } + + /* can we short-circuit the costly XLoadQueryFont? */ + if (slashes >= 13 + && (*comp[ 6] >= '1' && *comp[ 6] <= '9') + && (*comp[11] >= '0' && *comp[11] <= '9')) + return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); + + XFontStruct *f = XLoadQueryFont (DISPLAY, name); + + if (f) + { + // the font should really exist now. if not, we have a problem + // (e.g. if the user did xset fp rehash just when we were searching fonts). + // in that case, just return garbage. + bool ret = set_properties (p, f); + XFreeFont (DISPLAY, f); + return ret; + } + else + return false; +} + +// fix the size of scalable fonts +static void +fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop) +{ + int slashes = 0; + const char *size; + + for (const char *c = name; *c; c++) + if (*c == '-') + { + if (slashes == 6) + size = c + 1; + + if (++slashes >= 13) + break; + } + + if (slashes >= 13 && size[0] == '0') + { + strncpy (buf, name, size - name); + buf += size - name; + buf += sprintf (buf, "%d", prop.height); + strcpy (buf, size + 1); + } + else + strcpy (buf, name); } bool @@ -399,48 +539,47 @@ char **list; int count; - XFontStruct *info; - list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info); + list = XListFonts (DISPLAY, name, 512, &count); + set_name (0); if (!list) return false; int bestdiff = 0x7fffffff; - XFontStruct *best = 0; for (int i = 0; i < count; i++) { - XFontStruct *f = info + i; + rxvt_fontprop p; + char fname[1024]; + fix_scalable (fname, list[i], prop); + + if (!set_properties (p, fname)) + continue; + + if (p.height > prop.height) // weed out too large fonts + continue; + + int diff = (prop.height - p.height) * 32 + + abs (prop.weight - p.weight) + + abs (prop.slant - p.slant ); - if (f->ascent + f->descent <= prop.height) // weed out too large fonts + if (!name // compare against best found so far + || diff < bestdiff) { - rxvt_fontprop p = properties (f); - int diff = (prop.height - f->ascent + f->descent) * 32 - + abs (prop.weight - p.weight) - + abs (prop.slant - p.slant ); - - if (!best // compare against best found so far - || diff < bestdiff) - { - best = f; - bestdiff = diff; - } + set_name (strdup (fname)); + bestdiff = diff; } } - if (!best) - return false; - - set_name (strdup (list[best - info])); + XFreeFontNames (list); - XFreeFontInfo (list, info, count); + if (!name) + return false; f = XLoadQueryFont (DISPLAY, name); if (!f) return false; - unsigned long value; - const char *registry = get_property (f, "CHARSET_REGISTRY", 0); const char *encoding = get_property (f, "CHARSET_ENCODING", 0); @@ -524,7 +663,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); @@ -536,8 +675,8 @@ if (encm) { - int byte1 = ch >> 8; - int byte2 = ch & 255; + unsigned char byte1 = ch >> 8; + unsigned char byte2 = ch & 255; if (byte1 < f->min_byte1 || byte1 > f->max_byte1 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) @@ -570,7 +709,7 @@ } void -rxvt_font_x11::draw (int x, int y, +rxvt_font_x11::draw (rxvt_drawable &d, int x, int y, const text_t *text, int len, int fg, int bg) { @@ -596,21 +735,21 @@ if (bg == Color_bg && !slow) { - XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); - XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); + XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); + XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); } else { - clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); + clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); - XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); + XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); if (slow) { do { if (xc->byte1 || xc->byte2) - XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); + XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); x += r->TermWin.fwidth; xc++; len--; @@ -618,7 +757,7 @@ while (len); } else - XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); + XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); } } else @@ -627,21 +766,21 @@ if (bg == Color_bg && !slow) { - XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); - XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); + XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); + XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); } else { - clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); + clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); - XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); + XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); if (slow) { do { if (*xc) - XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); + XDrawString (d.display->display, d, GC, x, y + base, xc, 1); x += r->TermWin.fwidth; xc++; len--; @@ -649,7 +788,7 @@ while (len); } else - XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); + XDrawString (d.display->display, d, GC, x, y + base, xc, len); } } } @@ -664,7 +803,7 @@ #endif struct rxvt_font_xft : rxvt_font { - rxvt_font_xft () { f = 0; d = 0; } + rxvt_font_xft () { f = 0; } void clear (); @@ -672,15 +811,14 @@ bool load (const rxvt_fontprop &prop); - void draw (int x, int y, + void draw (rxvt_drawable &d, int x, int y, 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; - XftDraw *d; }; void @@ -691,12 +829,6 @@ XftFontClose (DISPLAY, f); f = 0; } - - if (d) - { - XftDrawDestroy (d); - d = 0; - } } rxvt_fontprop @@ -738,9 +870,11 @@ if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) FcPatternAddInteger (p, FC_SLANT, prop.slant); +#if 0 // clipping unfortunately destroys our precious double-width-characters // clip width, we can't do better, or can we? if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); +#endif //FcPatternAddBool (p, FC_MINSPACE, 1); @@ -804,28 +938,19 @@ } bool -rxvt_font_xft::has_codepoint (uint32_t unicode) +rxvt_font_xft::has_codepoint (unicode_t unicode) { return XftCharExists (DISPLAY, f, unicode); } void -rxvt_font_xft::draw (int x, int y, +rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, const text_t *text, int len, int fg, int bg) { - if (!d) - { - dR; - d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP); - } - - if (bg >= 0 && bg != Color_bg) - XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); - else - clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); + clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); - if (!slow && width == r->TermWin.fwidth) + if (!slow && width == r->TermWin.fwidth && 0) { if (sizeof (text_t) == sizeof (FcChar16)) XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); @@ -838,10 +963,24 @@ { if (*text != NOCHAR && *text != ' ') { + int fwidth = r->TermWin.fwidth; + if (len >= 2 && text[1] == NOCHAR) + fwidth *= 2; + + XGlyphInfo extents; if (sizeof (text_t) == sizeof (FcChar16)) - XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1); + { + XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents); + XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, + y + r->TermWin.fbase, (const FcChar16 *)text, 1); + } else - XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1); + { + XGlyphInfo extents; + XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents); + XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, + y + r->TermWin.fbase, (const FcChar32 *)text, 1); + } } x += r->TermWin.fwidth; @@ -855,9 +994,7 @@ ///////////////////////////////////////////////////////////////////////////// rxvt_fontset::rxvt_fontset (rxvt_t r) -#ifdef EXPLICIT_CONTEXT -: r(r) -#endif +: r (r) { clear (); } @@ -870,7 +1007,7 @@ void rxvt_fontset::clear () { - for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) + for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) FONT_UNREF (*i); fonts.clear (); @@ -907,6 +1044,7 @@ else f = new rxvt_font_x11; + f->fs = this; f->set_term (r); f->set_name (strdup (name)); @@ -934,7 +1072,7 @@ { fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); - const char *extra = desc++; + //const char *extra = desc++; // not yet used desc = strchr (desc, ']'); @@ -983,7 +1121,7 @@ return true; } -void +bool rxvt_fontset::populate (const char *desc) { clear (); @@ -997,25 +1135,25 @@ base_id = 1; // we currently need a base-font, no matter what - if (fonts.size () <= base_id || !realize_font (base_id)) + if ((int)fonts.size () <= base_id || !realize_font (base_id)) { + puts ("unable to load specified font (s), falling back to 'fixed'\n"); add_fonts ("fixed"); base_id = fonts.size () - 1; } - if (fonts.size () <= base_id || !realize_font (base_id)) - { - fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); - exit (1); - } + if ((int)fonts.size () <= base_id || !realize_font (base_id)) + return false; base_prop = fonts[base_id]->properties (); + + return true; } int -rxvt_fontset::find_font (uint32_t unicode) +rxvt_fontset::find_font (unicode_t unicode) { - for (int i = 0; i < fonts.size (); i++) + for (unsigned int i = 0; i < fonts.size (); i++) { rxvt_font *f = fonts[i];