Jonathan Hodgson
5 years ago
parent
ba17528c63
commit
325809d127
10 changed files with 164 additions and 2303 deletions
@ -0,0 +1,128 @@ |
||||
#include <stdlib.h> |
||||
#include <stdio.h> |
||||
#include <math.h> |
||||
#include <X11/Xft/Xft.h> |
||||
#include <hb.h> |
||||
#include <hb-ft.h> |
||||
|
||||
#include "st.h" |
||||
|
||||
void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length); |
||||
hb_font_t *hbfindfont(XftFont *match); |
||||
|
||||
typedef struct { |
||||
XftFont *match; |
||||
hb_font_t *font; |
||||
} HbFontMatch; |
||||
|
||||
static int hbfontslen = 0; |
||||
static HbFontMatch *hbfontcache = NULL; |
||||
|
||||
void hbunloadfonts() { |
||||
for (int i = 0; i < hbfontslen; i++) |
||||
hb_font_destroy(hbfontcache[i].font); |
||||
|
||||
if (hbfontcache != NULL) { |
||||
free(hbfontcache); |
||||
hbfontcache = NULL; |
||||
} |
||||
hbfontslen = 0; |
||||
} |
||||
|
||||
hb_font_t *hbfindfont(XftFont *match) { |
||||
for (int i = 0; i < hbfontslen; i++) { |
||||
if (hbfontcache[i].match == match) |
||||
return hbfontcache[i].font; |
||||
} |
||||
|
||||
// Font not found in cache, caching it now.
|
||||
hbfontcache = realloc(hbfontcache, sizeof(HbFontMatch) * (hbfontslen + 1)); |
||||
FT_Face face = XftLockFace(match); |
||||
hb_font_t *font = hb_ft_font_create(face, NULL); |
||||
if (font == NULL) |
||||
die("Failed to load Harfbuzz font."); |
||||
XftUnlockFace(match); |
||||
|
||||
hbfontcache[hbfontslen].match = match; |
||||
hbfontcache[hbfontslen].font = font; |
||||
hbfontslen += 1; |
||||
|
||||
return font; |
||||
} |
||||
|
||||
void hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y) { |
||||
int start = 0, length = 1, gstart = 0; |
||||
hb_codepoint_t *codepoints = calloc(len, sizeof(hb_codepoint_t)); |
||||
|
||||
for (int idx = 1, specidx = 1; idx < len; idx++) { |
||||
if (glyphs[idx].mode & ATTR_WDUMMY) { |
||||
length += 1; |
||||
continue; |
||||
} |
||||
|
||||
if (specs[specidx].font != specs[start].font || ATTRCMP(glyphs[gstart], glyphs[idx]) || selected(x + idx, y) != selected(x + gstart, y)) { |
||||
hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length); |
||||
|
||||
// Reset the sequence.
|
||||
length = 1; |
||||
start = specidx; |
||||
gstart = idx; |
||||
} else { |
||||
length += 1; |
||||
} |
||||
|
||||
specidx++; |
||||
} |
||||
|
||||
// EOL.
|
||||
hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length); |
||||
|
||||
// Apply the transformation to glyph specs.
|
||||
for (int i = 0, specidx = 0; i < len; i++) { |
||||
if (glyphs[i].mode & ATTR_WDUMMY) |
||||
continue; |
||||
|
||||
if (codepoints[i] != specs[specidx].glyph) |
||||
((Glyph *)glyphs)[i].mode |= ATTR_LIGA; |
||||
|
||||
specs[specidx++].glyph = codepoints[i]; |
||||
} |
||||
|
||||
free(codepoints); |
||||
} |
||||
|
||||
void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length) { |
||||
hb_font_t *font = hbfindfont(xfont); |
||||
if (font == NULL) |
||||
return; |
||||
|
||||
Rune rune; |
||||
ushort mode = USHRT_MAX; |
||||
hb_buffer_t *buffer = hb_buffer_create(); |
||||
hb_buffer_set_direction(buffer, HB_DIRECTION_LTR); |
||||
|
||||
// Fill buffer with codepoints.
|
||||
for (int i = start; i < (start+length); i++) { |
||||
rune = string[i].u; |
||||
mode = string[i].mode; |
||||
if (mode & ATTR_WDUMMY) |
||||
rune = 0x0020; |
||||
hb_buffer_add_codepoints(buffer, &rune, 1, 0, 1); |
||||
} |
||||
|
||||
// Shape the segment.
|
||||
hb_shape(font, buffer, NULL, 0); |
||||
|
||||
// Get new glyph info.
|
||||
unsigned int len = hb_buffer_get_length(buffer); |
||||
hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL); |
||||
|
||||
// Write new codepoints.
|
||||
for (int i = 0; i < length; i++) { |
||||
hb_codepoint_t gid = info[i].codepoint; |
||||
codepoints[start+i] = gid; |
||||
} |
||||
|
||||
// Cleanup.
|
||||
hb_buffer_destroy(buffer); |
||||
} |
||||
@ -0,0 +1,7 @@ |
||||
#include <X11/Xft/Xft.h> |
||||
#include <hb.h> |
||||
#include <hb-ft.h> |
||||
|
||||
void hbunloadfonts(); |
||||
void hbtransform(XftGlyphFontSpec *, const Glyph *, int, int, int); |
||||
|
||||
@ -1,163 +0,0 @@ |
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 0e01717..e116631 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -82,6 +82,9 @@ char *termname = "st-256color";
|
||||
*/
|
||||
unsigned int tabspaces = 8;
|
||||
|
||||
+/* bg opacity */
|
||||
+float alpha = 0.8;
|
||||
+
|
||||
/* Terminal colors (16 first used in escape sequence) */
|
||||
static const char *colorname[] = {
|
||||
/* 8 normal colors */
|
||||
@@ -109,6 +112,7 @@ static const char *colorname[] = {
|
||||
/* more colors can be added after 255 to use with DefaultXX */
|
||||
"#cccccc",
|
||||
"#555555",
|
||||
+ "black",
|
||||
};
|
||||
|
||||
|
||||
@@ -117,7 +121,7 @@ static const char *colorname[] = {
|
||||
* foreground, background, cursor, reverse cursor
|
||||
*/
|
||||
unsigned int defaultfg = 7;
|
||||
-unsigned int defaultbg = 0;
|
||||
+unsigned int defaultbg = 258;
|
||||
static unsigned int defaultcs = 256;
|
||||
static unsigned int defaultrcs = 257;
|
||||
|
||||
diff --git a/config.mk b/config.mk
|
||||
index 0cbb002..1d2f0e2 100644
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -16,7 +16,7 @@ PKG_CONFIG = pkg-config
|
||||
INCS = -I$(X11INC) \
|
||||
`$(PKG_CONFIG) --cflags fontconfig` \
|
||||
`$(PKG_CONFIG) --cflags freetype2`
|
||||
-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
|
||||
+LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
|
||||
`$(PKG_CONFIG) --libs fontconfig` \
|
||||
`$(PKG_CONFIG) --libs freetype2`
|
||||
|
||||
diff --git a/st.h b/st.h
|
||||
index 38c61c4..b7634ab 100644
|
||||
--- a/st.h
|
||||
+++ b/st.h
|
||||
@@ -120,3 +120,4 @@ extern char *termname;
|
||||
extern unsigned int tabspaces;
|
||||
extern unsigned int defaultfg;
|
||||
extern unsigned int defaultbg;
|
||||
+extern float alpha;
|
||||
diff --git a/x.c b/x.c
|
||||
index 0422421..588dec3 100644
|
||||
--- a/x.c
|
||||
+++ b/x.c
|
||||
@@ -98,6 +98,7 @@ typedef struct {
|
||||
XSetWindowAttributes attrs;
|
||||
int scr;
|
||||
int isfixed; /* is fixed geometry? */
|
||||
+ int depth; /* bit depth */
|
||||
int l, t; /* left and top offset */
|
||||
int gm; /* geometry mask */
|
||||
} XWindow;
|
||||
@@ -229,6 +230,7 @@ static char *usedfont = NULL;
|
||||
static double usedfontsize = 0;
|
||||
static double defaultfontsize = 0;
|
||||
|
||||
+static char *opt_alpha = NULL;
|
||||
static char *opt_class = NULL;
|
||||
static char **opt_cmd = NULL;
|
||||
static char *opt_embed = NULL;
|
||||
@@ -688,7 +690,7 @@ xresize(int col, int row)
|
||||
|
||||
XFreePixmap(xw.dpy, xw.buf);
|
||||
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
||||
- DefaultDepth(xw.dpy, xw.scr));
|
||||
+ xw.depth);
|
||||
XftDrawChange(xw.draw, xw.buf);
|
||||
xclear(0, 0, win.w, win.h);
|
||||
|
||||
@@ -748,6 +750,13 @@ xloadcols(void)
|
||||
else
|
||||
die("could not allocate color %d\n", i);
|
||||
}
|
||||
+
|
||||
+ /* set alpha value of bg color */
|
||||
+ if (opt_alpha)
|
||||
+ alpha = strtof(opt_alpha, NULL);
|
||||
+ dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha);
|
||||
+ dc.col[defaultbg].pixel &= 0x00FFFFFF;
|
||||
+ dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24;
|
||||
loaded = 1;
|
||||
}
|
||||
|
||||
@@ -1004,11 +1013,23 @@ xinit(int cols, int rows)
|
||||
Window parent;
|
||||
pid_t thispid = getpid();
|
||||
XColor xmousefg, xmousebg;
|
||||
+ XWindowAttributes attr;
|
||||
+ XVisualInfo vis;
|
||||
|
||||
if (!(xw.dpy = XOpenDisplay(NULL)))
|
||||
die("can't open display\n");
|
||||
xw.scr = XDefaultScreen(xw.dpy);
|
||||
- xw.vis = XDefaultVisual(xw.dpy, xw.scr);
|
||||
+
|
||||
+ if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) {
|
||||
+ parent = XRootWindow(xw.dpy, xw.scr);
|
||||
+ xw.depth = 32;
|
||||
+ } else {
|
||||
+ XGetWindowAttributes(xw.dpy, parent, &attr);
|
||||
+ xw.depth = attr.depth;
|
||||
+ }
|
||||
+
|
||||
+ XMatchVisualInfo(xw.dpy, xw.scr, xw.depth, TrueColor, &vis);
|
||||
+ xw.vis = vis.visual;
|
||||
|
||||
/* font */
|
||||
if (!FcInit())
|
||||
@@ -1018,7 +1039,7 @@ xinit(int cols, int rows)
|
||||
xloadfonts(usedfont, 0);
|
||||
|
||||
/* colors */
|
||||
- xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
|
||||
+ xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None);
|
||||
xloadcols();
|
||||
|
||||
/* adjust fixed window geometry */
|
||||
@@ -1038,19 +1059,15 @@ xinit(int cols, int rows)
|
||||
| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
|
||||
xw.attrs.colormap = xw.cmap;
|
||||
|
||||
- if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
|
||||
- parent = XRootWindow(xw.dpy, xw.scr);
|
||||
xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
|
||||
- win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
|
||||
+ win.w, win.h, 0, xw.depth, InputOutput,
|
||||
xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
|
||||
| CWEventMask | CWColormap, &xw.attrs);
|
||||
|
||||
memset(&gcvalues, 0, sizeof(gcvalues));
|
||||
gcvalues.graphics_exposures = False;
|
||||
- dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
|
||||
- &gcvalues);
|
||||
- xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
||||
- DefaultDepth(xw.dpy, xw.scr));
|
||||
+ xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth);
|
||||
+ dc.gc = XCreateGC(xw.dpy, xw.buf, GCGraphicsExposures, &gcvalues);
|
||||
XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
|
||||
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
|
||||
|
||||
@@ -1894,6 +1911,9 @@ main(int argc, char *argv[])
|
||||
case 'a':
|
||||
allowaltscreen = 0;
|
||||
break;
|
||||
+ case 'A':
|
||||
+ opt_alpha = EARGF(usage());
|
||||
+ break;
|
||||
case 'c':
|
||||
opt_class = EARGF(usage());
|
||||
break;
|
||||
@ -1,123 +0,0 @@ |
||||
/* See LICENSE for license details. */ |
||||
|
||||
#include <stdint.h> |
||||
#include <sys/types.h> |
||||
|
||||
/* macros */ |
||||
#define MIN(a, b) ((a) < (b) ? (a) : (b)) |
||||
#define MAX(a, b) ((a) < (b) ? (b) : (a)) |
||||
#define LEN(a) (sizeof(a) / sizeof(a)[0]) |
||||
#define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b)) |
||||
#define DIVCEIL(n, d) (((n) + ((d) - 1)) / (d)) |
||||
#define DEFAULT(a, b) (a) = (a) ? (a) : (b) |
||||
#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x) |
||||
#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \ |
||||
(a).bg != (b).bg) |
||||
#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + \ |
||||
(t1.tv_nsec-t2.tv_nsec)/1E6) |
||||
#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit))) |
||||
|
||||
#define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b)) |
||||
#define IS_TRUECOL(x) (1 << 24 & (x)) |
||||
|
||||
enum glyph_attribute { |
||||
ATTR_NULL = 0, |
||||
ATTR_BOLD = 1 << 0, |
||||
ATTR_FAINT = 1 << 1, |
||||
ATTR_ITALIC = 1 << 2, |
||||
ATTR_UNDERLINE = 1 << 3, |
||||
ATTR_BLINK = 1 << 4, |
||||
ATTR_REVERSE = 1 << 5, |
||||
ATTR_INVISIBLE = 1 << 6, |
||||
ATTR_STRUCK = 1 << 7, |
||||
ATTR_WRAP = 1 << 8, |
||||
ATTR_WIDE = 1 << 9, |
||||
ATTR_WDUMMY = 1 << 10, |
||||
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT, |
||||
}; |
||||
|
||||
enum selection_mode { |
||||
SEL_IDLE = 0, |
||||
SEL_EMPTY = 1, |
||||
SEL_READY = 2 |
||||
}; |
||||
|
||||
enum selection_type { |
||||
SEL_REGULAR = 1, |
||||
SEL_RECTANGULAR = 2 |
||||
}; |
||||
|
||||
enum selection_snap { |
||||
SNAP_WORD = 1, |
||||
SNAP_LINE = 2 |
||||
}; |
||||
|
||||
typedef unsigned char uchar; |
||||
typedef unsigned int uint; |
||||
typedef unsigned long ulong; |
||||
typedef unsigned short ushort; |
||||
|
||||
typedef uint_least32_t Rune; |
||||
|
||||
#define Glyph Glyph_ |
||||
typedef struct { |
||||
Rune u; /* character code */ |
||||
ushort mode; /* attribute flags */ |
||||
uint32_t fg; /* foreground */ |
||||
uint32_t bg; /* background */ |
||||
} Glyph; |
||||
|
||||
typedef Glyph *Line; |
||||
|
||||
typedef union { |
||||
int i; |
||||
uint ui; |
||||
float f; |
||||
const void *v; |
||||
const char *s; |
||||
} Arg; |
||||
|
||||
void die(const char *, ...); |
||||
void redraw(void); |
||||
void draw(void); |
||||
|
||||
void printscreen(const Arg *); |
||||
void printsel(const Arg *); |
||||
void sendbreak(const Arg *); |
||||
void toggleprinter(const Arg *); |
||||
|
||||
int tattrset(int); |
||||
void tnew(int, int); |
||||
void tresize(int, int); |
||||
void tsetdirtattr(int); |
||||
void ttyhangup(void); |
||||
int ttynew(char *, char *, char *, char **); |
||||
size_t ttyread(void); |
||||
void ttyresize(int, int); |
||||
void ttywrite(const char *, size_t, int); |
||||
|
||||
void resettitle(void); |
||||
|
||||
void selclear(void); |
||||
void selinit(void); |
||||
void selstart(int, int, int); |
||||
void selextend(int, int, int, int); |
||||
int selected(int, int); |
||||
char *getsel(void); |
||||
|
||||
size_t utf8encode(Rune, char *); |
||||
|
||||
void *xmalloc(size_t); |
||||
void *xrealloc(void *, size_t); |
||||
char *xstrdup(char *); |
||||
|
||||
/* config.h globals */ |
||||
extern char *utmp; |
||||
extern char *stty_args; |
||||
extern char *vtiden; |
||||
extern wchar_t *worddelimiters; |
||||
extern int allowaltscreen; |
||||
extern char *termname; |
||||
extern unsigned int tabspaces; |
||||
extern unsigned int defaultfg; |
||||
extern unsigned int defaultbg; |
||||
Loading…
Reference in new issue