mirror of
https://github.com/bakkeby/patches
synced 2024-11-09 13:10:41 +00:00
308 lines
10 KiB
Diff
308 lines
10 KiB
Diff
From 6fefa32b0bd0d9bea51fe0ddaab2dcc717e549c5 Mon Sep 17 00:00:00 2001
|
|
From: bakkeby <bakkeby@gmail.com>
|
|
Date: Thu, 28 May 2020 16:58:12 +0200
|
|
Subject: [PATCH] Adding alpha patch
|
|
|
|
---
|
|
config.def.h | 10 +++++++++
|
|
config.mk | 6 ++++-
|
|
dmenu.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++------
|
|
drw.c | 26 ++++++++++++----------
|
|
drw.h | 9 +++++---
|
|
5 files changed, 90 insertions(+), 23 deletions(-)
|
|
|
|
diff --git a/config.def.h b/config.def.h
|
|
index 1edb647..4afa3c4 100644
|
|
--- a/config.def.h
|
|
+++ b/config.def.h
|
|
@@ -2,11 +2,21 @@
|
|
/* Default settings; can be overriden by command line. */
|
|
|
|
static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
|
|
+static double opacity = 1.0; /* -o option; defines alpha translucency */
|
|
/* -fn option overrides fonts[0]; default X11 font or font set */
|
|
static const char *fonts[] = {
|
|
"monospace:size=10"
|
|
};
|
|
static const char *prompt = NULL; /* -p option; prompt to the left of input field */
|
|
+
|
|
+static const unsigned int baralpha = 0xd0;
|
|
+static const unsigned int borderalpha = OPAQUE;
|
|
+static const unsigned int alphas[][3] = {
|
|
+ /* fg bg border */
|
|
+ [SchemeNorm] = { OPAQUE, baralpha, borderalpha },
|
|
+ [SchemeSel] = { OPAQUE, baralpha, borderalpha },
|
|
+};
|
|
+
|
|
static const char *colors[SchemeLast][2] = {
|
|
/* fg bg */
|
|
[SchemeNorm] = { "#bbbbbb", "#222222" },
|
|
diff --git a/config.mk b/config.mk
|
|
index 0929b4a..fe6d742 100644
|
|
--- a/config.mk
|
|
+++ b/config.mk
|
|
@@ -15,12 +15,16 @@ XINERAMAFLAGS = -DXINERAMA
|
|
# freetype
|
|
FREETYPELIBS = -lfontconfig -lXft
|
|
FREETYPEINC = /usr/include/freetype2
|
|
+
|
|
+# alpha
|
|
+XRENDERLIBS = -lXrender
|
|
+
|
|
# OpenBSD (uncomment)
|
|
#FREETYPEINC = $(X11INC)/freetype2
|
|
|
|
# includes and libs
|
|
INCS = -I$(X11INC) -I$(FREETYPEINC)
|
|
-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
|
|
+LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) ${XRENDERLIBS}
|
|
|
|
# flags
|
|
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
|
|
diff --git a/dmenu.c b/dmenu.c
|
|
index 65f25ce..e6df599 100644
|
|
--- a/dmenu.c
|
|
+++ b/dmenu.c
|
|
@@ -24,6 +24,8 @@
|
|
* MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
|
|
#define LENGTH(X) (sizeof X / sizeof X[0])
|
|
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
|
+#define OPAQUE 0xffU
|
|
+#define OPACITY "_NET_WM_WINDOW_OPACITY"
|
|
|
|
/* enums */
|
|
enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
|
|
@@ -50,6 +52,11 @@ static Display *dpy;
|
|
static Window root, parentwin, win;
|
|
static XIC xic;
|
|
|
|
+static int useargb = 0;
|
|
+static Visual *visual;
|
|
+static int depth;
|
|
+static Colormap cmap;
|
|
+
|
|
static Drw *drw;
|
|
static Clr *scheme[SchemeLast];
|
|
|
|
@@ -518,6 +525,43 @@ paste(void)
|
|
drawmenu();
|
|
}
|
|
|
|
+static void
|
|
+xinitvisual()
|
|
+{
|
|
+ XVisualInfo *infos;
|
|
+ XRenderPictFormat *fmt;
|
|
+ int nitems;
|
|
+ int i;
|
|
+
|
|
+ XVisualInfo tpl = {
|
|
+ .screen = screen,
|
|
+ .depth = 32,
|
|
+ .class = TrueColor
|
|
+ };
|
|
+ long masks = VisualScreenMask | VisualDepthMask | VisualClassMask;
|
|
+
|
|
+ infos = XGetVisualInfo(dpy, masks, &tpl, &nitems);
|
|
+ visual = NULL;
|
|
+ for(i = 0; i < nitems; i ++) {
|
|
+ fmt = XRenderFindVisualFormat(dpy, infos[i].visual);
|
|
+ if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) {
|
|
+ visual = infos[i].visual;
|
|
+ depth = infos[i].depth;
|
|
+ cmap = XCreateColormap(dpy, root, visual, AllocNone);
|
|
+ useargb = 1;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ XFree(infos);
|
|
+
|
|
+ if (! visual) {
|
|
+ visual = DefaultVisual(dpy, screen);
|
|
+ depth = DefaultDepth(dpy, screen);
|
|
+ cmap = DefaultColormap(dpy, screen);
|
|
+ }
|
|
+}
|
|
+
|
|
static void
|
|
readstdin(void)
|
|
{
|
|
@@ -602,7 +646,7 @@ setup(void)
|
|
#endif
|
|
/* init appearance */
|
|
for (j = 0; j < SchemeLast; j++)
|
|
- scheme[j] = drw_scm_create(drw, colors[j], 2);
|
|
+ scheme[j] = drw_scm_create(drw, colors[j], alphas[j], 2);
|
|
|
|
clip = XInternAtom(dpy, "CLIPBOARD", False);
|
|
utf8 = XInternAtom(dpy, "UTF8_STRING", False);
|
|
@@ -657,14 +701,14 @@ setup(void)
|
|
|
|
/* create menu window */
|
|
swa.override_redirect = True;
|
|
- swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
|
+ swa.background_pixel = 0;
|
|
+ swa.colormap = cmap;
|
|
swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
|
|
win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
|
|
- CopyFromParent, CopyFromParent, CopyFromParent,
|
|
- CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
|
|
+ depth, InputOutput, visual,
|
|
+ CWOverrideRedirect|CWBackPixel|CWBorderPixel|CWColormap|CWEventMask, &swa);
|
|
XSetClassHint(dpy, win, &ch);
|
|
|
|
-
|
|
/* input methods */
|
|
if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
|
|
die("XOpenIM failed: could not open input device");
|
|
@@ -690,7 +734,8 @@ static void
|
|
usage(void)
|
|
{
|
|
fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
|
|
- " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);
|
|
+ " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n"
|
|
+ " [ -o opacity]\n", stderr);
|
|
exit(1);
|
|
}
|
|
|
|
@@ -719,6 +764,8 @@ main(int argc, char *argv[])
|
|
lines = atoi(argv[++i]);
|
|
else if (!strcmp(argv[i], "-m"))
|
|
mon = atoi(argv[++i]);
|
|
+ else if (!strcmp(argv[i], "-o")) /* opacity */
|
|
+ opacity = atof(argv[++i]);
|
|
else if (!strcmp(argv[i], "-p")) /* adds prompt to left of input field */
|
|
prompt = argv[++i];
|
|
else if (!strcmp(argv[i], "-fn")) /* font or font set */
|
|
@@ -747,7 +794,8 @@ main(int argc, char *argv[])
|
|
if (!XGetWindowAttributes(dpy, parentwin, &wa))
|
|
die("could not get embedding window attributes: 0x%lx",
|
|
parentwin);
|
|
- drw = drw_create(dpy, screen, root, wa.width, wa.height);
|
|
+ xinitvisual();
|
|
+ drw = drw_create(dpy, screen, root, wa.width, wa.height, visual, depth, cmap);
|
|
if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
|
|
die("no fonts could be loaded.");
|
|
lrpad = drw->fonts->h;
|
|
diff --git a/drw.c b/drw.c
|
|
index 8fd1ca4..c202cb3 100644
|
|
--- a/drw.c
|
|
+++ b/drw.c
|
|
@@ -61,7 +61,7 @@ utf8decode(const char *c, long *u, size_t clen)
|
|
}
|
|
|
|
Drw *
|
|
-drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
|
|
+drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap)
|
|
{
|
|
Drw *drw = ecalloc(1, sizeof(Drw));
|
|
|
|
@@ -70,8 +70,11 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
|
|
drw->root = root;
|
|
drw->w = w;
|
|
drw->h = h;
|
|
- drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
|
|
- drw->gc = XCreateGC(dpy, root, 0, NULL);
|
|
+ drw->visual = visual;
|
|
+ drw->depth = depth;
|
|
+ drw->cmap = cmap;
|
|
+ drw->drawable = XCreatePixmap(dpy, root, w, h, depth);
|
|
+ drw->gc = XCreateGC(dpy, drw->drawable, 0, NULL);
|
|
XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
|
|
|
|
return drw;
|
|
@@ -87,7 +90,7 @@ drw_resize(Drw *drw, unsigned int w, unsigned int h)
|
|
drw->h = h;
|
|
if (drw->drawable)
|
|
XFreePixmap(drw->dpy, drw->drawable);
|
|
- drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
|
|
+ drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, drw->depth);
|
|
}
|
|
|
|
void
|
|
@@ -193,21 +196,22 @@ drw_fontset_free(Fnt *font)
|
|
}
|
|
|
|
void
|
|
-drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
|
|
+drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha)
|
|
{
|
|
if (!drw || !dest || !clrname)
|
|
return;
|
|
|
|
- if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
|
|
- DefaultColormap(drw->dpy, drw->screen),
|
|
+ if (!XftColorAllocName(drw->dpy, drw->visual, drw->cmap,
|
|
clrname, dest))
|
|
die("error, cannot allocate color '%s'", clrname);
|
|
+
|
|
+ dest->pixel = (dest->pixel & 0x00ffffffU) | (alpha << 24);
|
|
}
|
|
|
|
/* Wrapper to create color schemes. The caller has to call free(3) on the
|
|
* returned color scheme when done using it. */
|
|
Clr *
|
|
-drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
|
|
+drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount)
|
|
{
|
|
size_t i;
|
|
Clr *ret;
|
|
@@ -217,7 +221,7 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
|
|
return NULL;
|
|
|
|
for (i = 0; i < clrcount; i++)
|
|
- drw_clr_create(drw, &ret[i], clrnames[i]);
|
|
+ drw_clr_create(drw, &ret[i], clrnames[i], alphas[i]);
|
|
return ret;
|
|
}
|
|
|
|
@@ -273,9 +277,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
|
|
} else {
|
|
XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
|
|
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
|
|
- d = XftDrawCreate(drw->dpy, drw->drawable,
|
|
- DefaultVisual(drw->dpy, drw->screen),
|
|
- DefaultColormap(drw->dpy, drw->screen));
|
|
+ d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap);
|
|
x += lpad;
|
|
w -= lpad;
|
|
}
|
|
diff --git a/drw.h b/drw.h
|
|
index 4c67419..4f66f0d 100644
|
|
--- a/drw.h
|
|
+++ b/drw.h
|
|
@@ -20,6 +20,9 @@ typedef struct {
|
|
Display *dpy;
|
|
int screen;
|
|
Window root;
|
|
+ Visual *visual;
|
|
+ unsigned int depth;
|
|
+ Colormap cmap;
|
|
Drawable drawable;
|
|
GC gc;
|
|
Clr *scheme;
|
|
@@ -27,7 +30,7 @@ typedef struct {
|
|
} Drw;
|
|
|
|
/* Drawable abstraction */
|
|
-Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
|
|
+Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap);
|
|
void drw_resize(Drw *drw, unsigned int w, unsigned int h);
|
|
void drw_free(Drw *drw);
|
|
|
|
@@ -38,8 +41,8 @@ unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
|
|
void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
|
|
|
|
/* Colorscheme abstraction */
|
|
-void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
|
|
-Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
|
|
+void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha);
|
|
+Clr *drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount);
|
|
|
|
/* Cursor abstraction */
|
|
Cur *drw_cur_create(Drw *drw, int shape);
|
|
--
|
|
2.17.1
|
|
|