commit a8f0f7c3c0be484b0ddf40d0e1c82618749e8706
parent abf6a65459967c74bd10be46beb23a3bc193800d
Author: FRIGN <dev@frign.de>
Date: Thu, 17 Sep 2015 16:22:46 +0200
st delkey - Add 0.6-diff and update git-diff
Diffstat:
4 files changed, 96 insertions(+), 49 deletions(-)
diff --git a/st.suckless.org/patches/delkey.md b/st.suckless.org/patches/delkey.md
@@ -4,14 +4,16 @@ delkey
Description
-----------
-Return BS in Backspace and DEL in Delete key.
+Return BS on pressing backspace and DEL on pressing the delete key.
Download
--------
-* [st-git-delkey.diff](st-git-delkey.diff)
+ * [st-0.6-delkey.diff](st-0.6-delkey.diff)
+ * [st-git-20150917-delkey.diff](st-git-20150917-delkey.diff)
-Author
-------
+Authors
+-------
* Roberto E. Vargas Caballero - k0ga@shike2.com
+ * Laslo Hunhold - dev@frign.de (st-0.6, st-git-20150917 ports)
diff --git a/st.suckless.org/patches/st-0.6-delkey.diff b/st.suckless.org/patches/st-0.6-delkey.diff
@@ -0,0 +1,45 @@
+diff --git a/config.def.h b/config.def.h
+index 64e75b8..0811af4 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -211,7 +211,7 @@ static Key key[] = {
+ { XK_KP_Delete, ShiftMask, "\033[2K", -1, 0, 0},
+ { XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
+ { XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
+- { XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
++ { XK_KP_Delete, XK_ANY_MOD, "\177", +1, 0, 0},
+ { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0, 0},
+ { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0, 0},
+ { XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0, 0},
+@@ -266,8 +266,7 @@ static Key key[] = {
+ { XK_Delete, ShiftMask, "\033[2K", -1, 0, 0},
+ { XK_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
+ { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
+- { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
+- { XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0},
++ { XK_Delete, XK_ANY_MOD, "\177", +1, 0, 0},
+ { XK_Home, ShiftMask, "\033[2J", 0, -1, 0},
+ { XK_Home, ShiftMask, "\033[1;2H", 0, +1, 0},
+ { XK_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
+diff --git a/st.info b/st.info
+index 2acd8b2..21b4734 100644
+--- a/st.info
++++ b/st.info
+@@ -53,7 +53,7 @@ st| simpleterm,
+ ka3=\E[5~,
+ kc1=\E[4~,
+ kc3=\E[6~,
+- kbs=\177,
++ kbs=\010,
+ kcbt=\E[Z,
+ kb2=\EOu,
+ kcub1=\EOD,
+@@ -73,7 +73,7 @@ st| simpleterm,
+ kri=\E[1;2A,
+ kclr=\E[3;5~,
+ kdl1=\E[3;2~,
+- kdch1=\E[3~,
++ kdch1=\177~,
+ kich1=\E[2~,
+ kend=\E[4~,
+ kf1=\EOP,
diff --git a/st.suckless.org/patches/st-git-20150917-delkey.diff b/st.suckless.org/patches/st-git-20150917-delkey.diff
@@ -0,0 +1,45 @@
+diff --git a/config.def.h b/config.def.h
+index b6adc5e..ceaafa0 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -238,7 +238,7 @@ static Key key[] = {
+ { XK_KP_Delete, ShiftMask, "\033[2K", -1, 0, 0},
+ { XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
+ { XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
+- { XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
++ { XK_KP_Delete, XK_ANY_MOD, "\177", +1, 0, 0},
+ { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0, 0},
+ { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0, 0},
+ { XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0, 0},
+@@ -293,8 +293,7 @@ static Key key[] = {
+ { XK_Delete, ShiftMask, "\033[2K", -1, 0, 0},
+ { XK_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
+ { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
+- { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
+- { XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0},
++ { XK_Delete, XK_ANY_MOD, "\177", +1, 0, 0},
+ { XK_Home, ShiftMask, "\033[2J", 0, -1, 0},
+ { XK_Home, ShiftMask, "\033[1;2H", 0, +1, 0},
+ { XK_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
+diff --git a/st.info b/st.info
+index b70fefa..d979946 100644
+--- a/st.info
++++ b/st.info
+@@ -53,7 +53,7 @@ st| simpleterm,
+ ka3=\E[5~,
+ kc1=\E[4~,
+ kc3=\E[6~,
+- kbs=\177,
++ kbs=\010,
+ kcbt=\E[Z,
+ kb2=\EOu,
+ kcub1=\EOD,
+@@ -73,7 +73,7 @@ st| simpleterm,
+ kri=\E[1;2A,
+ kclr=\E[3;5~,
+ kdl1=\E[3;2~,
+- kdch1=\E[3~,
++ kdch1=\177~,
+ kich1=\E[2~,
+ kend=\E[4~,
+ kf1=\EOP,
diff --git a/st.suckless.org/patches/st-git-delkey.diff b/st.suckless.org/patches/st-git-delkey.diff
@@ -1,45 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 930e468..b427840 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -228,7 +228,7 @@ static Key key[] = {
- { XK_KP_Delete, ShiftMask, "\033[2K", -1, 0, 0},
- { XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
- { XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
-- { XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
-+ { XK_KP_Delete, XK_ANY_MOD, "\177", +1, 0, 0},
- { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0, 0},
- { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0, 0},
- { XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0, 0},
-@@ -283,8 +283,7 @@ static Key key[] = {
- { XK_Delete, ShiftMask, "\033[2K", -1, 0, 0},
- { XK_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
- { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
-- { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
-- { XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0},
-+ { XK_Delete, XK_ANY_MOD, "\177", +1, 0, 0},
- { XK_Home, ShiftMask, "\033[2J", 0, -1, 0},
- { XK_Home, ShiftMask, "\033[1;2H", 0, +1, 0},
- { XK_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
-diff --git a/st.info b/st.info
-index 2acd8b2..21b4734 100644
---- a/st.info
-+++ b/st.info
-@@ -53,7 +53,7 @@ st| simpleterm,
- ka3=\E[5~,
- kc1=\E[4~,
- kc3=\E[6~,
-- kbs=\177,
-+ kbs=\010,
- kcbt=\E[Z,
- kb2=\EOu,
- kcub1=\EOD,
-@@ -73,7 +73,7 @@ st| simpleterm,
- kri=\E[1;2A,
- kclr=\E[3;5~,
- kdl1=\E[3;2~,
-- kdch1=\E[3~,
-+ kdch1=\177~,
- kich1=\E[2~,
- kend=\E[4~,
- kf1=\EOP,