Be careful about mar77i's patches.

This commit is contained in:
Christoph Lohmann 2012-12-10 23:02:58 +01:00
parent 78215c8ee0
commit 2696f81875
2 changed files with 7 additions and 6 deletions

View file

@ -138,8 +138,8 @@ static Key key[] = {
{ XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0, 0}, { XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
{ XK_KP_Delete, ShiftMask, "\033[2K", +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, ShiftMask, "\033[3;2~", -1, 0, 0},
{ XK_KP_Delete, XK_ANY_MOD, "\033[3~", -1, 0, 0}, { XK_KP_Delete, XK_ANY_MOD, "\033[P", -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_Multiply, XK_ANY_MOD, "\033Oj", +2, 0, 0}, { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0, 0},
{ XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0, 0}, { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0, 0},
{ XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0, 0}, { XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0, 0},
@ -194,8 +194,8 @@ static Key key[] = {
{ XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0}, { XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
{ XK_Delete, ShiftMask, "\033[2K", +1, 0, 0}, { XK_Delete, ShiftMask, "\033[2K", +1, 0, 0},
{ XK_Delete, ShiftMask, "\033[3;2~", -1, 0, 0}, { XK_Delete, ShiftMask, "\033[3;2~", -1, 0, 0},
{ XK_Delete, XK_ANY_MOD, "\033[3~", -1, 0, 0}, { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
{ XK_Delete, XK_ANY_MOD, "\033[P", +1, 0, 0}, { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
{ XK_Home, ShiftMask, "\033[1;2H", 0, 0, 0}, { XK_Home, ShiftMask, "\033[1;2H", 0, 0, 0},
{ XK_Home, XK_ANY_MOD, "\033[H", 0, -1, 0}, { XK_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
{ XK_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0}, { XK_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0},

5
st.c
View file

@ -2742,12 +2742,13 @@ kmap(KeySym k, uint state) {
continue; continue;
if(term.numlock && kp->appkey == 2) if(term.numlock && kp->appkey == 2)
continue; continue;
} else if (kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) { } else if(kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) {
continue; continue;
} }
if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) || if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||
(kp->appcursor > 0 && !IS_SET(MODE_APPCURSOR))) { (kp->appcursor > 0
&& !IS_SET(MODE_APPCURSOR))) {
continue; continue;
} }