From 5cf1dc72f1a22ff6b2428d0f1f439f1c8d30c576 Mon Sep 17 00:00:00 2001 From: bd Date: Sat, 9 Mar 2024 22:21:34 -0700 Subject: Added alpha patch to dwm, minor cleanup --- .config/guix/modules/dwm/config.def.h | 27 +++++++++++----- .config/guix/modules/dwm/config.mk | 2 +- .config/guix/modules/dwm/drw.c | 26 ++++++++------- .config/guix/modules/dwm/drw.h | 9 ++++-- .config/guix/modules/dwm/dwm.c | 59 +++++++++++++++++++++++++++++++---- 5 files changed, 93 insertions(+), 30 deletions(-) (limited to '.config/guix') diff --git a/.config/guix/modules/dwm/config.def.h b/.config/guix/modules/dwm/config.def.h index 072754e..69625a4 100644 --- a/.config/guix/modules/dwm/config.def.h +++ b/.config/guix/modules/dwm/config.def.h @@ -12,15 +12,23 @@ static const char col_gray1[] = "#333333"; static const char col_gray2[] = "#666666"; static const char col_gray3[] = "#bbbbbb"; static const char col_gray4[] = "#ffffff"; -static const char col_black[] = "#000000"; +static const char col_black[] = "#000000"; +static const unsigned int baralpha = 0xd0; +static const unsigned int borderalpha = OPAQUE; static const char *colors[][3] = { /* fg bg border */ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, [SchemeSel] = { col_gray4, col_black, col_gray4 }, }; +static const unsigned int alphas[][3] = { + /* fg bg border*/ + [SchemeNorm] = { OPAQUE, baralpha, borderalpha }, + [SchemeSel] = { OPAQUE, baralpha, borderalpha }, +}; + /* tagging */ -static const char *tags[] = { "dev", "brw", "ws3", "ws4", "ws5", "ws6", "ws7", "ws8", "agd" }; +static const char *tags[] = { "dev", "brw", "wte", "ws4", "ws5", "ws6", "ws7", "vid", "agd" }; static const Rule rules[] = { /* xprop(1): @@ -29,7 +37,8 @@ static const Rule rules[] = { */ /* class instance title tags mask isfloating monitor */ { "Gimp", NULL, NULL, 0, 1, -1 }, - { "icecat", NULL, NULL, 1 << 8, 0, -1 }, + { "Icecat", NULL, NULL, 1 << 8, 0, -1 }, + { "mpv", NULL, NULL, 1 << 8, 0, -1 }, }; /* layout(s) */ @@ -66,7 +75,8 @@ static const char *slockcmd[] = { "slock", NULL }; static const char *flameselect[] = { "flameshot", "launcher", NULL }; static const char *flameall[] = { "flameshot", "full", NULL }; /* other applications */ -static const char *browsercmd[] = { "icecat", NULL }; +static const char *icecatcmd[] = { "icecat", NULL }; +static const char *chromiumcmd[] = { "chromium", "--incognito", NULL }; static const char *emacscmd[] = { "emacsclient", "-nc", NULL }; @@ -75,8 +85,9 @@ static const Key keys[] = { { MODKEY, XK_x, spawn, {.v = dmenucmd } }, { MODKEY|ShiftMask, XK_l, spawn, {.v = slockcmd } }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = emacscmd } }, - { MODKEY|ShiftMask, XK_b, spawn, {.v = browsercmd } }, - { MODKEY|ShiftMask, XK_o, spawn, SHCMD("xdotool type $(grep -v '^#' /home/bdunahu/Personal/scripts/bookmarks.txt | dmenu -i -l 12 | awk '{print $NF}')") }, + { MODKEY|ShiftMask, XK_b, spawn, {.v = icecatcmd } }, + { MODKEY|ShiftMask, XK_c, spawn, {.v = chromiumcmd } }, + { MODKEY|ShiftMask, XK_o, spawn, SHCMD("xdotool type $(grep -v '^#' /home/bdunahu/Personal/scripts/bookmarks.txt | dmenu -i -l 4 | awk '{print $NF}')") }, { MODKEY|ShiftMask, XK_p, spawn, SHCMD("passmenu --type") }, { 0, XK_Print, spawn, {.v = flameselect } }, { 0|ShiftMask, XK_Print, spawn, {.v = flameall } }, @@ -85,8 +96,8 @@ static const Key keys[] = { { MODKEY, XK_p, focusstack, {.i = -1 } }, { MODKEY, XK_i, incnmaster, {.i = +1 } }, { MODKEY, XK_u, incnmaster, {.i = -1 } }, - { MODKEY, XK_b, setmfact, {.f = -0.05} }, - { MODKEY, XK_f, setmfact, {.f = +0.05} }, + { MODKEY, XK_b, setmfact, {.f = -0.004} }, + { MODKEY, XK_f, setmfact, {.f = +0.004} }, { MODKEY, XK_Return, zoom, {0} }, { MODKEY, XK_Tab, view, {0} }, { MODKEY, XK_q, killclient, {0} }, diff --git a/.config/guix/modules/dwm/config.mk b/.config/guix/modules/dwm/config.mk index ba64d3d..d609c42 100644 --- a/.config/guix/modules/dwm/config.mk +++ b/.config/guix/modules/dwm/config.mk @@ -23,7 +23,7 @@ FREETYPEINC = /usr/include/freetype2 # includes and libs INCS = -I${X11INC} -I${FREETYPEINC} -LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} +LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXrender # flags CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} diff --git a/.config/guix/modules/dwm/drw.c b/.config/guix/modules/dwm/drw.c index a58a2b4..d18e8d8 100644 --- a/.config/guix/modules/dwm/drw.c +++ b/.config/guix/modules/dwm/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 @@ -181,21 +184,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; @@ -205,7 +209,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; } @@ -263,9 +267,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/.config/guix/modules/dwm/drw.h b/.config/guix/modules/dwm/drw.h index 6471431..2143533 100644 --- a/.config/guix/modules/dwm/drw.h +++ b/.config/guix/modules/dwm/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); @@ -39,8 +42,8 @@ unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int 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); diff --git a/.config/guix/modules/dwm/dwm.c b/.config/guix/modules/dwm/dwm.c index 49e89b5..135ddb6 100644 --- a/.config/guix/modules/dwm/dwm.c +++ b/.config/guix/modules/dwm/dwm.c @@ -56,6 +56,7 @@ #define HEIGHT(X) ((X)->h + 2 * (X)->bw) #define TAGMASK ((1 << LENGTH(tags)) - 1) #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) +#define OPAQUE 0xffU /* enums */ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ @@ -236,6 +237,7 @@ static Monitor *wintomon(Window w); static int xerror(Display *dpy, XErrorEvent *ee); static int xerrordummy(Display *dpy, XErrorEvent *ee); static int xerrorstart(Display *dpy, XErrorEvent *ee); +static void xinitvisual(); static void zoom(const Arg *arg); /* variables */ @@ -272,6 +274,11 @@ static Drw *drw; static Monitor *mons, *selmon; static Window root, wmcheckwin; +static int useargb = 0; +static Visual *visual; +static int depth; +static Colormap cmap; + /* configuration, allows nested code to access above variables */ #include "config.h" @@ -1602,7 +1609,8 @@ setup(void) sw = DisplayWidth(dpy, screen); sh = DisplayHeight(dpy, screen); root = RootWindow(dpy, screen); - drw = drw_create(dpy, screen, root, sw, sh); + xinitvisual(); + drw = drw_create(dpy, screen, root, sw, sh, visual, depth, cmap); if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) die("no fonts could be loaded."); lrpad = drw->fonts->h; @@ -1630,7 +1638,7 @@ setup(void) /* init appearance */ scheme = ecalloc(LENGTH(colors), sizeof(Clr *)); for (i = 0; i < LENGTH(colors); i++) - scheme[i] = drw_scm_create(drw, colors[i], 3); + scheme[i] = drw_scm_create(drw, colors[i], alphas[i], 3); /* init bars */ updatebars(); updatestatus(); @@ -1889,16 +1897,18 @@ updatebars(void) Monitor *m; XSetWindowAttributes wa = { .override_redirect = True, - .background_pixmap = ParentRelative, + .background_pixel = 0, + .border_pixel = 0, + .colormap = cmap, .event_mask = ButtonPressMask|ExposureMask }; XClassHint ch = {"dwm", "dwm"}; for (m = mons; m; m = m->next) { if (m->barwin) continue; - m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen), - CopyFromParent, DefaultVisual(dpy, screen), - CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa); + m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, depth, + InputOutput, visual, + CWOverrideRedirect|CWBackPixel|CWBorderPixel|CWColormap|CWEventMask, &wa); XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor); XMapRaised(dpy, m->barwin); XSetClassHint(dpy, m->barwin, &ch); @@ -2222,6 +2232,43 @@ xerrorstart(Display *dpy, XErrorEvent *ee) return -1; } +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); + } +} + void zoom(const Arg *arg) { -- cgit v1.2.3