summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZack Middleton <zturtleman@gmail.com>2014-09-11 19:57:20 -0500
committerTim Angus <tim@ngus.net>2015-03-17 11:38:37 +0000
commitdcd45b4c9f0ea05d968beb236c24623b11b802a4 (patch)
tree6fb685878c018247358192822893ea69d612d7cd /src
parent2f1847529ff40055be86120cf83304c2701cac09 (diff)
Fix Windows key bind name on non-Mac using SDL2
SDL 1.2 sends SDKL_*META (command) and SDLK_*SUPER (windows key). SDL2 sends SDLK_*GUI for both.
Diffstat (limited to 'src')
-rw-r--r--src/sdl/sdl_input.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/sdl/sdl_input.c b/src/sdl/sdl_input.c
index 1a51c928..88ac0451 100644
--- a/src/sdl/sdl_input.c
+++ b/src/sdl/sdl_input.c
@@ -248,8 +248,13 @@ static keyNum_t IN_TranslateSDLToQ3Key( SDL_Keysym *keysym, qboolean down )
case SDLK_LCTRL:
case SDLK_RCTRL: key = K_CTRL; break;
+#ifdef MACOS_X
case SDLK_RGUI:
case SDLK_LGUI: key = K_COMMAND; break;
+#else
+ case SDLK_RGUI:
+ case SDLK_LGUI: key = K_SUPER; break;
+#endif
case SDLK_RALT:
case SDLK_LALT: key = K_ALT; break;