Browse Source

Renaming SDLK_QUOTE and SDLK_BACKQUOTE

Renaming SDLK_QUOTE to SDLK_APOSTROPHE.
Renaming SDLK_BACKQUOTE to SDLK_GRAVE.
This makes them similar to their scancode names.
Petar Popovic 11 months ago
parent
commit
94cbaaabbf

+ 8 - 0
build-scripts/SDL_migration.cocci

@@ -3144,3 +3144,11 @@ typedef SDL_Colour, SDL_Color;
 - SDL_iPhoneSetEventPump
 + SDL_iOSSetEventPump
   (...)
+@@
+@@
+- SDLK_QUOTE
++ SDLK_APOSTROPHE
+@@
+@@
+- SDLK_BACKQUOTE
++ SDLK_GRAVE

+ 2 - 0
docs/README-migration.md

@@ -903,6 +903,8 @@ The following symbols have been renamed:
 * KMOD_RSHIFT => SDL_KMOD_RSHIFT
 * KMOD_SCROLL => SDL_KMOD_SCROLL
 * KMOD_SHIFT => SDL_KMOD_SHIFT
+* SDLK_BACKQUOTE => SDLK_GRAVE
+* SDLK_QUOTE => SDLK_APOSTROPHE
 
 ## SDL_loadso.h
 

+ 2 - 2
include/SDL3/SDL_keycode.h

@@ -62,7 +62,7 @@ typedef Uint32 SDL_Keycode;
 #define SDLK_PERCENT    '%'
 #define SDLK_DOLLAR '$'
 #define SDLK_AMPERSAND  '&'
-#define SDLK_QUOTE  '\''
+#define SDLK_APOSTROPHE  '\''
 #define SDLK_LEFTPAREN  '('
 #define SDLK_RIGHTPAREN ')'
 #define SDLK_ASTERISK   '*'
@@ -93,7 +93,7 @@ typedef Uint32 SDL_Keycode;
 #define SDLK_RIGHTBRACKET   ']'
 #define SDLK_CARET  '^'
 #define SDLK_UNDERSCORE '_'
-#define SDLK_BACKQUOTE  '`'
+#define SDLK_GRAVE  '`'
 #define SDLK_a  'a'
 #define SDLK_b  'b'
 #define SDLK_c  'c'

+ 4 - 0
include/SDL3/SDL_oldnames.h

@@ -357,6 +357,8 @@
 #define KMOD_RSHIFT SDL_KMOD_RSHIFT
 #define KMOD_SCROLL SDL_KMOD_SCROLL
 #define KMOD_SHIFT SDL_KMOD_SHIFT
+#define SDLK_BACKQUOTE SDLK_GRAVE
+#define SDLK_QUOTE SDLK_APOSTROPHE
 
 /* ##SDL_log.h */
 #define SDL_LogGetOutputFunction SDL_GetLogOutputFunction
@@ -864,6 +866,8 @@
 #define KMOD_RSHIFT KMOD_RSHIFT_renamed_SDL_KMOD_RSHIFT
 #define KMOD_SCROLL KMOD_SCROLL_renamed_SDL_KMOD_SCROLL
 #define KMOD_SHIFT KMOD_SHIFT_renamed_SDL_KMOD_SHIFT
+#define SDLK_BACKQUOTE SDLK_BACKQUOTE_renamed_SDLK_GRAVE
+#define SDLK_QUOTE SDLK_QUOTE_renamed_SDLK_APOSTROPHE
 
 /* ##SDL_log.h */
 #define SDL_LogGetOutputFunction SDL_LogGetOutputFunction_renamed_SDL_GetLogOutputFunction

+ 3 - 3
src/video/emscripten/SDL_emscriptenevents.c

