int descent;
short lbearing;
short rbearing;
- XftFont *set;
+ XftFont *match;
+ FcFontSet *set;
+ FcPattern *pattern;
} Font;
/* Drawing Context */
static void xdrawcursor(void);
static void xinit(void);
static void xloadcols(void);
+static int xloadfont(Font *, FcPattern *);
+static void xloadfonts(char *, int);
static void xresettitle(void);
static void xseturgency(int);
static void xsetsel(char*);
static void xtermclear(int, int, int, int);
+static void xunloadfonts(void);
static void xresize(int, int);
static void expose(XEvent *);
static char *kmap(KeySym, uint);
static void kpress(XEvent *);
static void cmessage(XEvent *);
-static void cresize(int width, int height);
+static void cresize(int, int);
static void resize(XEvent *);
static void focus(XEvent *);
static void brelease(XEvent *);
static ssize_t xwrite(int, char *, size_t);
static void *xmalloc(size_t);
static void *xrealloc(void *, size_t);
-static void *xcalloc(size_t nmemb, size_t size);
+static void *xcalloc(size_t, size_t);
static void (*handler[LASTEvent])(XEvent *) = {
[KeyPress] = kpress,
static char *usedfont = NULL;
static int usedfontsize = 0;
+/* Font Ring Cache */
+enum {
+ FRC_NORMAL,
+ FRC_ITALIC,
+ FRC_BOLD,
+ FRC_ITALICBOLD
+};
+
+typedef struct {
+ XftFont *font;
+ long c;
+ int flags;
+} Fontcache;
+
+/*
+ * Fontcache is a ring buffer, with frccur as current position and frclen as
+ * the current length of used elements.
+ */
+
+static Fontcache frc[1024];
+static int frccur = -1, frclen = 0;
+
ssize_t
xwrite(int fd, char *s, size_t len) {
size_t aux = len;
case 1:
term.c.attr.mode |= ATTR_BOLD;
break;
- case 3: /* enter standout (highlight) */
+ case 3:
term.c.attr.mode |= ATTR_ITALIC;
break;
case 4:
case 22:
term.c.attr.mode &= ~ATTR_BOLD;
break;
- case 23: /* leave standout (highlight) mode */
+ case 23:
term.c.attr.mode &= ~ATTR_ITALIC;
break;
case 24:
FcPattern *match;
FcResult result;
- match = XftFontMatch(xw.dpy, xw.scr, pattern, &result);
+ match = FcFontMatch(NULL, pattern, &result);
if(!match)
return 1;
- if(!(f->set = XftFontOpenPattern(xw.dpy, match))) {
+
+ if(!(f->set = FcFontSort(0, match, FcTrue, 0, &result))) {
+ FcPatternDestroy(match);
+ return 1;
+ }
+
+ if(!(f->match = XftFontOpenPattern(xw.dpy, match))) {
FcPatternDestroy(match);
return 1;
}
- f->ascent = f->set->ascent;
- f->descent = f->set->descent;
+ f->pattern = FcPatternDuplicate(pattern);
+
+ f->ascent = f->match->ascent;
+ f->descent = f->match->descent;
f->lbearing = 0;
- f->rbearing = f->set->max_advance_width;
+ f->rbearing = f->match->max_advance_width;
- f->height = f->set->height;
+ f->height = f->match->height;
f->width = f->lbearing + f->rbearing;
return 0;
}
}
+ FcConfigSubstitute(0, pattern, FcMatchPattern);
+ FcDefaultSubstitute(pattern);
+
if(xloadfont(&dc.font, pattern))
die("st: can't open font %s\n", fontstr);
FcPatternDestroy(pattern);
}
+void
+xunloadfonts(void)
+{
+ int i, ip;
+
+ /*
+ * Free the loaded fonts in the font cache. This is done backwards
+ * from the frccur.
+ */
+ for (i = 0, ip = frccur; i < frclen; i++, ip--) {
+ if (ip < 0)
+ ip = LEN(frc) - 1;
+ XftFontClose(xw.dpy, frc[ip].font);
+ }
+ frccur = -1;
+ frclen = 0;
+
+ XftFontClose(xw.dpy, dc.font.match);
+ FcPatternDestroy(dc.font.pattern);
+ FcFontSetDestroy(dc.font.set);
+ XftFontClose(xw.dpy, dc.bfont.match);
+ FcPatternDestroy(dc.bfont.pattern);
+ FcFontSetDestroy(dc.bfont.set);
+ XftFontClose(xw.dpy, dc.ifont.match);
+ FcPatternDestroy(dc.ifont.pattern);
+ FcFontSetDestroy(dc.ifont.set);
+ XftFontClose(xw.dpy, dc.ibfont.match);
+ FcPatternDestroy(dc.ibfont.pattern);
+ FcFontSetDestroy(dc.ibfont.set);
+}
+
void
xzoom(const Arg *arg)
{
+ xunloadfonts();
xloadfonts(usedfont, usedfontsize + arg->i);
cresize(0, 0);
draw();
xw.vis = XDefaultVisual(xw.dpy, xw.scr);
/* font */
+ if (!FcInit())
+ die("Could not init fontconfig.\n");
+
usedfont = (opt_font == NULL)? font : opt_font;
xloadfonts(usedfont, 0);
/* double buffering */
if(!XdbeQueryExtension(xw.dpy, &major, &minor))
die("Xdbe extension is not present\n");
- xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win, XdbeCopied);
+ xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win, XdbeBackground);
/* Xft rendering context */
xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
/* input methods */
- xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
- if(xw.xim == NULL)
- die("XOpenIM failed. Could not open input device.\n");
+ if((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
+ XSetLocaleModifiers("@im=local");
+ if((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
+ XSetLocaleModifiers("@im=");
+ if((xw.xim = XOpenIM(xw.dpy,
+ NULL, NULL, NULL)) == NULL) {
+ die("XOpenIM failed. Could not open input"
+ " device.\n");
+ }
+ }
+ }
xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
| XIMStatusNothing, XNClientWindow, xw.win,
XNFocusWindow, xw.win, NULL);
void
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
int winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch,
- width = charlen * xw.cw;
+ width = charlen * xw.cw, xp, i;
+ int frp, frcflags;
+ int u8fl, u8fblen, u8cblen, doesexist;
+ char *u8c, *u8fs;
+ long u8char;
Font *font = &dc.font;
- XGlyphInfo extents;
+ FcResult fcres;
+ FcPattern *fcpattern, *fontpattern;
+ FcFontSet *fcsets[] = { NULL };
+ FcCharSet *fccharset;
Colour *fg = &dc.col[base.fg], *bg = &dc.col[base.bg],
*temp, revfg, revbg;
XRenderColor colfg, colbg;
+ frcflags = FRC_NORMAL;
+
if(base.mode & ATTR_BOLD) {
if(BETWEEN(base.fg, 0, 7)) {
/* basic system colors */
* 252 - 255 – brightest colors in greyscale
*/
font = &dc.bfont;
+ frcflags = FRC_BOLD;
}
- if(base.mode & ATTR_ITALIC)
+ if(base.mode & ATTR_ITALIC) {
font = &dc.ifont;
- if((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD))
+ frcflags = FRC_ITALIC;
+ }
+ if((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD)) {
font = &dc.ibfont;
+ frcflags = FRC_ITALICBOLD;
+ }
if(IS_SET(MODE_REVERSE)) {
if(fg == &dc.col[defaultfg]) {
bg = temp;
}
- XftTextExtentsUtf8(xw.dpy, font->set, (FcChar8 *)s, bytelen,
- &extents);
- width = extents.xOff;
-
/* Intelligent cleaning up of the borders. */
if(x == 0) {
xclear(0, (y == 0)? 0 : winy, borderpx,
if(y == term.row-1)
xclear(winx, winy + xw.ch, winx + width, xw.h);
+ /* Clean up the region we want to draw to. */
XftDrawRect(xw.draw, bg, winx, winy, width, xw.ch);
+
+ fcsets[0] = font->set;
+ for (xp = winx; bytelen > 0;) {
+ /*
+ * Search for the range in the to be printed string of glyphs
+ * that are in the main font. Then print that range. If
+ * some glyph is found that is not in the font, do the
+ * fallback dance.
+ */
+ u8fs = s;
+ u8fblen = 0;
+ u8fl = 0;
+ for (;;) {
+ u8c = s;
+ u8cblen = utf8decode(s, &u8char);
+ s += u8cblen;
+ bytelen -= u8cblen;
+
+ doesexist = XftCharIndex(xw.dpy, font->match, u8char);
+ if (!doesexist || bytelen <= 0) {
+ if (bytelen <= 0) {
+ if (doesexist) {
+ u8fl++;
+ u8fblen += u8cblen;
+ }
+ }
+
+ if (u8fl > 0) {
+ XftDrawStringUtf8(xw.draw, fg,
+ font->match, xp,
+ winy + font->ascent,
+ (FcChar8 *)u8fs,
+ u8fblen);
+ xp += font->width * u8fl;
+ }
+ break;
+ }
+
+ u8fl++;
+ u8fblen += u8cblen;
+ }
+ if (doesexist)
+ break;
+
+ frp = frccur;
+ /* Search the font cache. */
+ for (i = 0; i < frclen; i++, frp--) {
+ if (frp <= 0)
+ frp = LEN(frc) - 1;
+
+ if (frc[frp].c == u8char
+ && frc[frp].flags == frcflags) {
+ break;
+ }
+ }
+
+ /* Nothing was found. */
+ if (i >= frclen) {
+ /*
+ * Nothing was found in the cache. Now use
+ * some dozen of Fontconfig calls to get the
+ * font for one single character.
+ */
+ fcpattern = FcPatternDuplicate(font->pattern);
+ fccharset = FcCharSetCreate();
+
+ FcCharSetAddChar(fccharset, u8char);
+ FcPatternAddCharSet(fcpattern, FC_CHARSET,
+ fccharset);
+ FcPatternAddBool(fcpattern, FC_SCALABLE,
+ FcTrue);
+
+ FcConfigSubstitute(0, fcpattern,
+ FcMatchPattern);
+ FcDefaultSubstitute(fcpattern);
+
+ fontpattern = FcFontSetMatch(0, fcsets,
+ FcTrue, fcpattern, &fcres);
+
+ /*
+ * Overwrite or create the new cache entry
+ * entry.
+ */
+ frccur++;
+ frclen++;
+ if (frccur >= LEN(frc))
+ frccur = 0;
+ if (frclen > LEN(frc)) {
+ frclen = LEN(frc);
+ XftFontClose(xw.dpy, frc[frccur].font);
+ }
+
+ frc[frccur].font = XftFontOpenPattern(xw.dpy,
+ fontpattern);
+ frc[frccur].c = u8char;
+ frc[frccur].flags = frcflags;
+
+ FcPatternDestroy(fcpattern);
+ FcCharSetDestroy(fccharset);
+
+ frp = frccur;
+ }
+
+ XftDrawStringUtf8(xw.draw, fg, frc[frp].font,
+ xp, winy + frc[frp].font->ascent,
+ (FcChar8 *)u8c, u8cblen);
+
+ xp += font->width;
+ }
+
+ /*
XftDrawStringUtf8(xw.draw, fg, font->set, winx,
winy + font->ascent, (FcChar8 *)s, bytelen);
+ */
if(base.mode & ATTR_UNDERLINE) {
XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1,