mirror of
https://gitlab.com/dwt1/dotfiles.git
synced 2023-02-13 20:55:19 -05:00
200 lines
5.5 KiB
Diff
Executable file
200 lines
5.5 KiB
Diff
Executable file
diff --git a/config.def.h b/config.def.h
|
|
index 0e01717..007fbd4 100644
|
|
--- a/config.def.h
|
|
+++ b/config.def.h
|
|
@@ -82,6 +82,9 @@ char *termname = "st-256color";
|
|
*/
|
|
unsigned int tabspaces = 8;
|
|
|
|
+/* bg opacity */
|
|
+unsigned int alpha = 0xcc;
|
|
+
|
|
/* 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 = 257;
|
|
static unsigned int defaultcs = 256;
|
|
static unsigned int defaultrcs = 257;
|
|
|
|
diff --git a/config.mk b/config.mk
|
|
index 5059632..1844c14 100644
|
|
--- a/config.mk
|
|
+++ b/config.mk
|
|
@@ -13,10 +13,10 @@ X11LIB = /usr/X11R6/lib
|
|
PKG_CONFIG = pkg-config
|
|
|
|
# includes and libs
|
|
-INCS = -I$(X11INC) \
|
|
+INCS = -I. -I/usr/include -I${X11INC} \
|
|
`$(PKG_CONFIG) --cflags fontconfig` \
|
|
`$(PKG_CONFIG) --cflags freetype2`
|
|
-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
|
|
+LIBS = -L/usr/lib -lc -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..935a9d3 100644
|
|
--- a/st.h
|
|
+++ b/st.h
|
|
@@ -118,5 +118,6 @@ extern char *worddelimiters;
|
|
extern int allowaltscreen;
|
|
extern char *termname;
|
|
extern unsigned int tabspaces;
|
|
+extern unsigned int alpha;
|
|
extern unsigned int defaultfg;
|
|
extern unsigned int defaultbg;
|
|
diff --git a/x.c b/x.c
|
|
index 0422421..441bada 100644
|
|
--- a/x.c
|
|
+++ b/x.c
|
|
@@ -48,6 +48,10 @@ typedef struct {
|
|
#define XK_NO_MOD 0
|
|
#define XK_SWITCH_MOD (1<<13)
|
|
|
|
+/* alpha */
|
|
+#define OPAQUE 0Xff
|
|
+#define USE_ARGB (alpha != OPAQUE && opt_embed == NULL)
|
|
+
|
|
/* function definitions used in config.h */
|
|
static void clipcopy(const Arg *);
|
|
static void clippaste(const Arg *);
|
|
@@ -98,6 +102,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;
|
|
@@ -688,7 +693,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 +753,14 @@ xloadcols(void)
|
|
else
|
|
die("could not allocate color %d\n", i);
|
|
}
|
|
+
|
|
+ /* set alpha value of bg color */
|
|
+ if (USE_ARGB) {
|
|
+ dc.col[defaultbg].color.alpha = alpha << 8;
|
|
+ dc.col[defaultbg].color.red = ((dc.col[defaultbg].color.red >> 8) * alpha / 255) << 8;
|
|
+ dc.col[defaultbg].color.green = ((dc.col[defaultbg].color.green >> 8) * alpha / 255) << 8;
|
|
+ dc.col[defaultbg].color.blue = ((dc.col[defaultbg].color.blue >> 8) * alpha / 255) << 8;
|
|
+ }
|
|
loaded = 1;
|
|
}
|
|
|
|
@@ -769,6 +782,17 @@ xsetcolorname(int x, const char *name)
|
|
return 0;
|
|
}
|
|
|
|
+void
|
|
+xtermclear(int col1, int row1, int col2, int row2)
|
|
+{
|
|
+ XftDrawRect(xw.draw,
|
|
+ &dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg],
|
|
+ borderpx + col1 * win.cw,
|
|
+ borderpx + row1 * win.ch,
|
|
+ (col2-col1+1) * win.cw,
|
|
+ (row2-row1+1) * win.ch);
|
|
+}
|
|
+
|
|
/*
|
|
* Absolute coordinates.
|
|
*/
|
|
@@ -1008,7 +1032,40 @@ xinit(int cols, int rows)
|
|
if (!(xw.dpy = XOpenDisplay(NULL)))
|
|
die("can't open display\n");
|
|
xw.scr = XDefaultScreen(xw.dpy);
|
|
- xw.vis = XDefaultVisual(xw.dpy, xw.scr);
|
|
+ xw.depth = (USE_ARGB) ? 32: XDefaultDepth(xw.dpy, xw.scr);
|
|
+ if (!USE_ARGB)
|
|
+ xw.vis = XDefaultVisual(xw.dpy, xw.scr);
|
|
+ else {
|
|
+ XVisualInfo *vis;
|
|
+ XRenderPictFormat *fmt;
|
|
+ int nvi;
|
|
+ int i;
|
|
+
|
|
+ XVisualInfo tpl = {
|
|
+ .screen = xw.scr,
|
|
+ .depth = 32,
|
|
+ .class = TrueColor
|
|
+ };
|
|
+
|
|
+ vis = XGetVisualInfo(xw.dpy,
|
|
+ VisualScreenMask | VisualDepthMask | VisualClassMask,
|
|
+ &tpl, &nvi);
|
|
+ xw.vis = NULL;
|
|
+ for (i = 0; i < nvi; i++) {
|
|
+ fmt = XRenderFindVisualFormat(xw.dpy, vis[i].visual);
|
|
+ if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) {
|
|
+ xw.vis = vis[i].visual;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ XFree(vis);
|
|
+
|
|
+ if (!xw.vis) {
|
|
+ fprintf(stderr, "Couldn't find ARGB visual.\n");
|
|
+ exit(1);
|
|
+ }
|
|
+ }
|
|
|
|
/* font */
|
|
if (!FcInit())
|
|
@@ -1018,7 +1075,11 @@ xinit(int cols, int rows)
|
|
xloadfonts(usedfont, 0);
|
|
|
|
/* colors */
|
|
- xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
|
|
+ if (!USE_ARGB)
|
|
+ xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
|
|
+ else
|
|
+ xw.cmap = XCreateColormap(xw.dpy, XRootWindow(xw.dpy, xw.scr),
|
|
+ xw.vis, None);
|
|
xloadcols();
|
|
|
|
/* adjust fixed window geometry */
|
|
@@ -1041,16 +1102,15 @@ xinit(int cols, int rows)
|
|
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, (USE_ARGB) ? xw.buf: parent,
|
|
+ GCGraphicsExposures, &gcvalues);
|
|
XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
|
|
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
|
|
|