[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/6] ui/curses: Fix pageup/pagedown on -curses
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 3/6] ui/curses: Fix pageup/pagedown on -curses |
Date: |
Tue, 3 Nov 2015 11:01:28 +0100 |
From: OGAWA Hirofumi <address@hidden>
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 <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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
- [Qemu-devel] [PULL 0/6] ui patch queue, Gerd Hoffmann, 2015/11/03
- [Qemu-devel] [PULL 1/6] ui/curses: Fix monitor color with -curses when 256 colors, Gerd Hoffmann, 2015/11/03
- [Qemu-devel] [PULL 6/6] vnc: fix bug: vnc server can't start when 'to' is specified, Gerd Hoffmann, 2015/11/03
- [Qemu-devel] [PULL 4/6] ui/opengl: Reduce build required libraries for opengl, Gerd Hoffmann, 2015/11/03
- [Qemu-devel] [PULL 2/6] ui/curses: Support line graphics chars on -curses mode, Gerd Hoffmann, 2015/11/03
- [Qemu-devel] [PULL 5/6] vnc: allow fall back to RAW encoding, Gerd Hoffmann, 2015/11/03
- [Qemu-devel] [PULL 3/6] ui/curses: Fix pageup/pagedown on -curses,
Gerd Hoffmann <=
- Re: [Qemu-devel] [PULL 0/6] ui patch queue, Peter Maydell, 2015/11/03