libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-17 07:58:55 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

(Winraw) Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-07-02 07:07:42 +02:00
parent a3c687f0a6
commit d9b4b44091
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gfx/common/win32_common.c
View File

@ -915,9 +915,6 @@ static LRESULT CALLBACK wnd_proc_common(
uint16_t mod = 0;
unsigned keycode = 0;
unsigned keysym = (lparam >> 16) & 0xff;
#if _WIN32_WINNT >= 0x0501 /* XP */
settings_t *settings = config_get_ptr();
#endif
if (GetKeyState(VK_SHIFT) & 0x80)
mod |= RETROKMOD_SHIFT;
@ -932,17 +929,20 @@ static LRESULT CALLBACK wnd_proc_common(
if ((GetKeyState(VK_LWIN) | GetKeyState(VK_RWIN)) & 0x80)
mod |= RETROKMOD_META;
#if _WIN32_WINNT >= 0x0501 /* XP */
if (settings &&
string_is_equal(settings->arrays.input_driver, "raw"))
keysym = (unsigned)wparam;
else
#endif
{
input_driver_t *driver = input_get_ptr();
#if _WIN32_WINNT >= 0x0501 /* XP */
#ifdef HAVE_WINRAWINPUT
if (driver == &input_winraw)
keysym = (unsigned)wparam;
else
#endif
#endif
#ifdef HAVE_DINPUT
/* extended keys will map to dinput if the high bit is set */
if (input_get_ptr() == &input_dinput && (lparam >> 24 & 0x1))
keysym |= 0x80;
/* extended keys will map to dinput if the high bit is set */
if (driver == &input_dinput && (lparam >> 24 & 0x1))
keysym |= 0x80;
#else
/* fix key binding issues on winraw when DirectInput is not available */
#endif

2
gfx/drivers_context/gdi_ctx.c
View File

@ -183,6 +183,7 @@ static void gfx_ctx_gdi_input_driver(void *data,
input_driver_t **input, void **input_data)
{
#if _WIN32_WINNT >= 0x0501
#ifdef HAVE_WINRAWINPUT
settings_t *settings = config_get_ptr();
/* winraw only available since XP */
@ -197,6 +198,7 @@ static void gfx_ctx_gdi_input_driver(void *data,
}
}
#endif
#endif
#ifdef HAVE_DINPUT
dinput_gdi = input_dinput.init(joypad_name);