From 45c5e9b3c17142337d76b9c8bffecffd37ea6f9d Mon Sep 17 00:00:00 2001 From: tiyn Date: Tue, 22 Aug 2023 14:03:50 +0200 Subject: [PATCH 1/6] adding new readme --- README | 34 ---------------------------------- README.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 34 deletions(-) delete mode 100644 README create mode 100644 README.md diff --git a/README b/README deleted file mode 100644 index 6a846ed..0000000 --- a/README +++ /dev/null @@ -1,34 +0,0 @@ -st - simple terminal --------------------- -st is a simple terminal emulator for X which sucks less. - - -Requirements ------------- -In order to build st you need the Xlib header files. - - -Installation ------------- -Edit config.mk to match your local setup (st is installed into -the /usr/local namespace by default). - -Afterwards enter the following command to build and install st (if -necessary as root): - - make clean install - - -Running st ----------- -If you did not install st with make clean install, you must compile -the st terminfo entry with the following command: - - tic -sx st.info - -See the man page for additional details. - -Credits -------- -Based on Aurélien APTEL bt source code. - diff --git a/README.md b/README.md new file mode 100644 index 0000000..3ba1745 --- /dev/null +++ b/README.md @@ -0,0 +1,46 @@ +# st-0.9.0 + +This is my patched version of st. The base version is directly from suckless.org. +This belongs to my larbs installation script, but does not directly depend on it. +It is supposed to work in the environment after the larbs-base-installation. + +## Patches + +The list below shows the currently applied patches to the master branch. + +- st-anysize-20220718-baa9357.diff (st leaves no gaps if the height/width doesn't match a multiple of + character height) +- st-ligatures-scrollback-20230105-0.9.diff (scrollback compatible addition of ligatures) +- st-scrollback-0.8.5.diff (add scrollback functionality) + +## Hotkeys + +There are various shortcuts and hotkeys used in this version. Included in my build are the following. + +| ModKey | Shift | Key | Function | +| ------ | ----- | --------------- | --------------- | +| Alt | | Break | Send break | +| Alt | | Print | Toggle printer | +| Alt | | Print | Print screen | +| | Shift | Insert | Clipboard paste | +| Alt | | c | Clipboard copy | +| Alt | | v | Clipboard paste | +| Alt | | p | Selected paste | +| Alt | | NumLock | Toggle Numlock | +| Alt | | k | Scroll up | +| Alt | | j | Scroll down | +| | | MouseScrollUp | Scroll up | +| | | MouseScrollDown | Scroll down | +| Alt | Shift | u | Zoom in | +| Alt | Shift | i | Zoom out | + +## Installation + +To install this package you can run several commands. +If you want to use st with colored emojis make sure to install `libxft-bgra` +(`yay -S libxft-bgra` on arch based systems`). + +The most basic way is to clone the repository and then invoke make. + +- `git clone https://github.com/tiyn/st-0.9.0` +- `make clean install` From f2f92955cccb42236519c8d086d65d609f5bd905 Mon Sep 17 00:00:00 2001 From: tiyn Date: Tue, 22 Aug 2023 15:04:20 +0200 Subject: [PATCH 2/6] readme updated --- README.md | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 3ba1745..0000000 --- a/README.md +++ /dev/null @@ -1,46 +0,0 @@ -# st-0.9.0 - -This is my patched version of st. The base version is directly from suckless.org. -This belongs to my larbs installation script, but does not directly depend on it. -It is supposed to work in the environment after the larbs-base-installation. - -## Patches - -The list below shows the currently applied patches to the master branch. - -- st-anysize-20220718-baa9357.diff (st leaves no gaps if the height/width doesn't match a multiple of - character height) -- st-ligatures-scrollback-20230105-0.9.diff (scrollback compatible addition of ligatures) -- st-scrollback-0.8.5.diff (add scrollback functionality) - -## Hotkeys - -There are various shortcuts and hotkeys used in this version. Included in my build are the following. - -| ModKey | Shift | Key | Function | -| ------ | ----- | --------------- | --------------- | -| Alt | | Break | Send break | -| Alt | | Print | Toggle printer | -| Alt | | Print | Print screen | -| | Shift | Insert | Clipboard paste | -| Alt | | c | Clipboard copy | -| Alt | | v | Clipboard paste | -| Alt | | p | Selected paste | -| Alt | | NumLock | Toggle Numlock | -| Alt | | k | Scroll up | -| Alt | | j | Scroll down | -| | | MouseScrollUp | Scroll up | -| | | MouseScrollDown | Scroll down | -| Alt | Shift | u | Zoom in | -| Alt | Shift | i | Zoom out | - -## Installation - -To install this package you can run several commands. -If you want to use st with colored emojis make sure to install `libxft-bgra` -(`yay -S libxft-bgra` on arch based systems`). - -The most basic way is to clone the repository and then invoke make. - -- `git clone https://github.com/tiyn/st-0.9.0` -- `make clean install` From 38c5d4fd4c7b6f55cf95eba52f7da531cf1cea5f Mon Sep 17 00:00:00 2001 From: tiyn Date: Tue, 22 Aug 2023 15:05:07 +0200 Subject: [PATCH 3/6] readme updated --- README.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..6e00b07 --- /dev/null +++ b/README.md @@ -0,0 +1,46 @@ +# st + +This is my patched version of st. The base version is directly from suckless.org. +This belongs to my larbs installation script, but does not directly depend on it. +It is supposed to work in the environment after the larbs-base-installation. + +## Patches + +The list below shows the currently applied patches to the master branch. + +- st-anysize-20220718-baa9357.diff (st leaves no gaps if the height/width doesn't match a multiple of + character height) +- st-ligatures-scrollback-20230105-0.9.diff (scrollback compatible addition of ligatures) +- st-scrollback-0.8.5.diff (add scrollback functionality) + +## Hotkeys + +There are various shortcuts and hotkeys used in this version. Included in my build are the following. + +| ModKey | Shift | Key | Function | +| ------ | ----- | --------------- | --------------- | +| Alt | | Break | Send break | +| Alt | | Print | Toggle printer | +| Alt | | Print | Print screen | +| | Shift | Insert | Clipboard paste | +| Alt | | c | Clipboard copy | +| Alt | | v | Clipboard paste | +| Alt | | p | Selected paste | +| Alt | | NumLock | Toggle Numlock | +| Alt | | k | Scroll up | +| Alt | | j | Scroll down | +| | | MouseScrollUp | Scroll up | +| | | MouseScrollDown | Scroll down | +| Alt | Shift | u | Zoom in | +| Alt | Shift | i | Zoom out | + +## Installation + +To install this package you can run several commands. +If you want to use st with colored emojis make sure to install `libxft-bgra` +(`yay -S libxft-bgra` on arch based systems`). + +The most basic way is to clone the repository and then invoke make. + +- `git clone https://github.com/tiyn/st-0.9.0` +- `make clean install` From d6315b6054b10762a3533e6e64839790d854956b Mon Sep 17 00:00:00 2001 From: tiyn Date: Tue, 22 Aug 2023 15:05:24 +0200 Subject: [PATCH 4/6] readme updated --- README.md | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 6e00b07..0000000 --- a/README.md +++ /dev/null @@ -1,46 +0,0 @@ -# st - -This is my patched version of st. The base version is directly from suckless.org. -This belongs to my larbs installation script, but does not directly depend on it. -It is supposed to work in the environment after the larbs-base-installation. - -## Patches - -The list below shows the currently applied patches to the master branch. - -- st-anysize-20220718-baa9357.diff (st leaves no gaps if the height/width doesn't match a multiple of - character height) -- st-ligatures-scrollback-20230105-0.9.diff (scrollback compatible addition of ligatures) -- st-scrollback-0.8.5.diff (add scrollback functionality) - -## Hotkeys - -There are various shortcuts and hotkeys used in this version. Included in my build are the following. - -| ModKey | Shift | Key | Function | -| ------ | ----- | --------------- | --------------- | -| Alt | | Break | Send break | -| Alt | | Print | Toggle printer | -| Alt | | Print | Print screen | -| | Shift | Insert | Clipboard paste | -| Alt | | c | Clipboard copy | -| Alt | | v | Clipboard paste | -| Alt | | p | Selected paste | -| Alt | | NumLock | Toggle Numlock | -| Alt | | k | Scroll up | -| Alt | | j | Scroll down | -| | | MouseScrollUp | Scroll up | -| | | MouseScrollDown | Scroll down | -| Alt | Shift | u | Zoom in | -| Alt | Shift | i | Zoom out | - -## Installation - -To install this package you can run several commands. -If you want to use st with colored emojis make sure to install `libxft-bgra` -(`yay -S libxft-bgra` on arch based systems`). - -The most basic way is to clone the repository and then invoke make. - -- `git clone https://github.com/tiyn/st-0.9.0` -- `make clean install` From ff9b014af8648f1d0f1b28a49cfecb05e7973866 Mon Sep 17 00:00:00 2001 From: tiyn Date: Sun, 22 Oct 2023 05:36:36 +0200 Subject: [PATCH 5/6] updated gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index c6127b3..328aefa 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,5 @@ modules.order Module.symvers Mkfile.old dkms.conf + +st From f9a98e5a46b6d70b85f1a253eb908c940b9bb714 Mon Sep 17 00:00:00 2001 From: tiyn Date: Sun, 22 Oct 2023 05:38:52 +0200 Subject: [PATCH 6/6] added alpha patch --- config.def.h | 3 + config.mk | 2 +- st-alpha-20220206-0.8.5.diff | 146 +++++++++++++++++++++++++++++++++++ st.h | 1 + x.c | 40 +++++++--- 5 files changed, 181 insertions(+), 11 deletions(-) create mode 100644 st-alpha-20220206-0.8.5.diff diff --git a/config.def.h b/config.def.h index 91ab8ca..6af616e 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/config.mk b/config.mk index 1e306f8..47c615e 100644 --- a/config.mk +++ b/config.mk @@ -16,7 +16,7 @@ PKG_CONFIG = pkg-config INCS = -I$(X11INC) \ `$(PKG_CONFIG) --cflags fontconfig` \ `$(PKG_CONFIG) --cflags freetype2` -LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \ +LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\ `$(PKG_CONFIG) --libs fontconfig` \ `$(PKG_CONFIG) --libs freetype2` diff --git a/st-alpha-20220206-0.8.5.diff b/st-alpha-20220206-0.8.5.diff new file mode 100644 index 0000000..ab029f6 --- /dev/null +++ b/st-alpha-20220206-0.8.5.diff @@ -0,0 +1,146 @@ +diff --git a/config.def.h b/config.def.h +index 91ab8ca..6af616e 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/config.mk b/config.mk +index 4c4c5d5..0114bad 100644 +--- a/config.mk ++++ b/config.mk +@@ -16,7 +16,7 @@ PKG_CONFIG = pkg-config + INCS = -I$(X11INC) \ + `$(PKG_CONFIG) --cflags fontconfig` \ + `$(PKG_CONFIG) --cflags freetype2` +-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \ ++LIBS = -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 519b9bd..8bb533d 100644 +--- a/st.h ++++ b/st.h +@@ -126,3 +126,4 @@ extern unsigned int tabspaces; + extern unsigned int defaultfg; + extern unsigned int defaultbg; + extern unsigned int defaultcs; ++extern float alpha; +diff --git a/x.c b/x.c +index 8a16faa..ddf4178 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; +@@ -243,6 +244,7 @@ static char *usedfont = NULL; + static double usedfontsize = 0; + static double defaultfontsize = 0; + ++static char *opt_alpha = NULL; + static char *opt_class = NULL; + static char **opt_cmd = NULL; + static char *opt_embed = NULL; +@@ -736,7 +738,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); + +@@ -796,6 +798,13 @@ xloadcols(void) + else + die("could not allocate color %d\n", i); + } ++ ++ /* set alpha value of bg color */ ++ if (opt_alpha) ++ alpha = strtof(opt_alpha, NULL); ++ 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; + } + +@@ -1118,11 +1127,23 @@ xinit(int cols, int rows) + Window parent; + 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); ++ ++ if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) { ++ parent = XRootWindow(xw.dpy, xw.scr); ++ xw.depth = 32; ++ } else { ++ XGetWindowAttributes(xw.dpy, parent, &attr); ++ xw.depth = attr.depth; ++ } ++ ++ XMatchVisualInfo(xw.dpy, xw.scr, xw.depth, TrueColor, &vis); ++ xw.vis = vis.visual; + + /* font */ + if (!FcInit()) +@@ -1132,7 +1153,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 */ +@@ -1152,19 +1173,15 @@ xinit(int cols, int rows) + | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask; + xw.attrs.colormap = xw.cmap; + +- 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, xw.buf, GCGraphicsExposures, &gcvalues); + XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel); + XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h); + +@@ -2019,6 +2036,9 @@ main(int argc, char *argv[]) + case 'a': + allowaltscreen = 0; + break; ++ case 'A': ++ opt_alpha = EARGF(usage()); ++ break; + case 'c': + opt_class = EARGF(usage()); + break; diff --git a/st.h b/st.h index fd3b0d8..9f91e2a 100644 --- a/st.h +++ b/st.h @@ -124,3 +124,4 @@ extern unsigned int tabspaces; extern unsigned int defaultfg; extern unsigned int defaultbg; extern unsigned int defaultcs; +extern float alpha; diff --git a/x.c b/x.c index 2a3bd38..27e81d1 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; @@ -243,6 +244,7 @@ static char *usedfont = NULL; static double usedfontsize = 0; static double defaultfontsize = 0; +static char *opt_alpha = NULL; static char *opt_class = NULL; static char **opt_cmd = NULL; static char *opt_embed = NULL; @@ -752,7 +754,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 +814,13 @@ xloadcols(void) else die("could not allocate color %d\n", i); } + + /* set alpha value of bg color */ + if (opt_alpha) + alpha = strtof(opt_alpha, NULL); + 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; } @@ -1134,11 +1143,23 @@ xinit(int cols, int rows) Window parent; 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); + + if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) { + parent = XRootWindow(xw.dpy, xw.scr); + xw.depth = 32; + } else { + XGetWindowAttributes(xw.dpy, parent, &attr); + xw.depth = attr.depth; + } + + XMatchVisualInfo(xw.dpy, xw.scr, xw.depth, TrueColor, &vis); + xw.vis = vis.visual; /* font */ if (!FcInit()) @@ -1148,7 +1169,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,19 +1189,15 @@ xinit(int cols, int rows) | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask; xw.attrs.colormap = xw.cmap; - 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, xw.buf, GCGraphicsExposures, &gcvalues); XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel); XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h); @@ -2035,6 +2052,9 @@ main(int argc, char *argv[]) case 'a': allowaltscreen = 0; break; + case 'A': + opt_alpha = EARGF(usage()); + break; case 'c': opt_class = EARGF(usage()); break;