yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-25 22:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Windows key bind name on non-Mac

Browse source
This commit is contained in:
Andrew Malchuk 2024-09-07 02:09:21 +04:00
parent 45fce1deb0
commit d7845deb4c
No known key found for this signature in database
GPG key ID: C2D00BAABF2F97B1
3 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
.vscode/
/build/
/release/
*.mk

15
src/client/input/sdl2.c
View file

@ -235,10 +235,17 @@ IN_TranslateSDLtoQ2Key(unsigned int keysym)
case SDLK_BACKSPACE:
key = K_BACKSPACE;
break;
case SDLK_LGUI:
#ifdef __APPLE__
case SDLK_RGUI:
key = K_COMMAND; // Win key
case SDLK_LGUI:
key = K_COMMAND;
break;
#else
case SDLK_RGUI:
case SDLK_LGUI:
key = K_SUPER;
break;
#endif
case SDLK_CAPSLOCK:
key = K_CAPSLOCK;
break;
@ -394,8 +401,6 @@ IN_TranslateSDLtoQ2Key(unsigned int keysym)
key = K_KP_EQUALS;
break;
// TODO: K_SUPER ? Win Key is already K_COMMAND
case SDLK_APPLICATION:
key = K_COMPOSE;
break;
@ -662,7 +667,7 @@ IN_Update(void)
event.window.event == SDL_WINDOWEVENT_FOCUS_GAINED)
{
Key_MarkAllUp();
if (event.window.event == SDL_WINDOWEVENT_FOCUS_LOST)
{
S_Activate(false);

13
src/client/input/sdl3.c
View file

@ -225,10 +225,17 @@ IN_TranslateSDLtoQ2Key(unsigned int keysym)
case SDLK_BACKSPACE:
key = K_BACKSPACE;
break;
case SDLK_LGUI:
#ifdef __APPLE__
case SDLK_RGUI:
key = K_COMMAND; // Win key
case SDLK_LGUI:
key = K_COMMAND;
break;
#else
case SDLK_RGUI:
case SDLK_LGUI:
key = K_SUPER;
break;
#endif
case SDLK_CAPSLOCK:
key = K_CAPSLOCK;
break;
@ -384,8 +391,6 @@ IN_TranslateSDLtoQ2Key(unsigned int keysym)
key = K_KP_EQUALS;
break;
// TODO: K_SUPER ? Win Key is already K_COMMAND
case SDLK_APPLICATION:
key = K_COMPOSE;
break;