mirror of
https://github.com/Relintai/sdl2_frt.git
synced 2024-12-20 22:16:49 +01:00
4dea340ca7
Jimb Esser
Add new RawInput controller API, and improved correlation with XInput/WGI
Reorder joystick init so drivers can ask the others if they handle a device reliably
Do not poll disconnected XInput devices (major perf issue)
Fix various cases where incorrect correlation could happen
Simple mechanism for propagating unhandled Guide button presses even before guaranteed correlation
Correlate by axis motion as well as button presses
Fix failing to zero other trigger
Fix SDL_HINT_JOYSTICK_HIDAPI not working if set before calling SDL_Init()
Add missing device to device names
Disable RawInput if we have a mismatch of XInput-capable but not RawInput-capable devices
Updated to SDL 2.0.13 code with the following notes:
New HID driver: xbox360w - no idea what that is, hopefully urelated
SDL_hidapijoystick.c had been refactored to couple data handling logic with device opening logic and device lists caused some problems, yields slightly uglier integration than previously when the 360 HID device driver was just handling the data.
SDL_hidapijoystick.c now often pulls the device off of the joystick_hwdata structure for some rumble logic, but it appears that code path is never reached, so probably not a problem.
Looks like joystick_hwdata was refactored to not include a mutex in other drivers, maintainers may want to do the same refactor here if that's useful for some reason.
Something changed in how devices get names, so getting generic names.
Had to fix a (new?) bug where removing an XInput controller caused existing controllers (that moved to a new XInput index) to get identified as 0x045e/0x02fd ("it's probably Bluetooth" in code), rendering the existing HIDAPI_IsDevicePresent and new RAWINPUT_IsDevicePresent unreliable.
262 lines
6.7 KiB
C
262 lines
6.7 KiB
C
/*
|
|
Simple DirectMedia Layer
|
|
Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
|
|
|
|
This software is provided 'as-is', without any express or implied
|
|
warranty. In no event will the authors be held liable for any damages
|
|
arising from the use of this software.
|
|
|
|
Permission is granted to anyone to use this software for any purpose,
|
|
including commercial applications, and to alter it and redistribute it
|
|
freely, subject to the following restrictions:
|
|
|
|
1. The origin of this software must not be misrepresented; you must not
|
|
claim that you wrote the original software. If you use this software
|
|
in a product, an acknowledgment in the product documentation would be
|
|
appreciated but is not required.
|
|
2. Altered source versions must be plainly marked as such, and must not be
|
|
misrepresented as being the original software.
|
|
3. This notice may not be removed or altered from any source distribution.
|
|
*/
|
|
|
|
#ifndef SDL_config_windows_h_
|
|
#define SDL_config_windows_h_
|
|
#define SDL_config_h_
|
|
|
|
#include "SDL_platform.h"
|
|
|
|
/* This is a set of defines to configure the SDL features */
|
|
|
|
#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
|
|
#if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__)
|
|
#define HAVE_STDINT_H 1
|
|
#elif defined(_MSC_VER)
|
|
typedef signed __int8 int8_t;
|
|
typedef unsigned __int8 uint8_t;
|
|
typedef signed __int16 int16_t;
|
|
typedef unsigned __int16 uint16_t;
|
|
typedef signed __int32 int32_t;
|
|
typedef unsigned __int32 uint32_t;
|
|
typedef signed __int64 int64_t;
|
|
typedef unsigned __int64 uint64_t;
|
|
#ifndef _UINTPTR_T_DEFINED
|
|
#ifdef _WIN64
|
|
typedef unsigned __int64 uintptr_t;
|
|
#else
|
|
typedef unsigned int uintptr_t;
|
|
#endif
|
|
#define _UINTPTR_T_DEFINED
|
|
#endif
|
|
/* Older Visual C++ headers don't have the Win64-compatible typedefs... */
|
|
#if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR)))
|
|
#define DWORD_PTR DWORD
|
|
#endif
|
|
#if ((_MSC_VER <= 1200) && (!defined(LONG_PTR)))
|
|
#define LONG_PTR LONG
|
|
#endif
|
|
#else /* !__GNUC__ && !_MSC_VER */
|
|
typedef signed char int8_t;
|
|
typedef unsigned char uint8_t;
|
|
typedef signed short int16_t;
|
|
typedef unsigned short uint16_t;
|
|
typedef signed int int32_t;
|
|
typedef unsigned int uint32_t;
|
|
typedef signed long long int64_t;
|
|
typedef unsigned long long uint64_t;
|
|
#ifndef _SIZE_T_DEFINED_
|
|
#define _SIZE_T_DEFINED_
|
|
typedef unsigned int size_t;
|
|
#endif
|
|
typedef unsigned int uintptr_t;
|
|
#endif /* __GNUC__ || _MSC_VER */
|
|
#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
|
|
|
|
#ifdef _WIN64
|
|
# define SIZEOF_VOIDP 8
|
|
#else
|
|
# define SIZEOF_VOIDP 4
|
|
#endif
|
|
|
|
#define HAVE_DDRAW_H 1
|
|
#define HAVE_DINPUT_H 1
|
|
#define HAVE_DSOUND_H 1
|
|
#define HAVE_DXGI_H 1
|
|
#define HAVE_XINPUT_H 1
|
|
#define HAVE_MMDEVICEAPI_H 1
|
|
#define HAVE_AUDIOCLIENT_H 1
|
|
|
|
/* This is disabled by default to avoid C runtime dependencies and manifest requirements */
|
|
#ifdef HAVE_LIBC
|
|
/* Useful headers */
|
|
#define STDC_HEADERS 1
|
|
#define HAVE_CTYPE_H 1
|
|
#define HAVE_FLOAT_H 1
|
|
#define HAVE_LIMITS_H 1
|
|
#define HAVE_MATH_H 1
|
|
#define HAVE_SIGNAL_H 1
|
|
#define HAVE_STDIO_H 1
|
|
#define HAVE_STRING_H 1
|
|
|
|
/* C library functions */
|
|
#define HAVE_MALLOC 1
|
|
#define HAVE_CALLOC 1
|
|
#define HAVE_REALLOC 1
|
|
#define HAVE_FREE 1
|
|
#define HAVE_ALLOCA 1
|
|
#define HAVE_QSORT 1
|
|
#define HAVE_ABS 1
|
|
#define HAVE_MEMSET 1
|
|
#define HAVE_MEMCPY 1
|
|
#define HAVE_MEMMOVE 1
|
|
#define HAVE_MEMCMP 1
|
|
#define HAVE_STRLEN 1
|
|
#define HAVE__STRREV 1
|
|
/* These functions have security warnings, so we won't use them */
|
|
/* #undef HAVE__STRUPR */
|
|
/* #undef HAVE__STRLWR */
|
|
#define HAVE_STRCHR 1
|
|
#define HAVE_STRRCHR 1
|
|
#define HAVE_STRSTR 1
|
|
/* #undef HAVE_STRTOK_R */
|
|
#if defined(_MSC_VER)
|
|
#define HAVE_STRTOK_S 1
|
|
#endif
|
|
/* These functions have security warnings, so we won't use them */
|
|
/* #undef HAVE__LTOA */
|
|
/* #undef HAVE__ULTOA */
|
|
#define HAVE_STRTOL 1
|
|
#define HAVE_STRTOUL 1
|
|
#define HAVE_STRTOD 1
|
|
#define HAVE_ATOI 1
|
|
#define HAVE_ATOF 1
|
|
#define HAVE_STRCMP 1
|
|
#define HAVE_STRNCMP 1
|
|
#define HAVE__STRICMP 1
|
|
#define HAVE__STRNICMP 1
|
|
#define HAVE_ACOS 1
|
|
#define HAVE_ACOSF 1
|
|
#define HAVE_ASIN 1
|
|
#define HAVE_ASINF 1
|
|
#define HAVE_ATAN 1
|
|
#define HAVE_ATANF 1
|
|
#define HAVE_ATAN2 1
|
|
#define HAVE_ATAN2F 1
|
|
#define HAVE_CEILF 1
|
|
#define HAVE__COPYSIGN 1
|
|
#define HAVE_COS 1
|
|
#define HAVE_COSF 1
|
|
#define HAVE_EXP 1
|
|
#define HAVE_EXPF 1
|
|
#define HAVE_FABS 1
|
|
#define HAVE_FABSF 1
|
|
#define HAVE_FLOOR 1
|
|
#define HAVE_FLOORF 1
|
|
#define HAVE_FMOD 1
|
|
#define HAVE_FMODF 1
|
|
#define HAVE_LOG 1
|
|
#define HAVE_LOGF 1
|
|
#define HAVE_LOG10 1
|
|
#define HAVE_LOG10F 1
|
|
#define HAVE_POW 1
|
|
#define HAVE_POWF 1
|
|
#define HAVE_SIN 1
|
|
#define HAVE_SINF 1
|
|
#define HAVE_SQRT 1
|
|
#define HAVE_SQRTF 1
|
|
#define HAVE_TAN 1
|
|
#define HAVE_TANF 1
|
|
#if defined(_MSC_VER)
|
|
/* These functions were added with the VC++ 2013 C runtime library */
|
|
#if _MSC_VER >= 1800
|
|
#define HAVE_STRTOLL 1
|
|
#define HAVE_VSSCANF 1
|
|
#define HAVE_SCALBN 1
|
|
#define HAVE_SCALBNF 1
|
|
#endif
|
|
/* This function is available with at least the VC++ 2008 C runtime library */
|
|
#if _MSC_VER >= 1400
|
|
#define HAVE__FSEEKI64 1
|
|
#endif
|
|
#endif
|
|
#if !defined(_MSC_VER) || defined(_USE_MATH_DEFINES)
|
|
#define HAVE_M_PI 1
|
|
#endif
|
|
#else
|
|
#define HAVE_STDARG_H 1
|
|
#define HAVE_STDDEF_H 1
|
|
#endif
|
|
|
|
/* Enable various audio drivers */
|
|
#define SDL_AUDIO_DRIVER_WASAPI 1
|
|
#define SDL_AUDIO_DRIVER_DSOUND 1
|
|
#define SDL_AUDIO_DRIVER_WINMM 1
|
|
#define SDL_AUDIO_DRIVER_DISK 1
|
|
#define SDL_AUDIO_DRIVER_DUMMY 1
|
|
|
|
/* Enable various input drivers */
|
|
#define SDL_JOYSTICK_DINPUT 1
|
|
#define SDL_JOYSTICK_XINPUT 1
|
|
#define SDL_JOYSTICK_HIDAPI 1
|
|
#define SDL_JOYSTICK_RAWINPUT 1
|
|
#define SDL_HAPTIC_DINPUT 1
|
|
#define SDL_HAPTIC_XINPUT 1
|
|
|
|
/* Enable the dummy sensor driver */
|
|
#define SDL_SENSOR_DUMMY 1
|
|
|
|
/* Enable various shared object loading systems */
|
|
#define SDL_LOADSO_WINDOWS 1
|
|
|
|
/* Enable various threading systems */
|
|
#define SDL_THREAD_WINDOWS 1
|
|
|
|
/* Enable various timer systems */
|
|
#define SDL_TIMER_WINDOWS 1
|
|
|
|
/* Enable various video drivers */
|
|
#define SDL_VIDEO_DRIVER_DUMMY 1
|
|
#define SDL_VIDEO_DRIVER_WINDOWS 1
|
|
|
|
#ifndef SDL_VIDEO_RENDER_D3D
|
|
#define SDL_VIDEO_RENDER_D3D 1
|
|
#endif
|
|
#ifndef SDL_VIDEO_RENDER_D3D11
|
|
#define SDL_VIDEO_RENDER_D3D11 0
|
|
#endif
|
|
|
|
/* Enable OpenGL support */
|
|
#ifndef SDL_VIDEO_OPENGL
|
|
#define SDL_VIDEO_OPENGL 1
|
|
#endif
|
|
#ifndef SDL_VIDEO_OPENGL_WGL
|
|
#define SDL_VIDEO_OPENGL_WGL 1
|
|
#endif
|
|
#ifndef SDL_VIDEO_RENDER_OGL
|
|
#define SDL_VIDEO_RENDER_OGL 1
|
|
#endif
|
|
#ifndef SDL_VIDEO_RENDER_OGL_ES2
|
|
#define SDL_VIDEO_RENDER_OGL_ES2 1
|
|
#endif
|
|
#ifndef SDL_VIDEO_OPENGL_ES2
|
|
#define SDL_VIDEO_OPENGL_ES2 1
|
|
#endif
|
|
#ifndef SDL_VIDEO_OPENGL_EGL
|
|
#define SDL_VIDEO_OPENGL_EGL 1
|
|
#endif
|
|
|
|
/* Enable Vulkan support */
|
|
#define SDL_VIDEO_VULKAN 1
|
|
|
|
/* Enable system power support */
|
|
#define SDL_POWER_WINDOWS 1
|
|
|
|
/* Enable filesystem support */
|
|
#define SDL_FILESYSTEM_WINDOWS 1
|
|
|
|
/* Enable assembly routines (Win64 doesn't have inline asm) */
|
|
#ifndef _WIN64
|
|
#define SDL_ASSEMBLY_ROUTINES 1
|
|
#endif
|
|
|
|
#endif /* SDL_config_windows_h_ */
|