Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (97f621760228284eda6d840add9a329abdf564e4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (97f621760228284eda6d840add9a329abdf564e4)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (97f621760228284eda6d840add9a329abdf564e4)
  • Date: Thu, 6 Oct 2022 02:55:37 +0000
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

shell-term-fm/st/DETAILS | 4 ++--
shell-term-fm/st/HISTORY | 2 ++
shell-term-fm/st/PREPARE | 8 ++++----
shell-term-fm/st/PRE_BUILD | 29
+++++++++++++++++++++++++----
shell-term-fm/st/alpha_hidecursor.patch | 13 +++++++++++++
shell-term-fm/st/alpha_xr.patch | 19 +++++++++++++++++++
shell-term-fm/st/alpha_xr_hidecursor.patch | 19 +++++++++++++++++++
shell-term-fm/st/scrollback_copyurl.patch | 15 +++++++++++++++
shell-term-fm/st/undercurl.patch | 11 +++++++++++
9 files changed, 110 insertions(+), 10 deletions(-)

New commits:
commit 97f621760228284eda6d840add9a329abdf564e4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

st: handle all patch combinations

diff --git a/shell-term-fm/st/DETAILS b/shell-term-fm/st/DETAILS
index 548a3a5..032699a 100755
--- a/shell-term-fm/st/DETAILS
+++ b/shell-term-fm/st/DETAILS
@@ -38,7 +38,7 @@ if [[ $ST_UNDERCURL == y ]]; then
SOURCE8_URL[0]=https://st.suckless.org/patches/undercurl/${SOURCE8}

SOURCE8_HASH=sha512:8d22d10839df6e30460ee4c1a3fd9b1fe89e87685bf82c1a7bea8cba913516e14a55db29065ff047eb83cb90b0866d3a8b3b854754dbf8132ff59679e0eef314
fi
-if [[ $ST_XRESOURCES == y ]]; then
+if [[ $ST_XRESOURCES == "original" ]]; then
SOURCE9=${SPELL}-xresources-20200604-9ba7ecf.diff
SOURCE9_URL[0]=https://st.suckless.org/patches/xresources/${SOURCE9}

SOURCE9_HASH=sha512:1d3a9e780e76b19ea123948973d80d8c1f5a691c31c3e45ac62813d7d6b1c82fc3c170e7437615b4555d078835bc8065a06b758a9177b327119cf645f5d05736
@@ -63,7 +63,7 @@ if [[ $ST_SCROLLBACK_MOUSE_ALTSCREEN == y ]]; then
SOURCE13_URL[0]=https://st.suckless.org/patches/scrollback/${SOURCE13}

SOURCE13_HASH=sha512:f0cdce2c8b05abbb5228edb0fdda1b8e30991bc688dd7fb53edc61f76a688cb4df5d23af2cc93c878185324e103d7a5ff591153a2d29215e65d36115a082f76f
fi
-if [[ $ST_XRESOURCES_SIGNAL_RELOADING == y ]]; then
+if [[ $ST_XRESOURCES == "signal-reloading" ]]; then
SOURCE14=${SPELL}-xresources-signal-reloading-20220407-ef05519.diff

SOURCE14_URL[0]=https://st.suckless.org/patches/xresources-with-reload-signal/${SOURCE14}

SOURCE14_HASH=sha512:0ed790b18ff92d3f2bbc3635b396fc2a1858d2e63d24ccc69af3d4360c2ec0cd41b6acb7cce3316ccc6d7a5ef8a34fdd8b7af434c98c75f7ece1675280176879
diff --git a/shell-term-fm/st/HISTORY b/shell-term-fm/st/HISTORY
index bdf1a22..5c11dec 100644
--- a/shell-term-fm/st/HISTORY
+++ b/shell-term-fm/st/HISTORY
@@ -4,6 +4,8 @@
* PRE_BUILD: rewritten
* PREPARE: added, for optional patch support
* {blinking_cursor,scrollback_lsd}.patch: added, for 0.9 transition
+ * alpha_{hidecursor,xr,xr_hidecursor}.patch, scrollback_copyurl.patch,
+ undercurl.patch: added, for combination handling

2022-08-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: added alpha, scrollback and xresources with reload signal
diff --git a/shell-term-fm/st/PREPARE b/shell-term-fm/st/PREPARE
index 0e90ae1..9d40d61 100755
--- a/shell-term-fm/st/PREPARE
+++ b/shell-term-fm/st/PREPARE
@@ -6,11 +6,11 @@ config_query ST_DESKTOPENTRY "Apply st desktopentry patch?"
n &&
config_query ST_SYNC "Apply st sync patch?" n &&
config_query ST_UNDERCURL "Apply st undercurl patch?" n &&
config_query ST_ALPHA "Apply st alpha patch?" n &&
-config_query ST_XRESOURCES "Apply st xresources patch?" n &&

-if [[ $ST_XRESOURCES == n ]]; then
- config_query ST_XRESOURCES_SIGNAL_RELOADING "Apply st xresources with
signal reloading patch?" n
-fi &&
+config_query_list ST_XRESOURCES "Apply st xresources patch?" \
+ none \
+ original \
+ signal-reloading &&

config_query ST_SCROLLBACK "Apply st scrollback patch?" n &&

diff --git a/shell-term-fm/st/PRE_BUILD b/shell-term-fm/st/PRE_BUILD
index e7e7650..8004f92 100755
--- a/shell-term-fm/st/PRE_BUILD
+++ b/shell-term-fm/st/PRE_BUILD
@@ -43,10 +43,13 @@ fi &&
if [[ $ST_UNDERCURL == y ]]; then
verify_file 8 &&

- patch -p1 < "${SOURCE_CACHE}/${SOURCE8}" || exit 1
+ cat ${SOURCE_CACHE}/${SOURCE8} > "${SOURCE_DIRECTORY}/${SOURCE8}" &&
+ patch -p0 < "${SPELL_DIRECTORY}/undercurl.patch" &&
+
+ patch -p1 < "${SOURCE_DIRECTORY}/${SOURCE8}" || exit 1
fi &&

-if [[ $ST_XRESOURCES == y ]]; then
+if [[ $ST_XRESOURCES == "original" ]]; then
verify_file 9 &&

patch -p1 < "${SOURCE_CACHE}/${SOURCE9}" || exit 1
@@ -55,7 +58,21 @@ fi &&
if [[ $ST_ALPHA == y ]]; then
verify_file 10 &&

- patch -p1 < "${SOURCE_CACHE}/${SOURCE10}" || exit 1
+ cat ${SOURCE_CACHE}/${SOURCE10} > "${SOURCE_DIRECTORY}/${SOURCE10}" &&
+
+ if [[ $ST_HIDECURSOR == y ]]; then
+ patch -p0 < "${SPELL_DIRECTORY}/alpha_hidecursor.patch" || exit 1
+ fi &&
+
+ if [[ $ST_XRESOURCES == "original" ]]; then
+ if [[ $ST_HIDECURSOR == y ]]; then
+ patch -p0 < "${SPELL_DIRECTORY}/alpha_xr_hidecursor.patch" || exit 1
+ else
+ patch -p0 < "${SPELL_DIRECTORY}/alpha_xr.patch" || exit 1
+ fi
+ fi &&
+
+ patch -p1 < "${SOURCE_DIRECTORY}/${SOURCE10}" || exit 1
fi &&

if [[ $ST_SCROLLBACK == y ]]; then
@@ -63,6 +80,10 @@ if [[ $ST_SCROLLBACK == y ]]; then

cat ${SOURCE_CACHE}/${SOURCE11} > "${SOURCE_DIRECTORY}/${SOURCE11}" &&

+ if [[ $ST_COPYURL == y ]]; then
+ patch -p0 < "${SPELL_DIRECTORY}/scrollback_copyurl.patch" || exit 1
+ fi &&
+
if [[ $ST_LINE_SNAP_DELIMITER == y ]]; then
patch -p0 < "${SPELL_DIRECTORY}/scrollback_lsd.patch" || exit 1
fi &&
@@ -82,7 +103,7 @@ if [[ $ST_SCROLLBACK_MOUSE_ALTSCREEN == y ]]; then
patch -p1 < "${SOURCE_CACHE}/${SOURCE13}" || exit 1
fi &&

-if [[ $ST_XRESOURCES_SIGNAL_RELOADING == y ]]; then
+if [[ $ST_XRESOURCES == "signal-reloading" ]]; then
verify_file 14 &&

patch -p1 < "${SOURCE_CACHE}/${SOURCE14}" &&
diff --git a/shell-term-fm/st/alpha_hidecursor.patch
b/shell-term-fm/st/alpha_hidecursor.patch
new file mode 100644
index 0000000..9224cee
--- /dev/null
+++ b/shell-term-fm/st/alpha_hidecursor.patch
@@ -0,0 +1,13 @@
+--- st-alpha-20220206-0.8.5.diff.orig 2022-10-05 18:55:46.207077229 -0700
++++ st-alpha-20220206-0.8.5.diff 2022-10-05 18:58:50.620278129 -0700
+@@ -78,9 +78,9 @@
+ }
+
+ @@ -1118,11 +1127,23 @@ xinit(int cols, int rows)
+- Window parent;
+ pid_t thispid = getpid();
+ XColor xmousefg, xmousebg;
++ Pixmap blankpm;
+ + XWindowAttributes attr;
+ + XVisualInfo vis;
+
diff --git a/shell-term-fm/st/alpha_xr.patch b/shell-term-fm/st/alpha_xr.patch
new file mode 100644
index 0000000..b2d7cb5
--- /dev/null
+++ b/shell-term-fm/st/alpha_xr.patch
@@ -0,0 +1,19 @@
+--- st-alpha-20220206-0.8.5.diff.orig 2022-10-05 18:50:18.611167497 -0700
++++ st-alpha-20220206-0.8.5.diff 2022-10-05 18:50:59.812659221 -0700
+@@ -77,15 +77,13 @@
+ loaded = 1;
+ }
+
+-@@ -1118,11 +1127,23 @@ xinit(int cols, int rows)
++@@ -1118,9 +1127,21 @@ 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);
+ +
diff --git a/shell-term-fm/st/alpha_xr_hidecursor.patch
b/shell-term-fm/st/alpha_xr_hidecursor.patch
new file mode 100644
index 0000000..833b7ef
--- /dev/null
+++ b/shell-term-fm/st/alpha_xr_hidecursor.patch
@@ -0,0 +1,19 @@
+--- st-alpha-20220206-0.8.5.diff.orig 2022-10-05 18:50:18.611167497 -0700
++++ st-alpha-20220206-0.8.5.diff 2022-10-05 18:50:59.812659221 -0700
+@@ -77,15 +77,13 @@
+ loaded = 1;
+ }
+
+-@@ -1118,11 +1127,23 @@ xinit(int cols, int rows)
++@@ -1118,9 +1127,21 @@ xinit(int cols, int rows)
+ pid_t thispid = getpid();
+ XColor xmousefg, xmousebg;
+ Pixmap blankpm;
+ + 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);
+ +
diff --git a/shell-term-fm/st/scrollback_copyurl.patch
b/shell-term-fm/st/scrollback_copyurl.patch
new file mode 100644
index 0000000..8f32fae
--- /dev/null
+++ b/shell-term-fm/st/scrollback_copyurl.patch
@@ -0,0 +1,15 @@
+--- st-scrollback-0.8.5.diff.orig 2022-10-05 18:35:09.349302954 -0700
++++ st-scrollback-0.8.5.diff 2022-10-05 18:41:16.497690981 -0700
+@@ -2,10 +2,10 @@
+ index 91ab8ca..e3b469b 100644
+ --- a/config.def.h
+ +++ b/config.def.h
+-@@ -201,6 +201,8 @@ static Shortcut shortcuts[] = {
+- { TERMMOD, XK_Y, selpaste, {.i = 0} },
++@@ -219,6 +219,8 @@
+ { ShiftMask, XK_Insert, selpaste, {.i = 0} },
+ { TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
++ { MODKEY, XK_l, copyurl, {.i = 0} },
+ + { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} },
+ + { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} },
+ };
diff --git a/shell-term-fm/st/undercurl.patch
b/shell-term-fm/st/undercurl.patch
new file mode 100644
index 0000000..69f428b
--- /dev/null
+++ b/shell-term-fm/st/undercurl.patch
@@ -0,0 +1,11 @@
+--- st-undercurl-0.8.4-20210822.diff.orig 2022-10-05 19:36:59.378598561
-0700
++++ st-undercurl-0.8.4-20210822.diff 2022-10-05 19:37:34.102012806 -0700
+@@ -247,7 +247,7 @@
+
+ /* Render underline and strikethrough. */
+ if (base.mode & ATTR_UNDERLINE) {
+-- XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1,
++- XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent *
chscale + 1,
+ - width, 1);
+ + // Underline Color
+ + const int widthThreshold = 28; // +1 width every
widthThreshold px of font


  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (97f621760228284eda6d840add9a329abdf564e4), Vlad Glagolev, 10/05/2022

Archive powered by MHonArc 2.6.24.

Top of Page