Browse Source

Add missing _ in SDL_EVENT_LOCALECHANGED and SSDL_EVENT_TEXTEDITING_EXT

Anonymous Maarten 2 years ago
parent
commit
69aede6c9e

+ 1 - 1
build-scripts/SDL_migration.cocci

@@ -2172,7 +2172,7 @@ expression e;
 @@
 @@
 - SDL_TEXTEDITING_EXT
-+ SDL_EVENT_TEXTEDITING_EXT
++ SDL_EVENT_TEXT_EDITING_EXT
 @@
 @@
 - SDL_MOUSEMOTION

+ 2 - 2
docs/README-migration.md

@@ -169,7 +169,7 @@ The following symbols have been renamed:
 * SDL_KEYMAPCHANGED => SDL_EVENT_KEYMAP_CHANGED
 * SDL_KEYUP => SDL_EVENT_KEY_UP
 * SDL_LASTEVENT => SDL_EVENT_LAST
-* SDL_LOCALECHANGED => SDL_EVENT_LOCALECHANGED
+* SDL_LOCALECHANGED => SDL_EVENT_LOCALE_CHANGED
 * SDL_MOUSEBUTTONDOWN => SDL_EVENT_MOUSE_BUTTON_DOWN
 * SDL_MOUSEBUTTONUP => SDL_EVENT_MOUSE_BUTTON_UP
 * SDL_MOUSEMOTION => SDL_EVENT_MOUSE_MOTION
@@ -181,7 +181,7 @@ The following symbols have been renamed:
 * SDL_SENSORUPDATE => SDL_EVENT_SENSOR_UPDATE
 * SDL_SYSWMEVENT => SDL_EVENT_SYSWM
 * SDL_TEXTEDITING => SDL_EVENT_TEXT_EDITING
-* SDL_TEXTEDITING_EXT => SDL_EVENT_TEXTEDITING_EXT
+* SDL_TEXTEDITING_EXT => SDL_EVENT_TEXT_EDITING_EXT
 * SDL_TEXTINPUT => SDL_EVENT_TEXT_INPUT
 * SDL_USEREVENT => SDL_EVENT_USER
 

+ 3 - 4
include/SDL3/SDL_events.h

@@ -126,9 +126,8 @@ typedef enum
     SDL_EVENT_TEXT_EDITING,            /**< Keyboard text editing (composition) */
     SDL_EVENT_TEXT_INPUT,              /**< Keyboard text input */
     SDL_EVENT_KEYMAP_CHANGED,          /**< Keymap changed due to a system event such as an
-                                     input language or keyboard layout change.
-                                */
-    SDL_EVENT_TEXTEDITING_EXT,       /**< Extended keyboard text editing (composition) */
+                                            input language or keyboard layout change. */
+    SDL_EVENT_TEXT_EDITING_EXT,        /**< Extended keyboard text editing (composition) */
 
     /* Mouse events */
     SDL_EVENT_MOUSE_MOTION    = 0x400, /**< Mouse moved */
