Received: from eggs.gnu.org ([2001:4830:134:3::10]:32929) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zo9U5-0001mo-DA for qemu-devel@nongnu.org; Mon, 19 Oct 2015 08:24:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zo9U2-0001BG-3U for qemu-devel@nongnu.org; Mon, 19 Oct 2015 08:24:13 -0400 Received: from mail.parknet.co.jp ([210.171.160.6]:48802) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zo9U1-0001B8-RJ for qemu-devel@nongnu.org; Mon, 19 Oct 2015 08:24:10 -0400 From: OGAWA Hirofumi References: <87a8rft5ch.fsf@mail.parknet.co.jp> Date: Mon, 19 Oct 2015 21:24:07 +0900 In-Reply-To: <87a8rft5ch.fsf@mail.parknet.co.jp> (OGAWA Hirofumi's message of "Mon, 19 Oct 2015 21:23:10 +0900") Message-ID: <871tcrt5aw.fsf@mail.parknet.co.jp> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v2 3/3] ui/curses: Fix pageup/pagedown on -curses List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: qemu-devel@nongnu.org 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 --- ui/curses_keys.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff -puN ui/curses_keys.h~support-curses-pageup ui/curses_keys.h --- qemu/ui/curses_keys.h~support-curses-pageup 2015-10-19 21:18:09.107732122 +0900 +++ qemu-hirofumi/ui/curses_keys.h 2015-10-19 21:18:09.111732112 +0900 @@ -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_KE ['\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_K [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, _