-/*--------------------------------*-C-*---------------------------------*
+/*----------------------------------------------------------------------*
* 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
#include "../config.h"
#include "rxvt.h"
-#include "rxvtlib.h"
#include "rxvtutil.h"
#include "rxvtfont.h"
{ 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" },
# 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" },
#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
#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
-#define dTermDisplay Display *disp = term->xdisp
+#define dTermDisplay Display *disp = term->dpy
#define dTermGC GC gc = term->gc
/////////////////////////////////////////////////////////////////////////////
-#if XFT
-rxvt_drawable::~rxvt_drawable ()
-{
- if (xftdrawable)
- XftDrawDestroy (xftdrawable);
-}
-
-rxvt_drawable::operator XftDraw *()
-{
- if (!xftdrawable)
- xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
-
- return xftdrawable;
-}
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-
static const char *
enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
{
}
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
{
dTermDisplay;
dTermGC;
-
- if (color == Color_bg)
+
+ if (color == Color_bg || color == Color_transparent)
XClearArea (disp, d, x, y, w, h, false);
else if (color >= 0)
{
#if XFT
- XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
+ Picture dst;
+
+# ifdef HAVE_BG_PIXMAP
+ if (term->bgPixmap.pixmap
+ && !term->pix_colors[color].is_opaque ()
+ && ((dst = XftDrawPicture (d))))
+ {
+ 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);
+ }
+ 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);
/////////////////////////////////////////////////////////////////////////////
-#include "table/linedraw.h"
-
struct rxvt_font_default : rxvt_font {
struct rxvt_fontset *fs;
return p;
}
- bool load (const rxvt_fontprop &prop)
+ bool load (const rxvt_fontprop &prop, bool force_prop)
{
width = 1; height = 1;
ascent = 1; descent = 0;
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;
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);
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;
}
}
}
+#else
+ if (0)
+ ;
+#endif
#if ENABLE_COMBINING
else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
{
? f1
: (*fs)[fs->find_font (cc->c2)];
- f2->draw (d, x, y, chrs, width, fg, -1);
+ f2->draw (d, x, y, chrs, width, fg, Color_none);
}
}
#endif
rxvt_fontprop properties ();
- bool load (const rxvt_fontprop &prop);
+ bool load (const rxvt_fontprop &prop, bool force_prop);
bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
bool slow; // wether this is a proportional font or has other funny characteristics
XFontStruct *f;
- codeset cs;
bool enc2b, encm;
char *get_property (XFontStruct *f, Atom property, const char *repl) const;
unsigned long value;
if (XGetFontProperty (f, property, &value))
- return XGetAtomName (term->xdisp, value);
+ return XGetAtomName (term->dpy, value);
else
- return rxvt_strdup (repl);
+ return repl ? strdup (repl) : 0;
}
rxvt_fontprop
unsigned long height;
#if 0
- if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))
+ if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
return false;
#else
height = f->ascent + f->descent;
// 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;
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;
}
}
bool
-rxvt_font_x11::load (const rxvt_fontprop &prop)
+rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
{
dTermDisplay;
char field_str[64]; // enough for 128 bits
// first morph the font if required
- if (prop.weight != rxvt_fontprop::unset
- || prop.slant != rxvt_fontprop::unset)
+ if (force_prop)
{
- char fname[1024];
+ char *fname;
if (name[0] != '-')
{
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);
}
}
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;
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;
}
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 (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)
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 (f)
{
- XFreeFont (term->xdisp, f);
+ XFreeFont (term->dpy, f);
f = 0;
}
}
clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
XChangeGC (disp, gc, GCForeground | GCFont, &v);
-
+
if (slow)
{
do
clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
XChangeGC (disp, gc, GCForeground | GCFont, &v);
-
+
if (slow)
{
do
rxvt_fontprop properties ();
- bool load (const rxvt_fontprop &prop);
+ bool load (const rxvt_fontprop &prop, bool force_prop);
void draw (rxvt_drawable &d, int x, int y,
const text_t *text, int len,
int fg, int bg);
- bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
+ bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
protected:
XftFont *f;
{
if (f)
{
- XftFontClose (term->xdisp, f);
+ XftFontClose (term->dpy, f);
f = 0;
}
}
}
bool
-rxvt_font_xft::load (const rxvt_fontprop &prop)
+rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
{
dTermDisplay;
FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
if (prop.weight != rxvt_fontprop::unset
- && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
+ && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
if (prop.slant != rxvt_fontprop::unset
- && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
+ && (force_prop || 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);
+ FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
#endif
if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
{
careful = false;
- if (!XftCharExists (term->xdisp, f, unicode))
+ if (!XftCharExists (term->dpy, f, unicode))
return false;
if (!prop || prop->width == rxvt_fontprop::unset)
// check character against base font bounding box
FcChar32 ch = unicode;
XGlyphInfo g;
- XftTextExtents32 (term->xdisp, f, &ch, 1, &g);
+ XftTextExtents32 (term->dpy, f, &ch, 1, &g);
int w = g.width - g.x;
int wcw = max (WCWIDTH (unicode), 1);
const text_t *text, int len,
int fg, int bg)
{
- clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
-
XGlyphInfo extents;
- XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
+ XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
XftGlyphSpec *ep = enc;
dTermDisplay;
dTermGC;
+ int w = term->fwidth * len;
+ int h = term->fheight;
+
+ bool buffered = bg >= Color_transparent
+ && term->option (Opt_buffered);
+
// cut trailing spaces
while (len && text [len - 1] == ' ')
len--;
+ int x_ = buffered ? 0 : x;
+ int y_ = buffered ? 0 : y;
+
while (len)
{
int cwidth = term->fwidth;
while (len && *text == NOCHAR)
text++, len--, cwidth += term->fwidth;
-
+
if (fc != ' ') // skip spaces
{
FT_UInt glyph = XftCharIndex (disp, f, fc);
XftGlyphExtents (disp, f, &glyph, 1, &extents);
ep->glyph = glyph;
- ep->x = x + (cwidth - extents.xOff >> 1);
- ep->y = y + ascent;
+ ep->x = x_ + (cwidth - extents.xOff >> 1);
+ ep->y = y_ + ascent;
if (extents.xOff == 0)
- ep->x = x + cwidth;
+ ep->x = x_ + cwidth;
ep++;
}
- x += cwidth;
+ x_ += cwidth;
}
- if (ep != enc)
- XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
+ if (buffered)
+ {
+ if (ep != enc)
+ {
+ rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
+
+#ifdef HAVE_BG_PIXMAP
+ Picture dst = 0; // the only assignment is done conditionally in the following if condition
+
+ 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 (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)
+ {
+ 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;
+
+ XChangeGC (disp, gc,
+ GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
+ &gcv);
+
+ XFillRectangle (disp, d2, gc, 0, 0, w, h);
+
+ gcv.fill_style = FillSolid;
+ XChangeGC (disp, gc, GCFillStyle, &gcv);
+ }
+
+ if (dst)
+ {
+ Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
+
+ // 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
+ 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);
+ }
+ else
+ clear_rect (d, x, y, w, h, bg);
+ }
+ else
+ {
+ clear_rect (d, x, y, w, h, bg);
+ XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
+ }
}
+
#endif
/////////////////////////////////////////////////////////////////////////////
{
prop.width = prop.height = prop.ascent = prop.weight = prop.slant
= rxvt_fontprop::unset;
+ force_prop = false;
for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
FONT_UNREF (*i);
rxvt_fontset::new_font (const char *name, codeset cs)
{
rxvt_font *f;
-
+
if (!name || !*name)
{
name = "";
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));
fonts[i]->loaded = true;
- if (!fonts[i]->load (prop))
+ if (!fonts[i]->load (prop, force_prop))
{
fonts[i]->cs = CS_UNKNOWN;
return false;
//FcPatternAddBool (p, FC_ANTIALIAS, 1);
XftResult result;
- FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);
+ FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
FcPatternDestroy (p);
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);
projects / dana / urxvt.git / blobdiff