usb-ohci: Change casts to DO_UPCAST() for OHCIPCIState

[qemu.git] / sdl_keysym.h

diff --git a/sdl_keysym.h b/sdl_keysym.h
index 07969bcb43d85a991a0f7a56da6f84937a1ee16f..ee904805da8b762e4041e04cc568dfb8f2a5ce45 100644 (file)
--- a/sdl_keysym.h
+++ b/sdl_keysym.h
@@ -1,8 +1,7 @@
-typedef struct {
-       const char* name;
-       int keysym;
-} name2keysym_t;
-static name2keysym_t name2keysym[]={
+
+#include "keymaps.h"
+
+static const name2keysym_t name2keysym[]={
 /* ascii */
     { "space",                0x020},
     { "exclam",               0x021},
@@ -213,6 +212,8 @@ static name2keysym_t name2keysym[]={
 {"Meta_R", SDLK_RMETA},
 {"Shift_L", SDLK_LSHIFT},
 {"Shift_R", SDLK_RSHIFT},
+{"Super_L", SDLK_LSUPER},
+{"Super_R", SDLK_RSUPER},
 
     /* special keys */
 {"BackSpace", SDLK_BACKSPACE},
@@ -270,6 +271,7 @@ static name2keysym_t name2keysym[]={
 {"Multi_Key", SDLK_COMPOSE},
 {"Num_Lock", SDLK_NUMLOCK},
 {"Pause", SDLK_PAUSE},
+{"Escape", SDLK_ESCAPE},
 
-{0,0},
+{NULL, 0},
 };