@@ -265,7 +264,7 @@ typedef struct SDL_TextEditingEvent
  */
 typedef struct SDL_TextEditingExtEvent
 {
-    Uint32 type;                                /**< ::SDL_EVENT_TEXTEDITING_EXT */
+    Uint32 type;                                /**< ::SDL_EVENT_TEXT_EDITING_EXT */
     Uint64 timestamp;                           /**< In nanoseconds, populated using SDL_GetTicksNS() */
     SDL_WindowID windowID;                        /**< The window with keyboard focus, if any */
     char* text;                                 /**< The editing text, which should be freed with SDL_free(), and will not be NULL */

+ 3 - 3
include/SDL3/SDL_oldnames.h

@@ -109,7 +109,7 @@
 #define SDL_SENSORUPDATE SDL_EVENT_SENSOR_UPDATE
 #define SDL_SYSWMEVENT SDL_EVENT_SYSWM
 #define SDL_TEXTEDITING SDL_EVENT_TEXT_EDITING
-#define SDL_TEXTEDITING_EXT SDL_EVENT_TEXTEDITING_EXT
+#define SDL_TEXTEDITING_EXT SDL_EVENT_TEXT_EDITING_EXT
 #define SDL_TEXTINPUT SDL_EVENT_TEXT_INPUT
 #define SDL_USEREVENT SDL_EVENT_USER
 #define SDL_WINDOWEVENT_CLOSE SDL_EVENT_WINDOW_CLOSE_REQUESTED
@@ -481,7 +481,7 @@
 #define SDL_KEYMAPCHANGED SDL_KEYMAPCHANGED_renamed_SDL_EVENT_KEYMAP_CHANGED
 #define SDL_KEYUP SDL_KEYUP_renamed_SDL_EVENT_KEY_UP
 #define SDL_LASTEVENT SDL_LASTEVENT_renamed_SDL_EVENT_LAST
-#define SDL_LOCALECHANGED SDL_LOCALECHANGED_renamed_SDL_EVENT_LOCALECHANGED
+#define SDL_LOCALECHANGED SDL_LOCALECHANGED_renamed_SDL_EVENT_LOCALE_CHANGED
 #define SDL_MOUSEBUTTONDOWN SDL_MOUSEBUTTONDOWN_renamed_SDL_EVENT_MOUSE_BUTTON_DOWN
 #define SDL_MOUSEBUTTONUP SDL_MOUSEBUTTONUP_renamed_SDL_EVENT_MOUSE_BUTTON_UP
 #define SDL_MOUSEMOTION SDL_MOUSEMOTION_renamed_SDL_EVENT_MOUSE_MOTION
@@ -493,7 +493,7 @@
 #define SDL_SENSORUPDATE SDL_SENSORUPDATE_renamed_SDL_EVENT_SENSOR_UPDATE
 #define SDL_SYSWMEVENT SDL_SYSWMEVENT_renamed_SDL_EVENT_SYSWM
 #define SDL_TEXTEDITING SDL_TEXTEDITING_renamed_SDL_EVENT_TEXT_EDITING
-#define SDL_TEXTEDITING_EXT SDL_TEXTEDITING_EXT_renamed_SDL_EVENT_TEXTEDITING_EXT
+#define SDL_TEXTEDITING_EXT SDL_TEXTEDITING_EXT_renamed_SDL_EVENT_TEXT_EDITING_EXT
 #define SDL_TEXTINPUT SDL_TEXTINPUT_renamed_SDL_EVENT_TEXT_INPUT
 #define SDL_USEREVENT SDL_USEREVENT_renamed_SDL_EVENT_USER
 #define SDL_WINDOWEVENT_CLOSE SDL_WINDOWEVENT_CLOSE_renamed_SDL_EVENT_WINDOW_CLOSE

+ 1 - 1
src/events/SDL_keyboard.c

@@ -1059,7 +1059,7 @@ int SDL_SendEditingText(const char *text, int start, int length)
 
         if (SDL_GetHintBoolean(SDL_HINT_IME_SUPPORT_EXTENDED_TEXT, SDL_FALSE) &&
             SDL_strlen(text) >= SDL_arraysize(event.text.text)) {
-            event.type = SDL_EVENT_TEXTEDITING_EXT;
+            event.type = SDL_EVENT_TEXT_EDITING_EXT;
             event.common.timestamp = 0;
             event.editExt.windowID = keyboard->focus ? keyboard->focus->id : 0;
             event.editExt.text = text ? SDL_strdup(text) : NULL;

+ 1 - 1
test/checkkeys.c

@@ -192,7 +192,7 @@ void loop()
         case SDL_EVENT_TEXT_EDITING:
             PrintText("EDIT", event.edit.text);
             break;
-        case SDL_EVENT_TEXTEDITING_EXT:
+        case SDL_EVENT_TEXT_EDITING_EXT:
             PrintText("EDIT_EXT", event.editExt.text);
             SDL_free(event.editExt.text);
             break;