From 6cf9965e4270bf888e06314429a24b76c22bd491 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Wed, 28 Oct 2009 22:59:01 +0000 Subject: Sync OpenBSD patchset 456: Set the output code for ctrl+cursor keys correctly, and disable (comment) rxvt-style output. --- input-keys.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/input-keys.c b/input-keys.c index 6729cb09..011636ac 100644 --- a/input-keys.c +++ b/input-keys.c @@ -1,4 +1,4 @@ -/* $Id: input-keys.c,v 1.35 2009-10-28 22:56:05 tcunha Exp $ */ +/* $Id: input-keys.c,v 1.36 2009-10-28 22:59:01 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -96,6 +96,7 @@ struct input_key_ent input_keys[] = { { KEYC_BTAB, "\033[Z", 0 }, /* Arrow keys. Cursor versions must come first. */ +/* { KEYC_UP|KEYC_CTRL, "\033Oa", 0 }, { KEYC_DOWN|KEYC_CTRL, "\033Ob", 0 }, { KEYC_RIGHT|KEYC_CTRL, "\033Oc", 0 }, @@ -105,11 +106,12 @@ struct input_key_ent input_keys[] = { { KEYC_DOWN|KEYC_SHIFT, "\033[b", 0 }, { KEYC_RIGHT|KEYC_SHIFT,"\033[c", 0 }, { KEYC_LEFT|KEYC_SHIFT, "\033[d", 0 }, +*/ - { KEYC_UP|KEYC_CTRL, "\033OA", INPUTKEY_CURSOR }, - { KEYC_DOWN|KEYC_CTRL, "\033OB", INPUTKEY_CURSOR }, - { KEYC_RIGHT|KEYC_CTRL, "\033OC", INPUTKEY_CURSOR }, - { KEYC_LEFT|KEYC_CTRL, "\033OD", INPUTKEY_CURSOR }, + { KEYC_UP|KEYC_CTRL, "\033[A", INPUTKEY_CURSOR }, + { KEYC_DOWN|KEYC_CTRL, "\033[B", INPUTKEY_CURSOR }, + { KEYC_RIGHT|KEYC_CTRL, "\033[C", INPUTKEY_CURSOR }, + { KEYC_LEFT|KEYC_CTRL, "\033[D", INPUTKEY_CURSOR }, { KEYC_UP, "\033OA", INPUTKEY_CURSOR }, { KEYC_DOWN, "\033OB", INPUTKEY_CURSOR }, @@ -169,6 +171,7 @@ input_key(struct window_pane *wp, int key) struct input_key_ent *ike; u_int i; size_t dlen; + char *out; log_debug2("writing key 0x%x", key); -- cgit v1.2.3