mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-24 11:23:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

ui/curses: Fix pageup/pagedown on -curses

Browse Source 
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 <hirofumi@mail.parknet.co.jp>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
OGAWA Hirofumi 2015-10-19 21:24:07 +09:00 committed by Gerd Hoffmann
parent e2368dc968
commit e72df72a55
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/curses_keys.h
View File

@ -29,8 +29,7 @@
#include "keymaps.h" #include "keymaps.h"
#define KEY_RELEASE 0x80 #define KEY_MASK SCANCODE_KEYMASK
#define KEY_MASK 0x7f
#define GREY_CODE 0xe0 #define GREY_CODE 0xe0
#define GREY SCANCODE_GREY #define GREY SCANCODE_GREY
#define SHIFT_CODE 0x2a #define SHIFT_CODE 0x2a
@ -60,6 +59,8 @@ static const int curses2keysym[CURSES_KEYS] = {
['\n'] = KEY_ENTER, ['\n'] = KEY_ENTER,
[27] = 27, [27] = 27,
[KEY_BTAB] = '\t' | KEYSYM_SHIFT, [KEY_BTAB] = '\t' | KEYSYM_SHIFT,
[KEY_SPREVIOUS] = KEY_PPAGE | KEYSYM_SHIFT,
[KEY_SNEXT] = KEY_NPAGE | KEYSYM_SHIFT,
}; };
static const int curses2keycode[CURSES_KEYS] = { static const int curses2keycode[CURSES_KEYS] = {
@ -149,6 +150,9 @@ static const int curses2keycode[CURSES_KEYS] = {
[KEY_IC] = 82 | GREY, /* Insert */ [KEY_IC] = 82 | GREY, /* Insert */
[KEY_DC] = 83 | GREY, /* Delete */ [KEY_DC] = 83 | GREY, /* Delete */
[KEY_SPREVIOUS] = 73 | GREY | SHIFT, /* Shift + Page Up */
[KEY_SNEXT] = 81 | GREY | SHIFT, /* Shift + Page Down */
['!'] = 2 | SHIFT, ['!'] = 2 | SHIFT,
['@'] = 3 | SHIFT, ['@'] = 3 | SHIFT,
['#'] = 4 | SHIFT, ['#'] = 4 | SHIFT,