sites

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit 0c650e039e6f77f42ebc7843faa72c85417d38fc
parent c3118691553b3e4683fa557eadcb742ac1a0f52f
Author: FRIGN <dev@frign.de>
Date:   Mon,  1 Jun 2015 18:30:53 +0200

Update argbbg patches (st)

I checked and found out the 0.5-patch didn't apply cleanly
(offsets) and manually reapplied the git-version.
Now it should apply to latest git without issues.

Diffstat:
Mst.suckless.org/patches/argbbg.md | 4+++-
Mst.suckless.org/patches/st-0.5-argbbg.diff | 13++++++-------
Ast.suckless.org/patches/st-git-20150601-argbbg.diff | 169+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 178 insertions(+), 8 deletions(-)

diff --git a/st.suckless.org/patches/argbbg.md b/st.suckless.org/patches/argbbg.md @@ -16,8 +16,10 @@ Note that **you need an X composite manager** to make this patch effective. (e.g * [st-0.4.1-argbbg.diff](st-0.4.1-argbbg.diff) * [st-0.5-argbbg.diff](st-0.5-argbbg.diff) * [st-git-20141122-argbbg.diff](st-git-20141122-argbbg.diff) + * [st-git-20150601-argbbg.diff](st-git-20150601-argbbg.diff) -## Author ## +## Authors ## * Eon S. Jeon - esjeon@hyunmu.am * pr - protodev@gmx.net (st-0.5 port) * Juan Aguilar - aritmeeul@gmail.com (st-git-20141122 port) + * Laslo Hunhold - dev@frign.de (st-git-20150601 port) diff --git a/st.suckless.org/patches/st-0.5-argbbg.diff b/st.suckless.org/patches/st-0.5-argbbg.diff @@ -1,8 +1,8 @@ diff --git a/config.def.h b/config.def.h -index d1c20bd..cc9f34d 100644 +index 58b470e..ce34f55 100644 --- a/config.def.h +++ b/config.def.h -@@ -25,6 +25,8 @@ static char termname[] = "st-256color"; +@@ -48,6 +48,8 @@ static char termname[] = "st-256color"; static unsigned int tabspaces = 8; @@ -11,7 +11,7 @@ index d1c20bd..cc9f34d 100644 /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { -@@ -52,6 +54,7 @@ static const char *colorname[] = { +@@ -75,6 +77,7 @@ static const char *colorname[] = { /* more colors can be added after 255 to use with DefaultXX */ "#cccccc", @@ -19,7 +19,7 @@ index d1c20bd..cc9f34d 100644 }; -@@ -60,7 +63,7 @@ static const char *colorname[] = { +@@ -83,7 +86,7 @@ static const char *colorname[] = { * foreground, background, cursor */ static unsigned int defaultfg = 7; @@ -29,7 +29,7 @@ index d1c20bd..cc9f34d 100644 /* diff --git a/config.mk b/config.mk -index 9431de2..0b92bf2 100644 +index 97afa2c..18aec14 100644 --- a/config.mk +++ b/config.mk @@ -14,7 +14,7 @@ X11LIB = /usr/X11R6/lib @@ -41,7 +41,6 @@ index 9431de2..0b92bf2 100644 `pkg-config --libs fontconfig` \ `pkg-config --libs freetype2` - diff --git a/st.c b/st.c index 392f12d..5b05a5f 100644 --- a/st.c @@ -123,7 +122,7 @@ index 392f12d..5b05a5f 100644 + break; + } + } -+ ++ + XFree(vis); + + if (! xw.vis) { diff --git a/st.suckless.org/patches/st-git-20150601-argbbg.diff b/st.suckless.org/patches/st-git-20150601-argbbg.diff @@ -0,0 +1,169 @@ +diff --git a/config.def.h b/config.def.h +index bb5596e..11ab57f 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -58,6 +58,8 @@ static char termname[] = "st-256color"; + + static unsigned int tabspaces = 8; + ++/* bg opacity */ ++static const int alpha = 0xdd; + + /* Terminal colors (16 first used in escape sequence) */ + static const char *colorname[] = { +@@ -85,6 +87,7 @@ static const char *colorname[] = { + + /* more colors can be added after 255 to use with DefaultXX */ + "#cccccc", ++ "black", + }; + + +@@ -93,7 +96,7 @@ static const char *colorname[] = { + * foreground, background, cursor + */ + static unsigned int defaultfg = 7; +-static unsigned int defaultbg = 0; ++static unsigned int defaultbg = 257; + static unsigned int defaultcs = 256; + + /* +diff --git a/config.mk b/config.mk +index 3026d87..f20d222 100644 +--- a/config.mk ++++ b/config.mk +@@ -14,7 +14,7 @@ X11LIB = /usr/X11R6/lib + INCS = -I. -I/usr/include -I${X11INC} \ + `pkg-config --cflags fontconfig` \ + `pkg-config --cflags freetype2` +-LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lrt -lX11 -lutil -lXext -lXft \ ++LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lrt -lX11 -lutil -lXext -lXft -lXrender\ + `pkg-config --libs fontconfig` \ + `pkg-config --libs freetype2` + +diff --git a/st.c b/st.c +index 3460a37..4561527 100644 +--- a/st.c ++++ b/st.c +@@ -61,6 +61,7 @@ char *argv0; + #define XK_ANY_MOD UINT_MAX + #define XK_NO_MOD 0 + #define XK_SWITCH_MOD (1<<13) ++#define OPAQUE 0Xff + + /* macros */ + #define MIN(a, b) ((a) < (b) ? (a) : (b)) +@@ -77,6 +78,7 @@ char *argv0; + #define IS_SET(flag) ((term.mode & (flag)) != 0) + #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 USE_ARGB (alpha != OPAQUE && opt_embed == NULL) + + #define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b)) + #define IS_TRUECOL(x) (1 << 24 & (x)) +@@ -265,6 +267,7 @@ typedef struct { + int w, h; /* window width and height */ + int ch; /* char height */ + int cw; /* char width */ ++ int depth; /* bit depth */ + char state; /* focus, redraw, visible */ + int cursor; /* cursor style */ + } XWindow; +@@ -2895,8 +2898,7 @@ xresize(int col, int row) { + xw.th = MAX(1, row * xw.ch); + + XFreePixmap(xw.dpy, xw.buf); +- xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h, +- DefaultDepth(xw.dpy, xw.scr)); ++ xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h, xw.depth); + XftDrawChange(xw.draw, xw.buf); + xclear(0, 0, xw.w, xw.h); + } +@@ -2910,6 +2912,13 @@ bool + xloadcolor(int i, const char *name, Color *ncolor) { + XRenderColor color = { .alpha = 0xffff }; + ++ /* set alpha value of bg color */ ++ if (USE_ARGB) { ++ dc.col[defaultbg].color.alpha = (0xffff * alpha) / OPAQUE; //0xcccc; ++ dc.col[defaultbg].pixel &= 0x00111111; ++ dc.col[defaultbg].pixel |= alpha << 24; // 0xcc000000; ++ } ++ + if(!name) { + if(BETWEEN(i, 16, 255)) { /* 256 color */ + if(i < 6*6*6+16) { /* same colors as xterm */ +@@ -3190,7 +3199,38 @@ xinit(void) { + 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()) +@@ -3200,7 +3240,10 @@ xinit(void) { + 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 */ +@@ -3223,16 +3266,17 @@ xinit(void) { + 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, +- xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput, ++ xw.w, xw.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, ++ xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h, xw.depth); ++ dc.gc = XCreateGC(xw.dpy, ++ (USE_ARGB)? xw.buf: parent, ++ GCGraphicsExposures, + &gcvalues); +- xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h, +- DefaultDepth(xw.dpy, xw.scr)); + XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel); + XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h); +