From 093160904d49d99c9e50467a3dd04c0f98f292d2 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 17 Apr 2024 17:30:10 -0400 Subject: [PATCH] SDL_Keymod: Removed SDL_KMOD_RESERVED. Fixes #9481. --- build-scripts/SDL_migration.cocci | 4 ---- docs/README-migration.md | 5 ++++- include/SDL3/SDL_keycode.h | 2 -- include/SDL3/SDL_oldnames.h | 2 -- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/build-scripts/SDL_migration.cocci b/build-scripts/SDL_migration.cocci index 85e900776..1207b8f33 100644 --- a/build-scripts/SDL_migration.cocci +++ b/build-scripts/SDL_migration.cocci @@ -1549,10 +1549,6 @@ typedef SDL_GameControllerButton, SDL_GamepadButton; + SDL_KMOD_RCTRL @@ @@ -- KMOD_RESERVED -+ SDL_KMOD_RESERVED -@@ -@@ - KMOD_RGUI + SDL_KMOD_RGUI @@ diff --git a/docs/README-migration.md b/docs/README-migration.md index 14445253c..b0b1f5c74 100644 --- a/docs/README-migration.md +++ b/docs/README-migration.md @@ -877,6 +877,10 @@ The following functions have been removed: The SDL_KeyCode enum values have been changed to defines to more clearly reflect that they are a subset of the possible values of an SDL_Keycode. +The following symbols have been removed: + +* KMOD_RESERVED - No replacement. A bit named "RESERVED" probably shouldn't be used in an app, but if you need it, this was equivalent to KMOD_SCROLL (0x8000) in SDL2. + The following symbols have been renamed: * KMOD_ALT => SDL_KMOD_ALT * KMOD_CAPS => SDL_KMOD_CAPS @@ -891,7 +895,6 @@ The following symbols have been renamed: * KMOD_NUM => SDL_KMOD_NUM * KMOD_RALT => SDL_KMOD_RALT * KMOD_RCTRL => SDL_KMOD_RCTRL -* KMOD_RESERVED => SDL_KMOD_RESERVED * KMOD_RGUI => SDL_KMOD_RGUI * KMOD_RSHIFT => SDL_KMOD_RSHIFT * KMOD_SCROLL => SDL_KMOD_SCROLL diff --git a/include/SDL3/SDL_keycode.h b/include/SDL3/SDL_keycode.h index d04d86c8b..13b5df812 100644 --- a/include/SDL3/SDL_keycode.h +++ b/include/SDL3/SDL_keycode.h @@ -324,8 +324,6 @@ typedef enum SDL_Keymod SDL_KMOD_SHIFT = SDL_KMOD_LSHIFT | SDL_KMOD_RSHIFT, /**< Any Shift key is down. */ SDL_KMOD_ALT = SDL_KMOD_LALT | SDL_KMOD_RALT, /**< Any Alt key is down. */ SDL_KMOD_GUI = SDL_KMOD_LGUI | SDL_KMOD_RGUI, /**< Any GUI key is down. */ - - SDL_KMOD_RESERVED = SDL_KMOD_SCROLL /* This is for source-level compatibility with SDL 2.0.0. */ } SDL_Keymod; #endif /* SDL_keycode_h_ */ diff --git a/include/SDL3/SDL_oldnames.h b/include/SDL3/SDL_oldnames.h index 3a78d85af..75e08e297 100644 --- a/include/SDL3/SDL_oldnames.h +++ b/include/SDL3/SDL_oldnames.h @@ -354,7 +354,6 @@ #define KMOD_NUM SDL_KMOD_NUM #define KMOD_RALT SDL_KMOD_RALT #define KMOD_RCTRL SDL_KMOD_RCTRL -#define KMOD_RESERVED SDL_KMOD_RESERVED #define KMOD_RGUI SDL_KMOD_RGUI #define KMOD_RSHIFT SDL_KMOD_RSHIFT #define KMOD_SCROLL SDL_KMOD_SCROLL @@ -862,7 +861,6 @@ #define KMOD_NUM KMOD_NUM_renamed_SDL_KMOD_NUM #define KMOD_RALT KMOD_RALT_renamed_SDL_KMOD_RALT #define KMOD_RCTRL KMOD_RCTRL_renamed_SDL_KMOD_RCTRL -#define KMOD_RESERVED KMOD_RESERVED_renamed_SDL_KMOD_RESERVED #define KMOD_RGUI KMOD_RGUI_renamed_SDL_KMOD_RGUI #define KMOD_RSHIFT KMOD_RSHIFT_renamed_SDL_KMOD_RSHIFT #define KMOD_SCROLL KMOD_SCROLL_renamed_SDL_KMOD_SCROLL