-/*--------------------------------*-C-*---------------------------------*
+/*----------------------------------------------------------------------*
* File: rxvtfont.C
*----------------------------------------------------------------------*
- * Copyright (c) 2003-200
4 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*---------------------------------------------------------------------*/
#include "../config.h"
#include "rxvtfont.h"
#include <cstdlib>
-#include <wchar.h>
+
#include <inttypes.h>
-#define DISPLAY r->display->display
-#define TGC r->TermWin.gc
+#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
+#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
-#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width
+#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
+ (prop)->slant >= rxvt_fontprop::italic \
+ ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
+ : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
+ ))
const struct rxvt_fallback_font {
codeset cs;
{ 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" },
{ CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
# if XFT
- { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" },
-
- { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" },
- { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" },
- { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" },
- { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" },
- { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" },
- { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" },
- { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" },
+ { CS_KOI8_U, "xft::lang=ru" },
+
+ { CS_ISO8859_5, "xft::lang=ru" },
+ { CS_ISO8859_6, "xft::lang=ar" },
+ { CS_ISO8859_7, "xft::lang=el" },
+ { CS_ISO8859_8, "xft::lang=he" },
+ { CS_ISO8859_9, "xft::lang=tr" },
+ { CS_ISO8859_10, "xft::lang=se" },
+ { CS_ISO8859_11, "xft::lang=th" },
# endif
#endif
#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:spacing=100:antialias=false" },
+ { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
# endif
{ CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
{ CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
# if XFT
{ CS_GBK_0, "xft:AR PL KaitiM GB" },
{ CS_GBK_0, "xft:AR PL SungtiL GB" },
- { CS_GBK_0, "xft::spacing=100:lang=zh" },
+ { CS_GBK_0, "xft::lang=zh" },
{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
- { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" },
+ { CS_GB2312_1980_0, "xft::lang=zh" },
# endif
{ CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
{ CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
{ CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
# if XFT
{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
- { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" },
+ { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
# endif
#endif
- // generic font fallback
{ CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
- { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
- { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
- { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
+ //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
#if XFT
- { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"},
- { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
- { CS_UNICODE, "xft:Andale Mono:antialias=false" },
- { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" },
+ { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
+ { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
+ { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
+ { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
- // FreeMono is usually uglier than x fonts, so try last only.
+ // FreeMono is usually uglier than x fonts, so try after the others
{ CS_UNICODE, "xft:FreeMono:autohint=true" },
#endif
+ // generic font fallback, put this last, as many iso10646 fonts have extents
+ // specified for all glyphs in the range they cover, but most are simply empty
+ //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
+ //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
{ CS_UNKNOWN, 0 }
};
#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[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
+#define dTermDisplay Display *disp = term->dpy
+#define dTermGC GC gc = term->gc
/////////////////////////////////////////////////////////////////////////////
-static void *enc_buf;
-static uint32_t enc_len;
-
-static inline void *
-get_enc_buf (uint32_t len)
-{
- if (len > enc_len)
- {
- free (enc_buf);
- enc_buf = malloc (len);
- enc_len = len;
- }
-
- return enc_buf;
-}
-
static const char *
enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
{
- uint8_t *buf = (uint8_t *)get_enc_buf (len);
+ uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
+ uint8_t *res = buf;
while (len--)
{
*buf++ = c;
}
- return (const char *)enc_buf;
+ return (const char *)res;
}
static const XChar2b *
enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
{
- XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
+ XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
+ XChar2b *res = buf;
while (len--)
{
buf++;
}
- return (XChar2b *)enc_buf;
+ return res;
}
/////////////////////////////////////////////////////////////////////////////
+rxvt_font::rxvt_font ()
+: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
+{
+}
+
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
-rxvt_font::clear_rect (rxvt_drawable &d, 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) const
{
- if (color == Color_bg)
- XClearArea (d.display->display, d, x, y, w, h, FALSE);
+ dTermDisplay;
+ dTermGC;
+
+ if (color == Color_bg || color == Color_transparent)
+ XClearArea (disp, d, x, y, w, h, false);
else if (color >= 0)
{
#if XFT
- XftDrawRect (d, &r->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 (d.display->display, TGC, r->pix_colors[color]);
- XFillRectangle (d.display->display, d, TGC, x, y, w, h);
+ XSetForeground (disp, gc, term->pix_colors[color]);
+ XFillRectangle (disp, d, gc, x, y, w, h);
#endif
}
}
-#include "table/linedraw.h"
+/////////////////////////////////////////////////////////////////////////////
struct rxvt_font_default : rxvt_font {
struct rxvt_fontset *fs;
rxvt_fontprop p;
p.width = p.height = 1;
+ p.ascent = rxvt_fontprop::unset;
p.weight = rxvt_fontprop::medium;
p.slant = rxvt_fontprop::roman;
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;
return true;
}
- bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)
+ bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
{
careful = false;
if (unicode <= 0x009f)
return true;
- if (unicode >= 0x2500 && unicode <= 0x259f)
+#ifdef BUILTIN_GLYPHS
+ if (unicode >= 0x2500 && unicode <= 0x259f &&
+ !term->option (Opt_skipBuiltinGlyphs))
return true;
+#endif
if (IS_COMPOSE (unicode))
return true;
const text_t *text, int len,
int fg, int bg)
{
- Display *disp = d.display->display;
+ dTermDisplay;
+ dTermGC;
- clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
+ clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
- XSetForeground (disp, TGC, r->pix_colors[fg]);
+ XSetForeground (disp, gc, term->pix_colors[fg]);
while (len)
{
;
int width = text - tp;
- int fwidth = r->TermWin.fwidth * width;
+ 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);
int W = fwidth;
- int H = r->TermWin.fheight;
+ int H = term->fheight;
int x_[16];
int y_[16];
gcv.cap_style = CapButt;
gcv.line_width = 0;
- XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv);
+ XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
while (a < b)
{
switch (op)
{
case 0: // line
- XDrawLine (disp, d, TGC, x1, y1, x2, y2);
+ XDrawLine (disp, d, gc, x1, y1, x2, y2);
break;
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 (disp, d, bm + a * 2, 2, 2);
gcv.ts_x_origin = x;
gcv.ts_y_origin = y;
- XChangeGC (disp, TGC,
+ XChangeGC (disp, gc,
GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
&gcv);
}
- XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
+ XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
if (a)
{
XFreePixmap (disp, gcv.stipple);
gcv.stipple = 0;
gcv.fill_style = FillSolid;
- XChangeGC (disp, TGC, GCFillStyle, &gcv);
+ XChangeGC (disp, gc, GCFillStyle, &gcv);
}
break;
case 2: // arc
- XDrawArc (disp, d, TGC,
+ XDrawArc (disp, d, gc,
x1 - W/2, y1 - H/2, W-1, H-1,
(a - 1) * 90*64, (b - 1) * 90*64);
break;
}
}
}
+#else
+ if (0)
+ ;
+#endif
#if ENABLE_COMBINING
else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
{
+ min_it (width, 2); // we only support wcwidth up to 2
+
text_t chrs[2];
- width = min (2, width);
chrs [1] = NOCHAR;
*chrs = cc->c1;
? 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
break;
default:
- XDrawRectangle (disp, d, TGC, x + 2, y + 2,
- fwidth - 4, r->TermWin.fheight - 4);
+ XDrawRectangle (disp, d, gc, x + 2, y + 2,
+ fwidth - 4, term->fheight - 4);
}
x += fwidth;
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);
+ bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
void draw (rxvt_drawable &d, int x, int y,
const text_t *text, int len,
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, const char *property, const char *repl) const;
+ char *get_property (XFontStruct *f, Atom 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);
};
char *
-rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
+rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
{
unsigned long value;
- if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
- return XGetAtomName (DISPLAY, value);
+ if (XGetFontProperty (f, property, &value))
+ return XGetAtomName (term->dpy, value);
else
- return rxvt_strdup (repl);
+ return repl ? strdup (repl) : 0;
}
rxvt_fontprop
bool
rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
{
- p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
+ p.width = width != rxvt_fontprop::unset ? width
+ : avgwidth ? (avgwidth + 1) / 10
+ : (height + 1) / 2;
p.height = height;
+ p.ascent = rxvt_fontprop::unset;
p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
unsigned long height;
#if 0
- if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
+ if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
return false;
#else
height = f->ascent + f->descent;
#endif
unsigned long avgwidth;
- if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
+ if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
avgwidth = 0;
- char *weight = get_property (f, "WEIGHT_NAME", "medium");
- char *slant = get_property (f, "SLANT", "r");
+ char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
+ char *slant = get_property (f, term->xa [XA_SLANT], "r");
set_properties (p, height, weight, slant, avgwidth);
free (weight);
free (slant);
+ p.ascent = f->ascent;
+
return true;
}
bool
rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
{
+ dTermDisplay;
int slashes = 0;
const char *comp[13];
&& (*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);
+ XFontStruct *f = XLoadQueryFont (disp, name);
if (f)
{
// (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);
+ XFreeFont (disp, f);
return ret;
}
else
// 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)
{
- Display *disp = DISPLAY;
+ dTermDisplay;
clear ();
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 (!f)
return false;
- char *new_name = get_property (f, "FONT", name);
+ char *new_name = get_property (f, XA_FONT, name);
if (new_name)
set_name (new_name);
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
+ {
+ 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;
}
font_weight *best = fonts + count - 1;
for (font_weight *w = best; w-- > fonts; )
- if (w->diff < best->diff)
+ if (w->diff <= best->diff)
best = w;
if (!best->name
if (!f)
return false;
- char *registry = get_property (f, "CHARSET_REGISTRY", 0);
- char *encoding = get_property (f, "CHARSET_ENCODING", 0);
+ 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)
{
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, "FONT", 0);
+ const char *charset = get_property (f, XA_FONT, 0);
if (!charset)
charset = name;
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
slow = false;
#if 1 // only used for slow detection, TODO optimize
- if (f->min_bounds.width == f->max_bounds.width)
- width = f->min_bounds.width;
- else if (f->per_char == NULL)
+ if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
width = f->max_bounds.width;
else
{
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)
for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
{
- if (cs != CS_UNICODE
- && *t > 0x100
- && FROM_UNICODE (cs, *t) == NOCHAR)
+ if (FROM_UNICODE (cs, *t) == NOCHAR)
continue;
// ignore characters we wouldn't use anyways
int dir_ret, asc_ret, des_ret;
XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
- int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw;
-
- if (width < g.width) width = g.width;
- }
-
- if (cs == CS_UNKNOWN)
- {
- fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
+ int wcw = WCWIDTH (*t);
+ if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
- clear ();
- return false;
+ if (width < g.width) width = g.width;
}
#if 0 // do it per-character
{
if (f)
{
- XFreeFont (DISPLAY, f);
+ XFreeFont (term->dpy, f);
f = 0;
}
}
bool
-rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)
+rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
{
uint32_t ch = FROM_UNICODE (cs, unicode);
if (!prop || prop->width == rxvt_fontprop::unset)
return true;
- // check character against base font bounding box
- int w = xcs->width;
- int wcw = wcwidth (unicode);
- if (wcw > 0) w /= wcw;
+ // check wether character overlaps previous/next character
+ int w = xcs->rbearing - xcs->lbearing;
+ int wcw = max (WCWIDTH (unicode), 1);
- careful = w > prop->width;
- if (careful && w > prop->width * MAX_OVERLAP >> 2)
+ careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
+
+ if (careful && !OVERLAP_OK (w, wcw, prop))
return false;
return true;
// yet we are trying to be perfect /.
// but the result still isn't perfect /.
+ dTermDisplay;
+ dTermGC;
+
bool slow = this->slow
- || width != r->TermWin.fwidth
- || height != r->TermWin.fheight;
+ || width != term->fwidth
+ || height != term->fheight;
- int base = ascent; // sorry, incorrect: r->TermWin.fbase;
+ int base = ascent; // sorry, incorrect: term->fbase;
XGCValues v;
- v.foreground = r->pix_colors[fg];
+ v.foreground = term->pix_colors[fg];
v.font = f->fid;
if (enc2b)
if (bg == Color_bg && !slow)
{
- v.background = r->pix_colors[bg];
- XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
- XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
+ v.background = term->pix_colors[bg];
+ XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
+ XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
}
else
{
- clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
+ clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
+
+ XChangeGC (disp, 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, TGC, x, y + base, xc, 1);
+ XDrawString16 (disp, d, gc, x, y + base, xc, 1);
- x += r->TermWin.fwidth;
+ x += term->fwidth;
xc++; len--;
}
while (len);
}
else
- XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
+ XDrawString16 (disp, d, gc, x, y + base, xc, len);
}
}
else
if (bg == Color_bg && !slow)
{
- v.background = r->pix_colors[bg];
- XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
- XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
+ v.background = term->pix_colors[bg];
+ XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
+ XDrawImageString (disp, d, gc, x, y + base, xc, len);
}
else
{
- clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
+ clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
+
+ XChangeGC (disp, gc, GCForeground | GCFont, &v);
- XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
-
if (slow)
{
do
{
if (*xc)
- XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
+ XDrawString (disp, d, gc, x, y + base, xc, 1);
- x += r->TermWin.fwidth;
+ x += term->fwidth;
xc++; len--;
}
while (len);
}
else
- XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
+ XDrawString (disp, d, gc, x, y + base, xc, len);
}
}
}
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);
+ bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
protected:
XftFont *f;
{
if (f)
{
- XftFontClose (DISPLAY, f);
+ XftFontClose (term->dpy, f);
f = 0;
}
}
p.width = width;
p.height = height;
+ p.ascent = ascent;
p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
? rxvt_fontprop::bold : rxvt_fontprop::medium;
p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
}
bool
-rxvt_font_xft::load (const rxvt_fontprop &prop)
+rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
{
- Display *disp = DISPLAY;
+ dTermDisplay;
clear ();
FcValue v;
if (prop.height != rxvt_fontprop::unset
- || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
+ && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
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)
set_name ((char *)FcNameUnparse (p));
XftResult result;
- FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result);
+ FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
FcPatternDestroy (p);
XftUnlockFace (f);
+ int glheight = height;
+
for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
{
FcChar16 ch = *t;
XGlyphInfo g;
XftTextExtents16 (disp, f, &ch, 1, &g);
- int wcw = wcwidth (ch);
- if (wcw > 0) g.width = g.width / wcw;
+ g.width -= g.x;
+
+ int wcw = WCWIDTH (ch);
+ if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
- if (width < g.width) width = g.width;
- if (height < g.height) height = g.height;
+ if (width < g.width ) width = g.width;
+ if (height < g.height ) height = g.height;
+ if (glheight < g.height - g.y) glheight = g.height - g.y;
+ }
+
+ if (!width)
+ {
+ rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
+
+ XftFontClose (disp, f);
+ f = 0;
+
+ success = false;
+ break;
}
if (prop.height == rxvt_fontprop::unset
- || height <= prop.height
+ || (height <= prop.height && glheight <= prop.height)
|| height <= 2
|| !scalable)
break;
else
ftheight = prop.height - 1;
- XftFontClose (disp, f);
- FcPatternDel (match, FC_PIXEL_SIZE);
- FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
+ XftFontClose (disp, f);
+ FcPatternDel (match, FC_PIXEL_SIZE);
+ FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
}
FcPatternDestroy (match);
}
bool
-rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)
+rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
{
careful = false;
- if (!XftCharExists (DISPLAY, 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 (DISPLAY, f, &ch, 1, &g);
+ XftTextExtents32 (term->dpy, f, &ch, 1, &g);
+
+ int w = g.width - g.x;
+ int wcw = max (WCWIDTH (unicode), 1);
+
+ careful = g.x > 0 || w > prop->width * wcw;
- int w = g.width;
- int wcw = wcwidth (unicode);
- if (wcw > 0) w /= wcw;
+ if (careful && !OVERLAP_OK (w, wcw, prop))
+ return false;
- careful = w > prop->width;
- if (careful && w > prop->width * MAX_OVERLAP >> 2)
+ // this weeds out _totally_ broken fonts, or glyphs
+ if (!OVERLAP_OK (g.xOff, wcw, prop))
return false;
return true;
const text_t *text, int len,
int fg, int bg)
{
- clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
+ XGlyphInfo extents;
+ XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
+ XftGlyphSpec *ep = enc;
- int base = ascent; // should be fbase, but that is incorrect
+ dTermDisplay;
+ dTermGC;
- XGlyphInfo extents;
- FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32));
- FcChar32 *ep = enc;
- int ewidth = 0;
- int xoff = 0;
+ 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 = r->TermWin.fwidth;
+ int cwidth = term->fwidth;
FcChar32 fc = *text++; len--;
- FT_UInt gl;
while (len && *text == NOCHAR)
- text++, len--, cwidth += r->TermWin.fwidth;
-
- gl = XftCharIndex (d.display->display, f, fc);
- XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
+ text++, len--, cwidth += term->fwidth;
- if (extents.xOff != cwidth && ep != enc)
+ if (fc != ' ') // skip spaces
{
- if (xoff > ewidth) xoff = ewidth;
- XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
- x + (ewidth - xoff >> 1),
- y + base, enc, ep - enc);
- x += ewidth;
-
- ep = enc;
- ewidth = 0;
- xoff = 0;
- }
+ FT_UInt glyph = XftCharIndex (disp, f, fc);
+ XftGlyphExtents (disp, f, &glyph, 1, &extents);
- if (fc == ' ' && ep == enc) // skip leading spaces
- {
- x += cwidth;
- continue;
+ ep->glyph = glyph;
+ ep->x = x_ + (cwidth - extents.xOff >> 1);
+ ep->y = y_ + ascent;
+
+ if (extents.xOff == 0)
+ ep->x = x_ + cwidth;
+
+ ep++;
}
- else
+ x_ += cwidth;
+ }
+
+ if (buffered)
+ {
+ if (ep != enc)
{
- *ep++ = gl;
- ewidth += cwidth;
- xoff += extents.xOff;
+ 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);
}
-
- if (ep != enc)
+ else
{
- if (xoff > ewidth) xoff = ewidth;
- XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
- x + (ewidth - xoff >> 1),
- y + base, enc, ep - enc);
+ clear_rect (d, x, y, w, h, bg);
+ XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
}
}
+
#endif
/////////////////////////////////////////////////////////////////////////////
-rxvt_fontset::rxvt_fontset (rxvt_t r)
-: r (r), fontdesc (0)
+rxvt_fontset::rxvt_fontset (rxvt_term *term)
+: fontdesc (0), term (term)
{
clear ();
}
void
rxvt_fontset::clear ()
{
- prop.width = prop.height = prop.weight = prop.slant
+ 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 = "";
else
f = new rxvt_font_x11;
- f->set_term (r);
+ f->set_term (term);
f->set_name (strdup (name));
f->cs = cs;
do
{
- while (*desc <= ' ') desc++;
+ while (*desc && *desc <= ' ')
+ desc++;
codeset cs = CS_UNICODE;
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;
if (!realize_font (i))
goto next_font;
+
+ if (prop.ascent != rxvt_fontprop::unset)
+ max_it (f->ascent, prop.ascent);
}
if (f->cs == CS_UNKNOWN)
//FcPatternAddBool (p, FC_ANTIALIAS, 1);
XftResult result;
- FcPattern *match = XftFontMatch (DISPLAY, r->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