eden-emu/SDL
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consolidate mouse-touch event checking logic

Browse source 
Saves one `GetMessageExtraInfo()` syscall when handling WM_INPUT events.

Will provide consistent results across various event types.
This commit is contained in:
Susko3 2023-12-26 21:15:58 +01:00 • committed by Sam Lantinga
parent d747daf03d
commit a3c8f2f6cb
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/video/windows/SDL_windowsevents.c
View file

@ -421,6 +421,11 @@ static SDL_MOUSE_EVENT_SOURCE GetMouseMessageSource()
return SDL_MOUSE_EVENT_SOURCE_PEN; return SDL_MOUSE_EVENT_SOURCE_PEN;
} }
} }
/* Sometimes WM_INPUT events won't have the correct touch signature,
so we have to rely purely on the touch bit being set. */
if (SDL_TouchDevicesAvailable() && extrainfo & 0x80) {
return SDL_MOUSE_EVENT_SOURCE_TOUCH;
}
return SDL_MOUSE_EVENT_SOURCE_MOUSE; return SDL_MOUSE_EVENT_SOURCE_MOUSE;
} }
#endif /*!defined(__XBOXONE__) && !defined(__XBOXSERIES__)*/ #endif /*!defined(__XBOXONE__) && !defined(__XBOXSERIES__)*/
@ -667,8 +672,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
if (inp.header.dwType == RIM_TYPEMOUSE) { if (inp.header.dwType == RIM_TYPEMOUSE) {
SDL_MouseID mouseID; SDL_MouseID mouseID;
RAWMOUSE *rawmouse; RAWMOUSE *rawmouse;
if (SDL_TouchDevicesAvailable() && if (GetMouseMessageSource() == SDL_MOUSE_EVENT_SOURCE_TOUCH) {
(GetMouseMessageSource() == SDL_MOUSE_EVENT_SOURCE_TOUCH || (GetMessageExtraInfo() & 0x80) == 0x80)) {
break; break;
} }
/* We do all of our mouse state checking against mouse ID 0 /* We do all of our mouse state checking against mouse ID 0