mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify winraw_callback

Browse Source
This commit is contained in:
twinaphex 2020-08-29 19:43:53 +02:00
parent d9bfd4c38f
commit 3ff521ab0b
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
input/drivers/winraw_input.c
View File

@ -434,7 +434,6 @@ static void winraw_update_mouse_state(winraw_mouse_t *mouse, RAWMOUSE *state)
static LRESULT CALLBACK winraw_callback(HWND wnd, UINT msg, WPARAM wpar, LPARAM lpar)
{
UINT r;
unsigned i;
static uint8_t data[1024];
RAWINPUT *ri = (RAWINPUT*)data;
@ -443,35 +442,35 @@ static LRESULT CALLBACK winraw_callback(HWND wnd, UINT msg, WPARAM wpar, LPARAM
if (msg != WM_INPUT)
return DefWindowProcA(wnd, msg, wpar, lpar);
/* app is in the background */
if (GET_RAWINPUT_CODE_WPARAM(wpar) != RIM_INPUT)
goto end;
r = GetRawInputData((HRAWINPUT)lpar, RID_INPUT,
data, &size, sizeof(RAWINPUTHEADER));
if (r == (UINT)-1)
goto end;
if (ri->header.dwType == RIM_TYPEKEYBOARD)
if (
GET_RAWINPUT_CODE_WPARAM(wpar) != RIM_INPUT /* app is in the background */
|| GetRawInputData((HRAWINPUT)lpar, RID_INPUT,
data, &size, sizeof(RAWINPUTHEADER)) == (UINT)-1)
{
if (ri->data.keyboard.Message == WM_KEYDOWN)
g_keyboard->keys[ri->data.keyboard.VKey] = 1;
else if (ri->data.keyboard.Message == WM_KEYUP)
g_keyboard->keys[ri->data.keyboard.VKey] = 0;
DefWindowProcA(wnd, msg, wpar, lpar);
return 0;
}
else if (ri->header.dwType == RIM_TYPEMOUSE)
switch (ri->header.dwType)
{
for (i = 0; i < g_mouse_cnt; ++i)
{
if (g_mice[i].hnd == ri->header.hDevice)
case RIM_TYPEKEYBOARD:
if (ri->data.keyboard.Message == WM_KEYDOWN)
g_keyboard->keys[ri->data.keyboard.VKey] = 1;
else if (ri->data.keyboard.Message == WM_KEYUP)
g_keyboard->keys[ri->data.keyboard.VKey] = 0;
break;
case RIM_TYPEMOUSE:
for (i = 0; i < g_mouse_cnt; ++i)
{
winraw_update_mouse_state(&g_mice[i], &ri->data.mouse);
break;
if (g_mice[i].hnd == ri->header.hDevice)
{
winraw_update_mouse_state(&g_mice[i], &ri->data.mouse);
break;
}
}
}
break;
}
end:
DefWindowProcA(wnd, msg, wpar, lpar);
return 0;
}