@@ -199,7 +199,7 @@ static const SDL_Keycode emscripten_keycode_table[] = {
     /* 157 */ SDLK_UNKNOWN,
     /* 158 */ SDLK_UNKNOWN,
     /* 159 */ SDLK_UNKNOWN,
-    /* 160 */ SDLK_BACKQUOTE,
+    /* 160 */ SDLK_GRAVE,
     /* 161 */ SDLK_UNKNOWN,
     /* 162 */ SDLK_UNKNOWN,
     /* 163 */ SDLK_KP_HASH, /*KaiOS phone keypad*/
@@ -231,7 +231,7 @@ static const SDL_Keycode emscripten_keycode_table[] = {
     /* 189 */ SDLK_MINUS, /*IE, Chrome, D3E legacy*/
     /* 190 */ SDLK_PERIOD,
     /* 191 */ SDLK_SLASH,
-    /* 192 */ SDLK_BACKQUOTE, /*FX, D3E legacy (SDLK_APOSTROPHE in IE/Chrome)*/
+    /* 192 */ SDLK_GRAVE, /*FX, D3E legacy (SDLK_APOSTROPHE in IE/Chrome)*/
     /* 193 */ SDLK_UNKNOWN,
     /* 194 */ SDLK_UNKNOWN,
     /* 195 */ SDLK_UNKNOWN,
@@ -261,7 +261,7 @@ static const SDL_Keycode emscripten_keycode_table[] = {
     /* 219 */ SDLK_LEFTBRACKET,
     /* 220 */ SDLK_BACKSLASH,
     /* 221 */ SDLK_RIGHTBRACKET,
-    /* 222 */ SDLK_QUOTE, /*FX, D3E legacy*/
+    /* 222 */ SDLK_APOSTROPHE, /*FX, D3E legacy*/
 };
 
 /*

+ 2 - 2
src/video/haiku/SDL_bkeyboard.cc

@@ -64,7 +64,7 @@ void HAIKU_InitOSKeymap(void) {
         keymap[B_PRINT_KEY]    = SDL_GetScancodeFromKey(SDLK_PRINTSCREEN);
         keymap[B_SCROLL_KEY]    = SDL_GetScancodeFromKey(SDLK_SCROLLLOCK);
         keymap[B_PAUSE_KEY]    = SDL_GetScancodeFromKey(SDLK_PAUSE);
-        keymap[0x11]        = SDL_GetScancodeFromKey(SDLK_BACKQUOTE);
+        keymap[0x11]        = SDL_GetScancodeFromKey(SDLK_GRAVE);
         keymap[0x12]        = SDL_GetScancodeFromKey(SDLK_1);
         keymap[0x13]        = SDL_GetScancodeFromKey(SDLK_2);
         keymap[0x14]        = SDL_GetScancodeFromKey(SDLK_3);
@@ -117,7 +117,7 @@ void HAIKU_InitOSKeymap(void) {
         keymap[0x43]        = SDL_GetScancodeFromKey(SDLK_k);
         keymap[0x44]        = SDL_GetScancodeFromKey(SDLK_l);
         keymap[0x45]        = SDL_GetScancodeFromKey(SDLK_SEMICOLON);
-        keymap[0x46]        = SDL_GetScancodeFromKey(SDLK_QUOTE);
+        keymap[0x46]        = SDL_GetScancodeFromKey(SDLK_APOSTROPHE);
         keymap[0x47]        = SDL_GetScancodeFromKey(SDLK_RETURN);
         keymap[0x48]        = SDL_GetScancodeFromKey(SDLK_KP_4);
         keymap[0x49]        = SDL_GetScancodeFromKey(SDLK_KP_5);

+ 2 - 2
src/video/psp/SDL_pspevents.c

@@ -149,7 +149,7 @@ void PSP_InitOSKeymap(SDL_VideoDevice *_this)
     keymap[KEY_F13] = SDLK_PRINT;
     keymap[KEY_F14] = SDLK_PAUSE;
 
-    keymap[KEY_GRAVE] = SDLK_BACKQUOTE;
+    keymap[KEY_GRAVE] = SDLK_GRAVE;
     keymap[KEY_1] = SDLK_1;
     keymap[KEY_2] = SDLK_2;
     keymap[KEY_3] = SDLK_3;
@@ -190,7 +190,7 @@ void PSP_InitOSKeymap(SDL_VideoDevice *_this)
     keymap[KEY_K] = SDLK_k;
     keymap[KEY_L] = SDLK_l;
     keymap[KEY_SEMICOLON] = SDLK_SEMICOLON;
-    keymap[KEY_APOSTROPHE] = SDLK_QUOTE;
+    keymap[KEY_APOSTROPHE] = SDLK_APOSTROPHE;
     keymap[KEY_BACKSLASH] = SDLK_BACKSLASH;
 
     keymap[KEY_Z] = SDLK_z;