zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 00:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixing mouse menu control, part 1.

Browse source
This commit is contained in:
Christoph Oelckers 2019-12-05 23:49:32 +01:00
parent 7a9138cde0
commit 3d10d006a7
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
source/build/src/sdlayer.cpp
View file

@ -1702,8 +1702,25 @@ int32_t handleevents_sdlcommon(SDL_Event *ev)
if (j < 0) if (j < 0)
break; break;
event_t evt = { uint8_t((ev->button.state == SDL_PRESSED)? EV_KeyDown : EV_KeyUp), 0, (int16_t)j}; if (!(GUICapture & 1))
D_PostEvent(&evt); {
event_t evt = { uint8_t((ev->button.state == SDL_PRESSED) ? EV_KeyDown : EV_KeyUp), 0, (int16_t)j };
D_PostEvent(&evt);
}
else
{
event_t evt;
evt.type = EV_GUI_Event;
evt.subtype = uint8_t((ev->button.state == SDL_PRESSED) ? EV_GUI_LButtonDown : EV_GUI_LButtonUp);
SDL_Keymod kmod = SDL_GetModState();
evt.data3 = ((kmod & KMOD_SHIFT) ? GKM_SHIFT : 0) |
((kmod & KMOD_CTRL) ? GKM_CTRL : 0) |
((kmod & KMOD_ALT) ? GKM_ALT : 0);
D_PostEvent(&evt);
}
break; break;
} }
@ -2059,13 +2076,12 @@ int32_t handleevents(void)
void I_SetMouseCapture() void I_SetMouseCapture()
{ {
// Clear out any mouse movement. // Clear out any mouse movement.
SDL_GetRelativeMouseState(NULL, NULL); SDL_CaptureMouse(SDL_TRUE);
SDL_SetRelativeMouseMode(SDL_TRUE);
} }
void I_ReleaseMouseCapture() void I_ReleaseMouseCapture()
{ {
SDL_SetRelativeMouseMode(SDL_FALSE); SDL_CaptureMouse(SDL_FALSE);
} }
auto vsnprintfptr = vsnprintf; // This is an inline in Visual Studio but we need an address for it to satisfy the MinGW compiled libraries. auto vsnprintfptr = vsnprintf; // This is an inline in Visual Studio but we need an address for it to satisfy the MinGW compiled libraries.