And two more.
The first one (0005…) should not break anything, because it just adds a
default keymap string for the del key. I can confirm, that the del key
works as expected in mksh prompt (which it did not before this patch
without the echo `tput smkx` >/dev/tty trick mentioned in the FAQ) and
it still works in the bash prompt.
--Markus
Am 22.06.2013 23:10, schrieb Markus Teich:
see attached.
--Markus
>From 9873cd0144bb3d24b0bcb5027c8bc68f498c9faf Mon Sep 17 00:00:00 2001
From: Markus Teich <markus.te...@stusta.mhn.de>
Date: Sat, 22 Jun 2013 23:15:36 +0200
Subject: [PATCH 5/6] fix: make del key work in mksh
---
config.def.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.def.h b/config.def.h
index e85f180..394b396 100644
--- a/config.def.h
+++ b/config.def.h
@@ -179,8 +179,8 @@ static Key key[] = {
{ XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
{ 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[3~", 0, 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_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},
--
1.8.2
>From 02f681df791a3b7fe1db57aea5425bf46e0337a4 Mon Sep 17 00:00:00 2001
From: Markus Teich <markus.te...@stusta.mhn.de>
Date: Sat, 22 Jun 2013 23:26:20 +0200
Subject: [PATCH 6/6] fix: simplify function kmap
---
st.c | 48 +++++++++++++-----------------------------------
1 file changed, 13 insertions(+), 35 deletions(-)
diff --git a/st.c b/st.c
index 798cab5..43089bd 100644
--- a/st.c
+++ b/st.c
@@ -3377,43 +3377,21 @@ kmap(KeySym k, uint state) {
int i;
/* Check for mapped keys out of X11 function keys. */
- for(i = 0; i < LEN(mappedkeys); i++) {
- if(mappedkeys[i] == k)
- break;
- }
- if(i == LEN(mappedkeys)) {
- if((k & 0xFFFF) < 0xFD00)
- return NULL;
- }
+ for(i = 0; i < LEN(mappedkeys) && mappedkeys[i] != k; i++);
+ if(i == LEN(mappedkeys) && (k & 0xFFFF) < 0xFD00) return NULL;
+ /* Find first match in keymap */
for(kp = key; kp < key + LEN(key); kp++) {
- if(kp->k != k)
- continue;
-
- if(!match(kp->mask, state))
- continue;
-
- if(kp->appkey > 0) {
- if(!IS_SET(MODE_APPKEYPAD))
- continue;
- if(term.numlock && kp->appkey == 2)
- continue;
- } else if(kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) {
- continue;
- }
-
- if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||
- (kp->appcursor > 0
- && !IS_SET(MODE_APPCURSOR))) {
- continue;
- }
-
- if((kp->crlf < 0 && IS_SET(MODE_CRLF)) ||
- (kp->crlf > 0 && !IS_SET(MODE_CRLF))) {
- continue;
- }
-
- return kp->s;
+ if((kp->k == k)
+ && (match(kp->mask, state))
+ && (kp->appkey != 2 || !term.numlock)
+ && (kp->appkey >= 0 || !IS_SET(MODE_APPKEYPAD))
+ && (kp->appkey <= 0 || IS_SET(MODE_APPKEYPAD))
+ && (kp->appcursor <= 0 || IS_SET(MODE_APPCURSOR))
+ && (kp->appcursor >= 0 || !IS_SET(MODE_APPCURSOR))
+ && (kp->crlf <= 0 || IS_SET(MODE_CRLF))
+ && (kp->crlf >= 0 || !IS_SET(MODE_CRLF)))
+ return kp->s;
}
return NULL;
--
1.8.2
