From d03703c81a202cea156811e5dbc8e88627c19986 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 19 Oct 2010 19:48:20 +0200 Subject: [PATCH] curses: Fix control-{@[\]^_} and ESC control-{@[\]^_} shouldn't get the 'a' - 'A' offset for correct translation. ESC is better simulated as escape key. Signed-off-by: Samuel Thibault Signed-off-by: Andrew Zaborowski --- ui/curses.c | 9 ++++++--- ui/curses_keys.h | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ui/curses.c b/ui/curses.c index ed3165e..82bc614 100644 --- a/ui/curses.c +++ b/ui/curses.c @@ -238,9 +238,12 @@ static void curses_refresh(DisplayState *ds) keysym = curses2keysym[chr]; if (keysym == -1) { - if (chr < ' ') - keysym = (chr + '@' - 'A' + 'a') | KEYSYM_CNTRL; - else + if (chr < ' ') { + keysym = chr + '@'; + if (keysym >= 'A' && keysym <= 'Z') + keysym += 'a' - 'A'; + keysym |= KEYSYM_CNTRL; + } else keysym = chr; } diff --git a/ui/curses_keys.h b/ui/curses_keys.h index 1decd11..c0d5eb4 100644 --- a/ui/curses_keys.h +++ b/ui/curses_keys.h @@ -55,6 +55,7 @@ static const int curses2keysym[CURSES_KEYS] = { [0x7f] = KEY_BACKSPACE, ['\r'] = KEY_ENTER, ['\n'] = KEY_ENTER, + [27] = 27, [KEY_BTAB] = '\t' | KEYSYM_SHIFT, }; -- 2.7.4