tonitch/st
1
0
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

This adds the fontcache dependency to try something out. Additionally the

Browse Source 
invert mode now works as expected. In the config.def.h autohint is set to
false, so the fonts are drawn correctly, without any overlapping.
This commit is contained in:
Christoph Lohmann
2012-10-04 22:59:45 +02:00
parent 0d88f1ef75
commit 2752018e27
3 changed files with 68 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.def.h
View File

@ -1,5 +1,5 @@
#define FONT "Liberation Mono:pixelsize=12:antialias=true:autohint=true" #define FONT "Liberation Mono:pixelsize=12:antialias=true:autohint=false"
/* Space in pixels around the terminal buffer */ /* Space in pixels around the terminal buffer */
#define BORDER 2 #define BORDER 2

2
config.mk
View File

@ -12,7 +12,7 @@ X11LIB = /usr/X11R6/lib
# includes and libs # includes and libs
INCS = -I. -I/usr/include -I${X11INC} -I/usr/include/freetype2 INCS = -I. -I/usr/include -I${X11INC} -I/usr/include/freetype2
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft -lfontconfig
# flags # flags
CPPFLAGS = -DVERSION=\"${VERSION}\" CPPFLAGS = -DVERSION=\"${VERSION}\"

94
st.c
View File

@ -26,6 +26,7 @@
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/extensions/Xdbe.h> #include <X11/extensions/Xdbe.h>
#include <X11/Xft/Xft.h> #include <X11/Xft/Xft.h>
#include <fontconfig/fontconfig.h>
#define Glyph Glyph_ #define Glyph Glyph_
#define Font Font_ #define Font Font_
@ -235,6 +236,8 @@ typedef struct {
/* Font structure */ /* Font structure */
typedef struct { typedef struct {
int height;
int width;
int ascent; int ascent;
int descent; int descent;
short lbearing; short lbearing;
@ -1345,7 +1348,7 @@ tsetmode(bool priv, bool set, int *args, int narg) {
case 1: /* DECCKM -- Cursor key */ case 1: /* DECCKM -- Cursor key */
MODBIT(term.mode, set, MODE_APPKEYPAD); MODBIT(term.mode, set, MODE_APPKEYPAD);
break; break;
case 5: /* DECSCNM -- Reverve video */ case 5: /* DECSCNM -- Reverse video */
mode = term.mode; mode = term.mode;
MODBIT(term.mode, set, MODE_REVERSE); MODBIT(term.mode, set, MODE_REVERSE);
if(mode != term.mode) if(mode != term.mode)
@ -1965,8 +1968,8 @@ xloadcols(void) {
} }
/* load colors [16-255] ; same colors as xterm */ /* load colors [16-255] ; same colors as xterm */
for(i = 16, r = 0; r < 6; r++) for(i = 16, r = 0; r < 6; r++) {
for(g = 0; g < 6; g++) for(g = 0; g < 6; g++) {
for(b = 0; b < 6; b++) { for(b = 0; b < 6; b++) {
xft_color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r; xft_color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
xft_color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g; xft_color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
@ -1976,12 +1979,13 @@ xloadcols(void) {
} }
i++; i++;
} }
}
}
for(r = 0; r < 24; r++, i++) { for(r = 0; r < 24; r++, i++) {
xft_color.red = xft_color.green = xft_color.blue = 0x0808 + 0x0a0a * r; xft_color.red = xft_color.green = xft_color.blue = 0x0808 + 0x0a0a * r;
if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color, &dc.xft_col[i])) { if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color, &dc.xft_col[i])) {
dc.xft_col[i] = dc.xft_col[256]; die("Could not allocate color %d\n", i);
fprintf(stderr, "Could not allocate color %d\n", i);
} }
} }
} }
@ -2045,15 +2049,29 @@ xhints(void) {
void void
xinitfont(Font *f, char *fontstr) { xinitfont(Font *f, char *fontstr) {
f->xft_set = XftFontOpenName(xw.dpy, xw.scr, fontstr); FcPattern *pattern, *match;
FcResult result;
if(!f->xft_set) pattern = FcNameParse((FcChar8 *)fontstr);
if(!pattern)
die("st: can't open font %s\n", fontstr);
match = XftFontMatch(xw.dpy, xw.scr, pattern, &result);
FcPatternDestroy(pattern);
if(!match)
die("st: can't open font %s\n", fontstr);
if(!(f->xft_set = XftFontOpenPattern(xw.dpy, match))) {
FcPatternDestroy(match);
die("st: can't open font %s.\n", fontstr); die("st: can't open font %s.\n", fontstr);
}
f->ascent = f->xft_set->ascent; f->ascent = f->xft_set->ascent;
f->descent = f->xft_set->descent; f->descent = f->xft_set->descent;
f->lbearing = 0; f->lbearing = 0;
f->rbearing = f->xft_set->max_advance_width; f->rbearing = f->xft_set->max_advance_width;
f->height = f->xft_set->height;
f->width = f->lbearing + f->rbearing;
} }
void void
@ -2061,6 +2079,8 @@ initfonts(char *fontstr) {
char *fstr; char *fstr;
xinitfont(&dc.font, fontstr); xinitfont(&dc.font, fontstr);
xw.cw = dc.font.width;
xw.ch = dc.font.height;
fstr = smstrcat(fontstr, ":weight=bold", NULL); fstr = smstrcat(fontstr, ":weight=bold", NULL);
xinitfont(&dc.bfont, fstr); xinitfont(&dc.bfont, fstr);
@ -2090,10 +2110,6 @@ xinit(void) {
/* font */ /* font */
initfonts((opt_font != NULL)? opt_font : FONT); initfonts((opt_font != NULL)? opt_font : FONT);
/* XXX: Assuming same size for bold font */
xw.cw = dc.font.rbearing - dc.font.lbearing;
xw.ch = dc.font.ascent + dc.font.descent;
/* colors */ /* colors */
xw.cmap = XDefaultColormap(xw.dpy, xw.scr); xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
xloadcols(); xloadcols();
@ -2166,37 +2182,59 @@ xinit(void) {
void void
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
int fg = base.fg, bg = base.bg, temp; int winx = BORDER+x*xw.cw, winy = BORDER+y*xw.ch,
int winx = BORDER+x*xw.cw, winy = BORDER+y*xw.ch + dc.font.ascent, width = charlen*xw.cw; width = charlen*xw.cw;
Font *font = &dc.font; Font *font = &dc.font;
XGlyphInfo extents; XGlyphInfo extents;
XftColor *fg = &dc.xft_col[base.fg], *bg = &dc.xft_col[base.bg],
/* only switch default fg/bg if term is in RV mode */ *temp, revfg, revbg;
if(IS_SET(MODE_REVERSE)) { XRenderColor colfg, colbg;
if(fg == DefaultFG)
fg = DefaultBG;
if(bg == DefaultBG)
bg = DefaultFG;
}
if(base.mode & ATTR_REVERSE) if(base.mode & ATTR_REVERSE)
temp = fg, fg = bg, bg = temp; temp = fg, fg = bg, bg = temp;
if(base.mode & ATTR_BOLD) {
if(base.mode & ATTR_BOLD) fg = &dc.xft_col[base.fg + 8];
font = &dc.bfont; font = &dc.bfont;
}
if(base.mode & ATTR_ITALIC) if(base.mode & ATTR_ITALIC)
font = &dc.ifont; font = &dc.ifont;
if(base.mode & (ATTR_ITALIC|ATTR_ITALIC)) if(base.mode & (ATTR_ITALIC|ATTR_ITALIC))
font = &dc.ibfont; font = &dc.ibfont;
XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen, &extents); if(IS_SET(MODE_REVERSE)) {
if(fg == &dc.xft_col[DefaultFG]) {
fg = &dc.xft_col[DefaultBG];
} else {
colfg.red = ~fg->color.red;
colfg.green = ~fg->color.green;
colfg.blue = ~fg->color.blue;
colfg.alpha = fg->color.alpha;
XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
fg = &revfg;
}
if(bg == &dc.xft_col[DefaultBG]) {
bg = &dc.xft_col[DefaultFG];
} else {
colbg.red = ~bg->color.red;
colbg.green = ~bg->color.green;
colbg.blue = ~bg->color.blue;
colbg.alpha = bg->color.alpha;
XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &revbg);
bg = &revbg;
}
}
XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen,
&extents);
width = extents.xOff; width = extents.xOff;
XftDrawRect(xw.xft_draw, &dc.xft_col[bg], winx, winy - font->ascent, width, xw.ch);
XftDrawStringUtf8(xw.xft_draw, &dc.xft_col[fg], font->xft_set, winx, winy, (FcChar8 *)s, bytelen); XftDrawRect(xw.xft_draw, bg, winx, winy, width, xw.ch);
XftDrawStringUtf8(xw.xft_draw, fg, font->xft_set, winx,
winy + font->ascent, (FcChar8 *)s, bytelen);
if(base.mode & ATTR_UNDERLINE) { if(base.mode & ATTR_UNDERLINE) {
XftDrawRect(xw.xft_draw, &dc.xft_col[fg], winx, winy+1, XftDrawRect(xw.xft_draw, fg, winx, winy+1,
width, 1); width, 1);
} }
} }