mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12724 from sonninnos/winraw-devicechange

Browse Source 
(WINRAW) Trigger joypad driver reinit on DEVICECHANGE
This commit is contained in:
Autechre 2021-08-01 22:14:08 +02:00 committed by GitHub
commit 10d7e4c643
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gfx/common/win32_common.c
View File

@ -117,6 +117,11 @@ extern bool dinput_handle_message(void *dinput, UINT message,
WPARAM wParam, LPARAM lParam); WPARAM wParam, LPARAM lParam);
#endif #endif
#if !defined(_XBOX)
extern bool winraw_handle_message(UINT message,
WPARAM wParam, LPARAM lParam);
#endif
typedef struct DISPLAYCONFIG_RATIONAL_CUSTOM typedef struct DISPLAYCONFIG_RATIONAL_CUSTOM
{ {
UINT32 Numerator; UINT32 Numerator;
@ -1033,7 +1038,6 @@ static LRESULT CALLBACK wnd_proc_common_internal(HWND hwnd,
case WM_POINTERDOWN: case WM_POINTERDOWN:
case WM_POINTERUP: case WM_POINTERUP:
case WM_POINTERUPDATE: case WM_POINTERUPDATE:
case WM_DEVICECHANGE:
case WM_MOUSEWHEEL: case WM_MOUSEWHEEL:
case WM_MOUSEHWHEEL: case WM_MOUSEHWHEEL:
case WM_NCLBUTTONDBLCLK: case WM_NCLBUTTONDBLCLK:
@ -1072,6 +1076,12 @@ static LRESULT CALLBACK wnd_proc_common_internal(HWND hwnd,
case WM_DISPLAYCHANGE: /* fix size after display mode switch when using SR */ case WM_DISPLAYCHANGE: /* fix size after display mode switch when using SR */
win32_resize_after_display_change(hwnd); win32_resize_after_display_change(hwnd);
break; break;
case WM_DEVICECHANGE:
#if !defined(_XBOX)
if (winraw_handle_message(message, wparam, lparam))
return 0;
#endif
break;
} }
return DefWindowProc(hwnd, message, wparam, lparam); return DefWindowProc(hwnd, message, wparam, lparam);

29
input/drivers/winraw_input.c
View File

@ -21,6 +21,10 @@ extern "C" {
#include <hidsdi.h> #include <hidsdi.h>
#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0500 /* 2K */
#include <dbt.h>
#endif
#ifdef CXX_BUILD #ifdef CXX_BUILD
} }
#endif #endif
@ -931,6 +935,31 @@ static int16_t winraw_input_state(
return 0; return 0;
} }
#if !defined(_XBOX)
bool winraw_handle_message(UINT message,
WPARAM wParam, LPARAM lParam)
{
winraw_input_t *wr = (winraw_input_t*)(LONG_PTR)
GetWindowLongPtr(main_window.hwnd, GWLP_USERDATA);
switch (message)
{
case WM_DEVICECHANGE:
#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0500 /* 2K */
if (wParam == DBT_DEVICEARRIVAL ||
wParam == DBT_DEVICEREMOVECOMPLETE)
{
PDEV_BROADCAST_HDR pHdr = (PDEV_BROADCAST_HDR)lParam;
if (pHdr->dbch_devicetype == DBT_DEVTYP_DEVICEINTERFACE)
joypad_driver_reinit(wr, NULL);
}
#endif
break;
}
return false;
}
#endif
static void winraw_free(void *data) static void winraw_free(void *data)
{ {
winraw_input_t *wr = (winraw_input_t*)data; winraw_input_t *wr = (winraw_input_t*)data;