--- rxvt-unicode/src/rxvtfont.C 2007/10/28 11:25:04 1.121 +++ rxvt-unicode/src/rxvtfont.C 2008/01/23 06:49:30 1.133 @@ -21,7 +21,6 @@ #include "../config.h" #include "rxvt.h" -#include "rxvtlib.h" #include "rxvtutil.h" #include "rxvtfont.h" @@ -45,12 +44,12 @@ { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, - -#if ENCODING_EU - // cyrillic + +#if ENCODING_EU + // cyrillic { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, - + { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, @@ -67,7 +66,7 @@ # if XFT { CS_KOI8_U, "xft::lang=ru" }, - + { CS_ISO8859_5, "xft::lang=ru" }, { CS_ISO8859_6, "xft::lang=ar" }, { CS_ISO8859_7, "xft::lang=el" }, @@ -233,17 +232,19 @@ { dTermDisplay; dTermGC; - + if (color == Color_bg || color == Color_transparent) XClearArea (disp, d, x, y, w, h, false); else if (color >= 0) { #if XFT bool done = false; -#ifdef HAVE_BG_PIXMAP - if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) + +# ifdef HAVE_BG_PIXMAP + if (term->bgPixmap.pixmap && color >= 0 && !term->pix_colors[color].is_opaque ()) { Picture dst = XftDrawPicture (d); + if (dst != 0) { XClearArea (disp, d, x, y, w, h, false); @@ -252,9 +253,10 @@ done = true; } } -#endif +# endif if (!done) XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); + #else XSetForeground (disp, gc, term->pix_colors[color]); XFillRectangle (disp, d, gc, x, y, w, h); @@ -264,8 +266,6 @@ ///////////////////////////////////////////////////////////////////////////// -#include "table/linedraw.h" - struct rxvt_font_default : rxvt_font { struct rxvt_fontset *fs; @@ -310,9 +310,11 @@ if (unicode <= 0x009f) return true; +#ifdef BUILTIN_GLYPHS if (unicode >= 0x2500 && unicode <= 0x259f && !term->option (Opt_skipBuiltinGlyphs)) return true; +#endif if (IS_COMPOSE (unicode)) return true; @@ -358,8 +360,10 @@ int width = text - tp; int fwidth = term->fwidth * width; +#ifdef BUILTIN_GLYPHS if (0x2500 <= t && t <= 0x259f) { +# include "table/linedraw.h" uint16_t offs = linedraw_offs[t - 0x2500]; uint32_t *a = linedraw_command + (offs >> 4); uint32_t *b = a + (offs & 15); @@ -407,7 +411,7 @@ if (a) { static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; - + gcv.fill_style = FillStippled; gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); gcv.ts_x_origin = x; @@ -436,6 +440,10 @@ } } } +#else + if (0) + ; +#endif #if ENABLE_COMBINING else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) { @@ -606,7 +614,7 @@ // fix the size of scalable fonts static bool -replace_field (char *buf, const char *name, int index, const char old, const char *replace) +replace_field (char **ptr, const char *name, int index, const char old, const char *replace) { int slashes = 0; const char *field, *end; @@ -626,17 +634,17 @@ if (slashes >= 13 && (!old || *field == old)) { - // TODO: check for overflow in font-name - strncpy (buf, name, field - name); - buf += field - name; - strcpy (buf, replace); - strcat (buf, end); + size_t len = field - name; + *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); + memcpy (*ptr, name, len); + strcpy (*ptr + len, replace); + strcat (*ptr, end); return true; } else { - strcpy (buf, name); + *ptr = strdup (name); return false; } @@ -654,7 +662,7 @@ // first morph the font if required if (force_prop) { - char fname[1024]; + char *fname; if (name[0] != '-') { @@ -676,18 +684,18 @@ if (prop.weight != rxvt_fontprop::unset) { - replace_field (fname, name, 2, 0, + replace_field (&fname, name, 2, 0, prop.weight < rxvt_fontprop::bold ? "medium" : "bold"); - set_name (strdup (fname)); + set_name (fname); } if (prop.slant != rxvt_fontprop::unset) { - replace_field (fname, name, 3, 0, + replace_field (&fname, name, 3, 0, prop.slant < rxvt_fontprop::italic ? "r" : "i"); // TODO: handle "o"blique, too - set_name (strdup (fname)); + set_name (fname); } } @@ -722,14 +730,18 @@ for (int i = 0; i < count; i++) { rxvt_fontprop p; - char fname[1024]; + char *fname; int diff = 0; - if (replace_field (fname, list[i], 6, '0', field_str)) + if (replace_field (&fname, list[i], 6, '0', field_str)) diff += 10; // slightly penalize scalable fonts - else if (replace_field (fname, list[i], 11, '0', "0")) - diff += 300; // more heavily penalize what looks like scaled bitmap fonts + else + { + free (fname); + if (replace_field (&fname, list[i], 11, '0', "0")) + diff += 300; // more heavily penalize what looks like scaled bitmap fonts + } if (!set_properties (p, fname)) continue; @@ -743,7 +755,7 @@ if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); - fonts[i].name = strdup (fname); + fonts[i].name = fname; fonts[i].diff = diff; } @@ -830,7 +842,7 @@ if (encm) N += (f->max_byte1 - f->min_byte1) * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); - + while (N) { if (f->per_char[N].width > width) @@ -992,7 +1004,7 @@ clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); XChangeGC (disp, gc, GCForeground | GCFont, &v); - + if (slow) { do @@ -1024,7 +1036,7 @@ clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); XChangeGC (disp, gc, GCForeground | GCFont, &v); - + if (slow) { do @@ -1289,15 +1301,15 @@ int w = term->fwidth * len; int h = term->fheight; - /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. - * Maybe make buffering into a resource flag? Compile time option doesn't seems like a + /* + * Maybe make buffering into a resource flag? Compile time option doesn't seems like a * good idea from the perspective of packaging for wide variety of user configs. */ - bool buffered = true + bool buffered = bg >= Color_transparent; #ifdef FORCE_UNBUFFERED_XFT - && bg >= 0 + buffered = false; #endif - ; + // cut trailing spaces while (len && text [len - 1] == ' ') len--; @@ -1312,7 +1324,7 @@ while (len && *text == NOCHAR) text++, len--, cwidth += term->fwidth; - + if (fc != ' ') // skip spaces { FT_UInt glyph = XftCharIndex (disp, f, fc); @@ -1333,9 +1345,9 @@ if (buffered) { - bool back_rendered = false; if (ep != enc) { + bool back_rendered = false; rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); #ifdef HAVE_BG_PIXMAP @@ -1343,19 +1355,21 @@ { Picture dst = 0; - if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) + if (bg >= 0 && term->pix_colors[bg].is_opaque ()) + XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); + else dst = XftDrawPicture (d2); - - if (bg < 0 || dst != 0) + + if (dst) { - int src_x = x, src_y = y ; - + int src_x = x, src_y = y; + if (term->bgPixmap.is_parentOrigin ()) { src_x += term->window_vt_x; src_y += term->window_vt_y; } - + if (term->bgPixmap.pmap_width >= src_x+w && term->bgPixmap.pmap_height >= src_y+h) { @@ -1392,8 +1406,8 @@ } #endif - if (bg >= 0 && !back_rendered) - XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); + if (!back_rendered) + XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); @@ -1447,7 +1461,7 @@ rxvt_fontset::new_font (const char *name, codeset cs) { rxvt_font *f; - + if (!name || !*name) { name = ""; @@ -1525,7 +1539,7 @@ if (end - desc < 511) { - strncpy (buf, desc, end - desc); + memcpy (buf, desc, end - desc); buf[end - desc] = 0; fonts.push_back (new_font (buf, cs)); @@ -1676,7 +1690,7 @@ char fontname[4096]; sprintf (fontname, "xft:%-.4090s", font); - fonts.push_back (new_font (fontname, CS_UNICODE)); + fonts.push_back (new_font (fontname, CS_UNICODE)); } free (font);