ソースを参照

ui/curses: Fix pageup/pagedown on -curses

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>
OGAWA Hirofumi 9 年 前
コミット
e72df72a55
1 ファイル変更6 行追加2 行削除
  1. 6 2
      ui/curses_keys.h

+ 6 - 2
ui/curses_keys.h

@@ -29,8 +29,7 @@
 #include "keymaps.h"
 #include "keymaps.h"
 
 
 
 
-#define KEY_RELEASE         0x80
-#define KEY_MASK            0x7f
+#define KEY_MASK            SCANCODE_KEYMASK
 #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,