diff options
author | Christoph Lohmann <20h@r-36.net> | 2012-12-10 23:02:58 +0100 |
---|---|---|
committer | Christoph Lohmann <20h@r-36.net> | 2012-12-10 23:02:58 +0100 |
commit | 2696f8187509eb94644bbac5b05348e37c391bea (patch) | |
tree | d6f6c84929a26c38cf998d3f864430f35b1fae63 | |
parent | 78215c8ee0f4cb62655730260520f185ce97c620 (diff) | |
download | st-2696f8187509eb94644bbac5b05348e37c391bea.tar.gz st-2696f8187509eb94644bbac5b05348e37c391bea.zip |
Be careful about mar77i's patches.
-rw-r--r-- | config.def.h | 8 | ||||
-rw-r--r-- | st.c | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/config.def.h b/config.def.h index b10c730..684adf7 100644 --- a/config.def.h +++ b/config.def.h | |||
@@ -138,8 +138,8 @@ static Key key[] = { | |||
138 | { XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0, 0}, | 138 | { XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0, 0}, |
139 | { XK_KP_Delete, ShiftMask, "\033[2K", +1, 0, 0}, | 139 | { XK_KP_Delete, ShiftMask, "\033[2K", +1, 0, 0}, |
140 | { XK_KP_Delete, ShiftMask, "\033[3;2~", -1, 0, 0}, | 140 | { XK_KP_Delete, ShiftMask, "\033[3;2~", -1, 0, 0}, |
141 | { XK_KP_Delete, XK_ANY_MOD, "\033[3~", -1, 0, 0}, | 141 | { XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0}, |
142 | { XK_KP_Delete, XK_ANY_MOD, "\033[P", +1, 0, 0}, | 142 | { XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0}, |
143 | { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0, 0}, | 143 | { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0, 0}, |
144 | { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0, 0}, | 144 | { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0, 0}, |
145 | { XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0, 0}, | 145 | { XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0, 0}, |
@@ -194,8 +194,8 @@ static Key key[] = { | |||
194 | { XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0}, | 194 | { XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0}, |
195 | { XK_Delete, ShiftMask, "\033[2K", +1, 0, 0}, | 195 | { XK_Delete, ShiftMask, "\033[2K", +1, 0, 0}, |
196 | { XK_Delete, ShiftMask, "\033[3;2~", -1, 0, 0}, | 196 | { XK_Delete, ShiftMask, "\033[3;2~", -1, 0, 0}, |
197 | { XK_Delete, XK_ANY_MOD, "\033[3~", -1, 0, 0}, | 197 | { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0}, |
198 | { XK_Delete, XK_ANY_MOD, "\033[P", +1, 0, 0}, | 198 | { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0}, |
199 | { XK_Home, ShiftMask, "\033[1;2H", 0, 0, 0}, | 199 | { XK_Home, ShiftMask, "\033[1;2H", 0, 0, 0}, |
200 | { XK_Home, XK_ANY_MOD, "\033[H", 0, -1, 0}, | 200 | { XK_Home, XK_ANY_MOD, "\033[H", 0, -1, 0}, |
201 | { XK_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0}, | 201 | { XK_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0}, |
@@ -2742,12 +2742,13 @@ kmap(KeySym k, uint state) { | |||
2742 | continue; | 2742 | continue; |
2743 | if(term.numlock && kp->appkey == 2) | 2743 | if(term.numlock && kp->appkey == 2) |
2744 | continue; | 2744 | continue; |
2745 | } else if (kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) { | 2745 | } else if(kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) { |
2746 | continue; | 2746 | continue; |
2747 | } | 2747 | } |
2748 | 2748 | ||
2749 | if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) || | 2749 | if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) || |
2750 | (kp->appcursor > 0 && !IS_SET(MODE_APPCURSOR))) { | 2750 | (kp->appcursor > 0 |
2751 | && !IS_SET(MODE_APPCURSOR))) { | ||
2751 | continue; | 2752 | continue; |
2752 | } | 2753 | } |
2753 | 2754 | ||