From 22d52fbea5ba87d4fbc21502ff977675981a43e5 Mon Sep 17 00:00:00 2001 From: vxclutch Date: Sat, 6 Jun 2026 20:39:17 -0400 Subject: [PATCH] save --- config.def.h | 3 - config.def.h.orig | 3 + config.h | 40 ++++---- patches/st-alpha-20240814-a0274bc.diff | 129 ------------------------- x.c | 44 ++------- x.c.orig | 44 +++++++-- 6 files changed, 67 insertions(+), 196 deletions(-) delete mode 100644 patches/st-alpha-20240814-a0274bc.diff diff --git a/config.def.h b/config.def.h index 3601e41..4aadbbc 100644 --- a/config.def.h +++ b/config.def.h @@ -101,9 +101,6 @@ 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 */ diff --git a/config.def.h.orig b/config.def.h.orig index 4aadbbc..3601e41 100644 --- a/config.def.h.orig +++ b/config.def.h.orig @@ -101,6 +101,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 */ diff --git a/config.h b/config.h index 2ebfe3e..843a485 100644 --- a/config.h +++ b/config.h @@ -102,34 +102,34 @@ char *termname = "st-256color"; unsigned int tabspaces = 8; /* bg opacity */ -float alpha = 0.8; +float alpha = 1; /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { /* 8 normal colors */ - [0] = "#000000", - [1] = "#b83019", - [2] = "#51bf37", - [3] = "#c6c43d", - [4] = "#0c24bf", - [5] = "#b93ec1", - [6] = "#53c2c5", - [7] = "#c7c7c7", + [0] = "#141415", /* black -> bg */ + [1] = "#d8647e", /* red -> error */ + [2] = "#7fa563", /* green -> plus */ + [3] = "#f3be7c", /* yellow -> warning */ + [4] = "#6e94b2", /* blue -> keyword */ + [5] = "#bb9dbd", /* magenta -> parameter */ + [6] = "#b4d4cf", /* cyan -> builtin */ + [7] = "#cdcdcd", /* white -> fg */ /* 8 bright colors */ - [8] = "#676767", - [9] = "#ef766d", - [10] = "#8cf67a", - [11] = "#fefb7e", - [12] = "#6a71f6", - [13] = "#f07ef8", - [14] = "#8ef9fd", - [15] = "#feffff", + [8] = "#606079", /* bright black -> comment */ + [9] = "#f3be7c", /* bright red */ + [10] = "#9bb4bc", /* bright green -> type */ + [11] = "#e8b589", /* bright yellow -> string */ + [12] = "#7e98e8", /* bright blue -> hint */ + [13] = "#aeaed1", /* bright magenta -> constant */ + [14] = "#c3c3d5", /* bright cyan -> property */ + [15] = "#ffffff", /* bright white */ /* special colors */ - [256] = "#000000", /* background */ - [257] = "#f7f7f7", /* foreground */ - [258] = "#c7c7c7", /* cursor */ + [256] = "#141415", /* background */ + [257] = "#cdcdcd", /* foreground */ + [258] = "#878787", /* cursor */ }; /* diff --git a/patches/st-alpha-20240814-a0274bc.diff b/patches/st-alpha-20240814-a0274bc.diff deleted file mode 100644 index 6913d19..0000000 --- a/patches/st-alpha-20240814-a0274bc.diff +++ /dev/null @@ -1,129 +0,0 @@ -diff --git a/config.def.h b/config.def.h -index 2cd740a..019a4e1 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -93,6 +93,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 */ -diff --git a/x.c b/x.c -index d73152b..f32fd6c 100644 ---- a/x.c -+++ b/x.c -@@ -105,6 +105,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; -@@ -752,7 +753,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); - -@@ -812,6 +813,10 @@ xloadcols(void) - else - die("could not allocate color %d\n", i); - } -+ -+ 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; - } - -@@ -842,6 +847,12 @@ xsetcolorname(int x, const char *name) - XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]); - dc.col[x] = ncolor; - -+ if (x == defaultbg) { -+ dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha); -+ dc.col[defaultbg].pixel &= 0x00FFFFFF; -+ dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24; -+ } -+ - return 0; - } - -@@ -1134,11 +1145,25 @@ xinit(int cols, int rows) - Window parent, root; - 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); -+ -+ root = XRootWindow(xw.dpy, xw.scr); -+ if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) -+ parent = root; -+ -+ if (XMatchVisualInfo(xw.dpy, xw.scr, 32, TrueColor, &vis) != 0) { -+ xw.vis = vis.visual; -+ xw.depth = vis.depth; -+ } else { -+ XGetWindowAttributes(xw.dpy, parent, &attr); -+ xw.vis = attr.visual; -+ xw.depth = attr.depth; -+ } - - /* font */ - if (!FcInit()) -@@ -1148,7 +1173,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 */ -@@ -1168,11 +1193,8 @@ xinit(int cols, int rows) - | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask; - xw.attrs.colormap = xw.cmap; - -- root = XRootWindow(xw.dpy, xw.scr); -- if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) -- parent = root; -- xw.win = XCreateWindow(xw.dpy, root, xw.l, xw.t, -- win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput, -+ xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t, -+ win.w, win.h, 0, xw.depth, InputOutput, - xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity - | CWEventMask | CWColormap, &xw.attrs); - if (parent != root) -@@ -1183,7 +1205,7 @@ xinit(int cols, int rows) - dc.gc = XCreateGC(xw.dpy, xw.win, GCGraphicsExposures, - &gcvalues); - xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, -- DefaultDepth(xw.dpy, xw.scr)); -+ xw.depth); - XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel); - XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h); - -@@ -2047,6 +2069,10 @@ main(int argc, char *argv[]) - case 'a': - allowaltscreen = 0; - break; -+ case 'A': -+ alpha = strtof(EARGF(usage()), NULL); -+ LIMIT(alpha, 0.0, 1.0); -+ break; - case 'c': - opt_class = EARGF(usage()); - break; diff --git a/x.c b/x.c index 4223885..6f1bf8c 100644 --- a/x.c +++ b/x.c @@ -115,7 +115,6 @@ 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; @@ -834,7 +833,7 @@ xresize(int col, int row) XFreePixmap(xw.dpy, xw.buf); xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, - xw.depth); + DefaultDepth(xw.dpy, xw.scr)); XftDrawChange(xw.draw, xw.buf); xclear(0, 0, win.w, win.h); @@ -894,10 +893,6 @@ xloadcols(void) else die("could not allocate color %d\n", i); } - - 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; } @@ -928,12 +923,6 @@ xsetcolorname(int x, const char *name) XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]); dc.col[x] = ncolor; - if (x == defaultbg) { - dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha); - dc.col[defaultbg].pixel &= 0x00FFFFFF; - dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24; - } - return 0; } @@ -1227,25 +1216,11 @@ xinit(int cols, int rows) Window parent, root; 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); - - root = XRootWindow(xw.dpy, xw.scr); - if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) - parent = root; - - if (XMatchVisualInfo(xw.dpy, xw.scr, 32, TrueColor, &vis) != 0) { - xw.vis = vis.visual; - xw.depth = vis.depth; - } else { - XGetWindowAttributes(xw.dpy, parent, &attr); - xw.vis = attr.visual; - xw.depth = attr.depth; - } + xw.vis = XDefaultVisual(xw.dpy, xw.scr); /* font */ if (!FcInit()) @@ -1255,7 +1230,7 @@ xinit(int cols, int rows) xloadfonts(usedfont, 0); /* colors */ - xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None); + xw.cmap = XDefaultColormap(xw.dpy, xw.scr); xloadcols(); /* adjust fixed window geometry */ @@ -1275,8 +1250,11 @@ xinit(int cols, int rows) | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask; xw.attrs.colormap = xw.cmap; - xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t, - win.w, win.h, 0, xw.depth, InputOutput, + root = XRootWindow(xw.dpy, xw.scr); + if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) + parent = root; + xw.win = XCreateWindow(xw.dpy, root, xw.l, xw.t, + win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput, xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask | CWColormap, &xw.attrs); if (parent != root) @@ -1287,7 +1265,7 @@ xinit(int cols, int rows) dc.gc = XCreateGC(xw.dpy, xw.win, GCGraphicsExposures, &gcvalues); xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, - xw.depth); + DefaultDepth(xw.dpy, xw.scr)); XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel); XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h); @@ -2408,10 +2386,6 @@ main(int argc, char *argv[]) case 'a': allowaltscreen = 0; break; - case 'A': - alpha = strtof(EARGF(usage()), NULL); - LIMIT(alpha, 0.0, 1.0); - break; case 'c': opt_class = EARGF(usage()); break; diff --git a/x.c.orig b/x.c.orig index 6f1bf8c..4223885 100644 --- a/x.c.orig +++ b/x.c.orig @@ -115,6 +115,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; @@ -833,7 +834,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); @@ -893,6 +894,10 @@ xloadcols(void) else die("could not allocate color %d\n", i); } + + 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; } @@ -923,6 +928,12 @@ xsetcolorname(int x, const char *name) XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]); dc.col[x] = ncolor; + if (x == defaultbg) { + dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha); + dc.col[defaultbg].pixel &= 0x00FFFFFF; + dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24; + } + return 0; } @@ -1216,11 +1227,25 @@ xinit(int cols, int rows) Window parent, root; 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); + + root = XRootWindow(xw.dpy, xw.scr); + if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) + parent = root; + + if (XMatchVisualInfo(xw.dpy, xw.scr, 32, TrueColor, &vis) != 0) { + xw.vis = vis.visual; + xw.depth = vis.depth; + } else { + XGetWindowAttributes(xw.dpy, parent, &attr); + xw.vis = attr.visual; + xw.depth = attr.depth; + } /* font */ if (!FcInit()) @@ -1230,7 +1255,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 */ @@ -1250,11 +1275,8 @@ xinit(int cols, int rows) | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask; xw.attrs.colormap = xw.cmap; - root = XRootWindow(xw.dpy, xw.scr); - if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) - parent = root; - xw.win = XCreateWindow(xw.dpy, root, xw.l, xw.t, - win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput, + xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t, + win.w, win.h, 0, xw.depth, InputOutput, xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask | CWColormap, &xw.attrs); if (parent != root) @@ -1265,7 +1287,7 @@ xinit(int cols, int rows) dc.gc = XCreateGC(xw.dpy, xw.win, GCGraphicsExposures, &gcvalues); xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, - DefaultDepth(xw.dpy, xw.scr)); + xw.depth); XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel); XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h); @@ -2386,6 +2408,10 @@ main(int argc, char *argv[]) case 'a': allowaltscreen = 0; break; + case 'A': + alpha = strtof(EARGF(usage()), NULL); + LIMIT(alpha, 0.0, 1.0); + break; case 'c': opt_class = EARGF(usage()); break;