From 4f978456a806e8e3c8e5bc8f0d2692650652c65e Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 4 Jan 2023 14:32:37 -0800 Subject: [PATCH] Renamed SDL_GAMEPADDEVICEREMAPPED to SDL_GAMEPADREMAPPED --- docs/README-migration.md | 2 +- include/SDL3/SDL_events.h | 8 ++++---- include/SDL3/SDL_oldnames.h | 8 ++++---- src/events/SDL_events.c | 2 +- src/joystick/SDL_gamepad.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/README-migration.md b/docs/README-migration.md index e6892816df..ddd78abb2d 100644 --- a/docs/README-migration.md +++ b/docs/README-migration.md @@ -98,7 +98,7 @@ The following symbols have been renamed: * SDL_CONTROLLERBUTTONDOWN => SDL_GAMEPADBUTTONDOWN * SDL_CONTROLLERBUTTONUP => SDL_GAMEPADBUTTONUP * SDL_CONTROLLERDEVICEADDED => SDL_GAMEPADADDED -* SDL_CONTROLLERDEVICEREMAPPED => SDL_GAMEPADDEVICEREMAPPED +* SDL_CONTROLLERDEVICEREMAPPED => SDL_GAMEPADREMAPPED * SDL_CONTROLLERDEVICEREMOVED => SDL_GAMEPADREMOVED * SDL_CONTROLLERSENSORUPDATE => SDL_GAMEPADSENSORUPDATE * SDL_CONTROLLERTOUCHPADDOWN => SDL_GAMEPADTOUCHPADDOWN diff --git a/include/SDL3/SDL_events.h b/include/SDL3/SDL_events.h index 4f22c614fb..1d0d580e65 100644 --- a/include/SDL3/SDL_events.h +++ b/include/SDL3/SDL_events.h @@ -154,9 +154,9 @@ typedef enum SDL_GAMEPADAXISMOTION = 0x650, /**< Gamepad axis motion */ SDL_GAMEPADBUTTONDOWN, /**< Gamepad button pressed */ SDL_GAMEPADBUTTONUP, /**< Gamepad button released */ - SDL_GAMEPADADDED, /**< A new Gamepad has been inserted into the system */ - SDL_GAMEPADREMOVED, /**< An opened Gamepad has been removed */ - SDL_GAMEPADDEVICEREMAPPED, /**< The gamepad mapping was updated */ + SDL_GAMEPADADDED, /**< A new gamepad has been inserted into the system */ + SDL_GAMEPADREMOVED, /**< An opened gamepad has been removed */ + SDL_GAMEPADREMAPPED, /**< The gamepad mapping was updated */ SDL_GAMEPADTOUCHPADDOWN, /**< Gamepad touchpad was touched */ SDL_GAMEPADTOUCHPADMOTION, /**< Gamepad touchpad finger was moved */ SDL_GAMEPADTOUCHPADUP, /**< Gamepad touchpad finger was lifted */ @@ -447,7 +447,7 @@ typedef struct SDL_GamepadButtonEvent */ typedef struct SDL_GamepadDeviceEvent { - Uint32 type; /**< ::SDL_GAMEPADADDED, ::SDL_GAMEPADREMOVED, or ::SDL_GAMEPADDEVICEREMAPPED */ + Uint32 type; /**< ::SDL_GAMEPADADDED, ::SDL_GAMEPADREMOVED, or ::SDL_GAMEPADREMAPPED */ Uint64 timestamp; /**< In nanoseconds, populated using SDL_GetTicksNS() */ SDL_JoystickID which; /**< The joystick instance id */ } SDL_GamepadDeviceEvent; diff --git a/include/SDL3/SDL_oldnames.h b/include/SDL3/SDL_oldnames.h index a8002066c2..caaf0f008c 100644 --- a/include/SDL3/SDL_oldnames.h +++ b/include/SDL3/SDL_oldnames.h @@ -54,7 +54,7 @@ #define SDL_CONTROLLERBUTTONDOWN SDL_GAMEPADBUTTONDOWN #define SDL_CONTROLLERBUTTONUP SDL_GAMEPADBUTTONUP #define SDL_CONTROLLERDEVICEADDED SDL_GAMEPADADDED -#define SDL_CONTROLLERDEVICEREMAPPED SDL_GAMEPADDEVICEREMAPPED +#define SDL_CONTROLLERDEVICEREMAPPED SDL_GAMEPADREMAPPED #define SDL_CONTROLLERDEVICEREMOVED SDL_GAMEPADREMOVED #define SDL_CONTROLLERSENSORUPDATE SDL_GAMEPADSENSORUPDATE #define SDL_CONTROLLERTOUCHPADDOWN SDL_GAMEPADTOUCHPADDOWN @@ -360,9 +360,9 @@ #define SDL_CONTROLLERAXISMOTION SDL_CONTROLLERAXISMOTION_renamed_SDL_GAMEPADAXISMOTION #define SDL_CONTROLLERBUTTONDOWN SDL_CONTROLLERBUTTONDOWN_renamed_SDL_GAMEPADBUTTONDOWN #define SDL_CONTROLLERBUTTONUP SDL_CONTROLLERBUTTONUP_renamed_SDL_GAMEPADBUTTONUP -#define SDL_CONTROLLERDEVICEADDED SDL_CONTROLLERDEVICEADDED_renamed_SDL_GAMEPADDEVICEADDED -#define SDL_CONTROLLERDEVICEREMAPPED SDL_CONTROLLERDEVICEREMAPPED_renamed_SDL_GAMEPADDEVICEREMAPPED -#define SDL_CONTROLLERDEVICEREMOVED SDL_CONTROLLERDEVICEREMOVED_renamed_SDL_GAMEPADDEVICEREMOVED +#define SDL_CONTROLLERDEVICEADDED SDL_CONTROLLERDEVICEADDED_renamed_SDL_GAMEPADADDED +#define SDL_CONTROLLERDEVICEREMAPPED SDL_CONTROLLERDEVICEREMAPPED_renamed_SDL_GAMEPADREMAPPED +#define SDL_CONTROLLERDEVICEREMOVED SDL_CONTROLLERDEVICEREMOVED_renamed_SDL_GAMEPADREMOVED #define SDL_CONTROLLERSENSORUPDATE SDL_CONTROLLERSENSORUPDATE_renamed_SDL_GAMEPADSENSORUPDATE #define SDL_CONTROLLERTOUCHPADDOWN SDL_CONTROLLERTOUCHPADDOWN_renamed_SDL_GAMEPADTOUCHPADDOWN #define SDL_CONTROLLERTOUCHPADMOTION SDL_CONTROLLERTOUCHPADMOTION_renamed_SDL_GAMEPADTOUCHPADMOTION diff --git a/src/events/SDL_events.c b/src/events/SDL_events.c index 756604affb..b25ddaaed9 100644 --- a/src/events/SDL_events.c +++ b/src/events/SDL_events.c @@ -369,7 +369,7 @@ static void SDL_LogEvent(const SDL_Event *event) SDL_EVENT_CASE(SDL_GAMEPADREMOVED) PRINT_GAMEPADDEV_EVENT(event); break; - SDL_EVENT_CASE(SDL_GAMEPADDEVICEREMAPPED) + SDL_EVENT_CASE(SDL_GAMEPADREMAPPED) PRINT_GAMEPADDEV_EVENT(event); break; #undef PRINT_GAMEPADDEV_EVENT diff --git a/src/joystick/SDL_gamepad.c b/src/joystick/SDL_gamepad.c index b257b092d4..792ebf6cfa 100644 --- a/src/joystick/SDL_gamepad.c +++ b/src/joystick/SDL_gamepad.c @@ -1215,7 +1215,7 @@ static void SDL_PrivateRefreshGamepadMapping(GamepadMapping_t *pGamepadMapping) { SDL_Event event; - event.type = SDL_GAMEPADDEVICEREMAPPED; + event.type = SDL_GAMEPADREMAPPED; event.common.timestamp = 0; event.cdevice.which = gamepad->joystick->instance_id; SDL_PushEvent(&event); @@ -3137,7 +3137,7 @@ static const Uint32 SDL_gamepad_event_list[] = { SDL_GAMEPADBUTTONUP, SDL_GAMEPADADDED, SDL_GAMEPADREMOVED, - SDL_GAMEPADDEVICEREMAPPED, + SDL_GAMEPADREMAPPED, SDL_GAMEPADTOUCHPADDOWN, SDL_GAMEPADTOUCHPADMOTION, SDL_GAMEPADTOUCHPADUP,