Ticket #8698: ASCII_Enum.diff

backends/platform/sdl/events.cpp

@@ -49 +49 @@
 
 
 
-static int mapKey(SDLKey key, SDLMod mod, Uint16 unicode)
-{
-        if (key >= SDLK_F1 && key <= SDLK_F9) {
-                return key - SDLK_F1 + 315;
-        } else if (key >= SDLK_KP0 && key <= SDLK_KP9) {
-                return key - SDLK_KP0 + '0';
-        } else if (key >= SDLK_UP && key <= SDLK_PAGEDOWN) {
-                return key;
-        } else if (unicode) {
-                return unicode;
-        } else if (key >= 'a' && key <= 'z' && mod & KMOD_SHIFT) {
-                return key & ~0x20;
-        } else if (key >= SDLK_NUMLOCK && key <= SDLK_EURO) {
-                return 0;
+static int mapKey(SDLKey key, SDLMod mod, Uint16 unicode) {
+        switch (key) {
+                case SDLK_KP0: return Common::ASCII_KP0;
+                case SDLK_KP1: return Common::ASCII_KP1;
+                case SDLK_KP2: return Common::ASCII_KP2;
+                case SDLK_KP3: return Common::ASCII_KP3;
+                case SDLK_KP4: return Common::ASCII_KP4;
+                case SDLK_KP5: return Common::ASCII_KP5;
+                case SDLK_KP6: return Common::ASCII_KP6;
+                case SDLK_KP7: return Common::ASCII_KP7;
+                case SDLK_KP8: return Common::ASCII_KP8;
+                case SDLK_KP9: return Common::ASCII_KP9;
+                case SDLK_F1: return Common::ASCII_F1;
+                case SDLK_F2: return Common::ASCII_F2;
+                case SDLK_F3: return Common::ASCII_F3;
+                case SDLK_F4: return Common::ASCII_F4;
+                case SDLK_F5: return Common::ASCII_F5;
+                case SDLK_F6: return Common::ASCII_F6;
+                case SDLK_F7: return Common::ASCII_F7;
+                case SDLK_F8: return Common::ASCII_F8;
+                case SDLK_F9: return Common::ASCII_F9;
+                default:
+                        if (unicode) {
+                                return unicode;
+                        } else if (key >= 'a' && key <= 'z' && mod & KMOD_SHIFT) {
+                                return key & ~0x20;
+                        } else if (key >= SDLK_NUMLOCK && key <= SDLK_EURO) {
+                                return 0;
+                        }
+                        return key;
         }
-        return key;
 }
 
 void OSystem_SDL::fillMouseEvent(Common::Event &event, int x, int y) {

common/events.h

@@ -216 +216 @@
         KEYCODE_UNDO            = 322           // Atari keyboard has Undo
 };
 
+enum {
+        ASCII_KP0 = 48,
+        ASCII_KP1 = 49,
+        ASCII_KP2 = 50,
+        ASCII_KP3 = 51,
+        ASCII_KP4 = 52,
+        ASCII_KP5 = 53,
+        ASCII_KP6 = 54,
+        ASCII_KP7 = 55,
+        ASCII_KP8 = 56,
+        ASCII_KP9 = 57,
+
+        ASCII_F1 = 315,
+        ASCII_F2 = 316,
+        ASCII_F3 = 317,
+        ASCII_F4 = 318,
+        ASCII_F5 = 319,
+        ASCII_F6 = 320,
+        ASCII_F7 = 321,
+        ASCII_F8 = 322,
+        ASCII_F9 = 323
+};
+
 /**
  * Keyboard modifier flags, used for Event::kbd::flags.
  */