TiynGER
9 months ago
7 changed files with 2363 additions and 12 deletions
Unified View
Diff Options
-
+5 -1config.def.h
-
+1 -1config.mk
-
+163 -0st-alpha-0.8.2.diff
-
+1 -0st.h
-
+123 -0st.h.orig
-
+30 -10x.c
-
+2040 -0x.c.orig
@ -0,0 +1,163 @@ |
|||||
|
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; |
||||
@ -0,0 +1,123 @@ |
|||||
|
/* 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; |
||||