/*----------------------------------------------------------------------*
* File: rxvtfont.C
*----------------------------------------------------------------------*
- * Copyright (c) 2003-200
6 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-200
8 Marc Lehmann <pcg@goof.com>
* - original version.
*
* This program is free software; you can redistribute it and/or modify
#if ENCODING_JP || ENCODING_JP_EXT
# if XFT
// prefer xft for complex scripts
- { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
+ { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
# endif
}
void
-rxvt_font::set_name (char *name)
+rxvt_font::set_name (char *name_)
{
- if (this->name == name)
+ if (name == name_)
return;
- if (this->name) free (this->name); // let the compiler optimize
- this->name = name;
+ if (name) free (name); // let the compiler optimize
+ name = name_;
}
void
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)
+ Picture dst;
+
+# ifdef HAVE_BG_PIXMAP
+ if (term->bgPixmap.pixmap
+ && !term->pix_colors[color].is_opaque ()
+ && ((dst = XftDrawPicture (d))))
{
- Picture dst = XftDrawPicture (d);
- if (dst != 0)
- {
- XClearArea (disp, d, x, y, w, h, false);
- Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
- XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
- done = true;
- }
+ XClearArea (disp, d, x, y, w, h, false);
+
+ Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
+ XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
}
-#endif
- if (!done)
+ else
+# endif
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);
{
size_t len = field - name;
*ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
- strncpy (*ptr, name, len);
+ memcpy (*ptr, name, len);
strcpy (*ptr + len, replace);
strcat (*ptr, end);
char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
+ cs = CS_UNKNOWN;
+
if (registry && encoding)
{
char charset[64];
snprintf (charset, 64, "%s-%s", registry, encoding);
cs = codeset_from_name (charset);
+
+ if (cs == CS_UNKNOWN)
+ rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
}
- else
+
+ free (registry);
+ free (encoding);
+
+ if (cs == CS_UNKNOWN)
{
const char *charset = get_property (f, XA_FONT, 0);
break;
cs = codeset_from_name (charset);
+ if (cs == CS_UNKNOWN)
+ rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
}
- free (registry);
- free (encoding);
+ if (cs == CS_UNKNOWN)
+ {
+ clear ();
+ return false;
+ }
if (cs == CS_UNICODE)
cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
if (width < g.width) width = g.width;
}
- if (cs == CS_UNKNOWN)
- {
- fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
-
- clear ();
- return false;
- }
-
#if 0 // do it per-character
if (prop && width > prop->width)
{
#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);
+ FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
#endif
if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
int fg, int bg)
{
XGlyphInfo extents;
- XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
+ XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
XftGlyphSpec *ep = enc;
dTermDisplay;
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
- * good idea from the perspective of packaging for wide variety of user configs.
- */
- bool buffered = true
-#ifdef FORCE_UNBUFFERED_XFT
- && bg >= 0
-#endif
- ;
+ bool buffered = bg >= Color_transparent
+ && term->option (Opt_buffered);
+
// cut trailing spaces
while (len && text [len - 1] == ' ')
len--;
if (buffered)
{
- bool back_rendered = false;
if (ep != enc)
{
rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
#ifdef HAVE_BG_PIXMAP
- if (term->bgPixmap.pixmap)
- {
- Picture dst = 0;
+ Picture dst = 0; // the only assignment is done conditionally in the following if condition
- if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
- dst = XftDrawPicture (d2);
+ if (term->bgPixmap.pixmap
+ && (bg == Color_transparent || bg == Color_bg
+ || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
+ {
+ int src_x = x, src_y = y;
- if (bg < 0 || dst != 0)
+ if (term->bgPixmap.is_parentOrigin ())
{
- int src_x = x, src_y = y ;
-
- if (term->bgPixmap.is_parentOrigin ())
- {
- src_x += term->window_vt_x;
- src_y += term->window_vt_y;
- }
+ 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)
- {
- XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
- src_x, src_y, w, h, 0, 0);
- }
- else
- {
- XGCValues gcv;
+ if (term->bgPixmap.pmap_width >= src_x + w
+ && term->bgPixmap.pmap_height >= src_y + h)
+ {
+ XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
+ src_x, src_y, w, h, 0, 0);
+ }
+ else
+ {
+ XGCValues gcv;
- gcv.fill_style = FillTiled;
- gcv.tile = term->bgPixmap.pixmap;
- gcv.ts_x_origin = -src_x;
- gcv.ts_y_origin = -src_y;
+ gcv.fill_style = FillTiled;
+ gcv.tile = term->bgPixmap.pixmap;
+ gcv.ts_x_origin = -src_x;
+ gcv.ts_y_origin = -src_y;
- XChangeGC (disp, gc,
- GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
- &gcv);
+ XChangeGC (disp, gc,
+ GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
+ &gcv);
- XFillRectangle (disp, d2, gc, 0, 0, w, h);
+ XFillRectangle (disp, d2, gc, 0, 0, w, h);
- gcv.fill_style = FillSolid;
- XChangeGC (disp, gc, GCFillStyle, &gcv);
- }
+ gcv.fill_style = FillSolid;
+ XChangeGC (disp, gc, GCFillStyle, &gcv);
+ }
- if (bg >= 0)
- {
- Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
- XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
- }
+ if (dst)
+ {
+ Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
- back_rendered = true;
+ // dst can only be set when bg >= 0
+ XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
}
}
+ else
#endif
-
- if (bg >= 0 && !back_rendered)
- XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
+ XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_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);
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));
projects / dana / urxvt.git / blobdiff