Make the number keypad work like I've come to expect.

icculus · Nov 9, 2015 · 3d34583 · 3d34583
1 parent 1055b76
commit 3d34583
Showing 1 changed file with 23 additions and 14 deletions.
diff --git a/src/con_sdl.cpp b/src/con_sdl.cpp
@@ -718,10 +718,10 @@ static struct {
     { SDLK_KP_ENTER,       kbEnter | kfGray },
     { SDLK_INSERT,         kbIns | kfGray },
     { SDLK_DELETE,         kbDel | kfGray },
-    { SDLK_KP_MEMADD,      '+' | kfGray },
-    { SDLK_KP_MEMSUBTRACT, '-' | kfGray },
-    { SDLK_KP_MEMMULTIPLY, '*' | kfGray },
-    { SDLK_KP_MEMDIVIDE,   '/' | kfGray },
+//    { SDLK_KP_MEMADD,      '+' | kfGray },
+//    { SDLK_KP_MEMSUBTRACT, '-' | kfGray },
+//    { SDLK_KP_MEMMULTIPLY, '*' | kfGray },
+//    { SDLK_KP_MEMDIVIDE,   '/' | kfGray },
 // !!! FIXME
     //{ SDLK_KP_HOME,        kbHome | kfGray },
     //{ SDLK_KP_UP,          kbUp | kfGray },
@@ -755,16 +755,25 @@ static struct {
     { SDLK_F11,            kbF11 },
     { SDLK_F12,            kbF12 },
     { SDLK_KP_0,           '0' | kfGray },
-    { SDLK_KP_1,           '1' | kfGray },
-    { SDLK_KP_2,           '2' | kfGray },
-    { SDLK_KP_3,           '3' | kfGray },
-    { SDLK_KP_4,           '4' | kfGray },
-    { SDLK_KP_5,           '5' | kfGray },
-    { SDLK_KP_6,           '6' | kfGray },
-    { SDLK_KP_7,           '7' | kfGray },
-    { SDLK_KP_8,           '8' | kfGray },
-    { SDLK_KP_9,           '9' | kfGray },
-    { SDLK_KP_DECIMAL,     '.' | kfGray },
+    { SDLK_KP_1,           kbEnd | kfGray },
+    { SDLK_KP_2,           kbDown | kfGray },
+    { SDLK_KP_3,           kbPgDn | kfGray },
+    { SDLK_KP_4,           kbLeft | kfGray },
+    //{ SDLK_KP_5,           '5' | kfGray },
+    { SDLK_KP_6,           kbRight | kfGray },
+    { SDLK_KP_7,           kbHome | kfGray },
+    { SDLK_KP_8,           kbUp | kfGray },
+    { SDLK_KP_9,           kbPgUp | kfGray },
+    //{ SDLK_KP_DECIMAL,     '.' | kfGray },
+
+    //{ SDLK_KP_HOME,        kbHome | kfGray },
+    //{ SDLK_KP_UP,          kbUp | kfGray },
+    //{ SDLK_KP_PAGEUP,      kbPgUp | kfGray },
+    //{ SDLK_KP_LEFT,        kbLeft | kfGray },
+    //{ SDLK_KP_RIGHT,       kbRight | kfGray },
+    //{ SDLK_KP_END,         kbEnd | kfGray },
+    //{ SDLK_KP_DOWN,        kbDown | kfGray },
+    //{ SDLK_KP_NEXT,        kbPgDn| kfGray },
 
     // !!! FIXME: ???
     //{ 0x1000FF6F,        kbDel | kfShift | kfGray },