From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47187) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtYPR-00009w-4l for qemu-devel@nongnu.org; Tue, 03 Nov 2015 05:01:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtYPM-0003x2-2F for qemu-devel@nongnu.org; Tue, 03 Nov 2015 05:01:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43675) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtYPL-0003wf-Sq for qemu-devel@nongnu.org; Tue, 03 Nov 2015 05:01:39 -0500 From: Gerd Hoffmann Date: Tue, 3 Nov 2015 11:01:28 +0100 Message-Id: <1446544891-3600-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1446544891-3600-1-git-send-email-kraxel@redhat.com> References: <1446544891-3600-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 3/6] ui/curses: Fix pageup/pagedown on -curses List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , OGAWA Hirofumi From: OGAWA Hirofumi Current KEY_NPAGE/KEY_PPAGE handling is broken on -curses. Those uses "GREY", but "KEY_MASK" masked out "GREY". To fix, we have to use correct mask value - SCANCODE_KEYMASK. Then, this adds support of "shift + pageup/pagedown". With this, -curses mode can use scroll-up/down as usual like other display modes. Signed-off-by: OGAWA Hirofumi Signed-off-by: Gerd Hoffmann --- ui/curses_keys.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/curses_keys.h b/ui/curses_keys.h index 18ce6dc..f746744 100644 --- a/ui/curses_keys.h +++ b/ui/curses_keys.h @@ -29,8 +29,7 @@ #include "keymaps.h" -#define KEY_RELEASE 0x80 -#define KEY_MASK 0x7f +#define KEY_MASK SCANCODE_KEYMASK #define GREY_CODE 0xe0 #define GREY SCANCODE_GREY #define SHIFT_CODE 0x2a @@ -60,6 +59,8 @@ static const int curses2keysym[CURSES_KEYS] = { ['\n'] = KEY_ENTER, [27] = 27, [KEY_BTAB] = '\t' | KEYSYM_SHIFT, + [KEY_SPREVIOUS] = KEY_PPAGE | KEYSYM_SHIFT, + [KEY_SNEXT] = KEY_NPAGE | KEYSYM_SHIFT, }; static const int curses2keycode[CURSES_KEYS] = { @@ -149,6 +150,9 @@ static const int curses2keycode[CURSES_KEYS] = { [KEY_IC] = 82 | GREY, /* Insert */ [KEY_DC] = 83 | GREY, /* Delete */ + [KEY_SPREVIOUS] = 73 | GREY | SHIFT, /* Shift + Page Up */ + [KEY_SNEXT] = 81 | GREY | SHIFT, /* Shift + Page Down */ + ['!'] = 2 | SHIFT, ['@'] = 3 | SHIFT, ['#'] = 4 | SHIFT, -- 1.8.3.1