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

Renamed SDL_HINT_DIRECTINPUT_ENABLED to SDL_HINT_JOYSTICK_DIRECTINPUT

Browse source
This commit is contained in:
Sam Lantinga 2024-02-11 17:53:08 -08:00
parent a5da7d0dd5
commit fd5d761128
6 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build-scripts/SDL_migration.cocci
View file

@ -3012,3 +3012,7 @@ typedef SDL_version, SDL_Version;
@@ @@
- SDL_HINT_ALLOW_TOPMOST - SDL_HINT_ALLOW_TOPMOST
+ SDL_HINT_WINDOW_ALLOW_TOPMOST + SDL_HINT_WINDOW_ALLOW_TOPMOST
@@
@@
- SDL_HINT_DIRECTINPUT_ENABLED
+ SDL_HINT_JOYSTICK_DIRECTINPUT

1
docs/README-migration.md
View file

@ -726,6 +726,7 @@ The following hints have been removed:
The following hints have been renamed: The following hints have been renamed:
* SDL_HINT_ALLOW_TOPMOST => SDL_HINT_WINDOW_ALLOW_TOPMOST * SDL_HINT_ALLOW_TOPMOST => SDL_HINT_WINDOW_ALLOW_TOPMOST
* SDL_HINT_DIRECTINPUT_ENABLED => SDL_HINT_JOYSTICK_DIRECTINPUT
## SDL_init.h ## SDL_init.h

2
include/SDL3/SDL_hints.h
View file

@ -364,7 +364,7 @@ extern "C" {
* *
* This hint should be set before SDL is initialized. * This hint should be set before SDL is initialized.
*/ */
#define SDL_HINT_DIRECTINPUT_ENABLED "SDL_DIRECTINPUT_ENABLED" #define SDL_HINT_JOYSTICK_DIRECTINPUT "SDL_JOYSTICK_DIRECTINPUT"
/** /**
* Override for SDL_GetDisplayUsableBounds() * Override for SDL_GetDisplayUsableBounds()

2
include/SDL3/SDL_oldnames.h
View file

@ -281,6 +281,7 @@
/* ##SDL_hints.h */ /* ##SDL_hints.h */
#define SDL_HINT_ALLOW_TOPMOST SDL_HINT_WINDOW_ALLOW_TOPMOST #define SDL_HINT_ALLOW_TOPMOST SDL_HINT_WINDOW_ALLOW_TOPMOST
#define SDL_HINT_DIRECTINPUT_ENABLED SDL_HINT_JOYSTICK_DIRECTINPUT
/* ##SDL_joystick.h */ /* ##SDL_joystick.h */
#define SDL_JOYSTICK_TYPE_GAMECONTROLLER SDL_JOYSTICK_TYPE_GAMEPAD #define SDL_JOYSTICK_TYPE_GAMECONTROLLER SDL_JOYSTICK_TYPE_GAMEPAD
@ -756,6 +757,7 @@
/* ##SDL_hints.h */ /* ##SDL_hints.h */
#define SDL_HINT_ALLOW_TOPMOST SDL_HINT_ALLOW_TOPMOST_renamed_SDL_HINT_WINDOW_ALLOW_TOPMOST #define SDL_HINT_ALLOW_TOPMOST SDL_HINT_ALLOW_TOPMOST_renamed_SDL_HINT_WINDOW_ALLOW_TOPMOST
#define SDL_HINT_DIRECTINPUT_ENABLED SDL_HINT_DIRECTINPUT_ENABLED_renamed_SDL_HINT_JOYSTICK_DIRECTINPUT
/* ##SDL_joystick.h */ /* ##SDL_joystick.h */
#define SDL_JOYSTICK_TYPE_GAMECONTROLLER SDL_JOYSTICK_TYPE_GAMECONTROLLER_renamed_SDL_JOYSTICK_TYPE_GAMEPAD #define SDL_JOYSTICK_TYPE_GAMECONTROLLER SDL_JOYSTICK_TYPE_GAMECONTROLLER_renamed_SDL_JOYSTICK_TYPE_GAMEPAD

2
src/haptic/windows/SDL_dinputhaptic.c
View file

@ -71,7 +71,7 @@ int SDL_DINPUT_HapticInit(void)
return SDL_SetError("Haptic: SubSystem already open."); return SDL_SetError("Haptic: SubSystem already open.");
} }
if (!SDL_GetHintBoolean(SDL_HINT_DIRECTINPUT_ENABLED, SDL_TRUE)) { if (!SDL_GetHintBoolean(SDL_HINT_JOYSTICK_DIRECTINPUT, SDL_TRUE)) {
/* In some environments, IDirectInput8_Initialize / _EnumDevices can take a minute even with no controllers. */ /* In some environments, IDirectInput8_Initialize / _EnumDevices can take a minute even with no controllers. */
return 0; return 0;
} }

2
src/joystick/windows/SDL_dinputjoystick.c
View file

@ -398,7 +398,7 @@ int SDL_DINPUT_JoystickInit(void)
HRESULT result; HRESULT result;
HINSTANCE instance; HINSTANCE instance;
if (!SDL_GetHintBoolean(SDL_HINT_DIRECTINPUT_ENABLED, SDL_TRUE)) { if (!SDL_GetHintBoolean(SDL_HINT_JOYSTICK_DIRECTINPUT, SDL_TRUE)) {
/* In some environments, IDirectInput8_Initialize / _EnumDevices can take a minute even with no controllers. */ /* In some environments, IDirectInput8_Initialize / _EnumDevices can take a minute even with no controllers. */
dinput = NULL; dinput = NULL;
return 0; return 0;