From 752955c6f86da4a7c3aad27fa23489531538dfa5 Mon Sep 17 00:00:00 2001 From: kimci86 Date: Tue, 20 Dec 2022 21:55:09 +0100 Subject: [PATCH] Rename Key::Tilde to Key::Grave --- include/SFML/Window/Keyboard.hpp | 3 ++- src/SFML/Window/Android/WindowImplAndroid.cpp | 2 +- src/SFML/Window/DRM/InputImplUDev.cpp | 2 +- src/SFML/Window/OSX/HIDInputManager.mm | 4 ++-- src/SFML/Window/Unix/KeySymToKeyMapping.cpp | 4 ++-- src/SFML/Window/Win32/InputImpl.cpp | 4 ++-- src/SFML/Window/Win32/WindowImplWin32.cpp | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/include/SFML/Window/Keyboard.hpp b/include/SFML/Window/Keyboard.hpp index 657fb9f1e..71d67f0b9 100644 --- a/include/SFML/Window/Keyboard.hpp +++ b/include/SFML/Window/Keyboard.hpp @@ -108,7 +108,7 @@ public: Apostrophe, //!< The ' key Slash, //!< The / key Backslash, //!< The \ key - Tilde, //!< The ~ key + Grave, //!< The ` key Equal, //!< The = key Hyphen, //!< The - key (hyphen) Space, //!< The Space key @@ -160,6 +160,7 @@ public: // Deprecated values: + Tilde = Grave, //!< \deprecated Use Grave instead Dash = Hyphen, //!< \deprecated Use Hyphen instead BackSpace = Backspace, //!< \deprecated Use Backspace instead BackSlash = Backslash, //!< \deprecated Use Backslash instead diff --git a/src/SFML/Window/Android/WindowImplAndroid.cpp b/src/SFML/Window/Android/WindowImplAndroid.cpp index afecc8612..6455be1f0 100644 --- a/src/SFML/Window/Android/WindowImplAndroid.cpp +++ b/src/SFML/Window/Android/WindowImplAndroid.cpp @@ -633,7 +633,7 @@ Keyboard::Key WindowImplAndroid::androidKeyToSF(int32_t key) case AKEYCODE_ENTER: return Keyboard::Enter; case AKEYCODE_DEL: return Keyboard::Backspace; case AKEYCODE_FORWARD_DEL: return Keyboard::Delete; - case AKEYCODE_GRAVE: return Keyboard::Tilde; + case AKEYCODE_GRAVE: return Keyboard::Grave; case AKEYCODE_MINUS: return Keyboard::Subtract; case AKEYCODE_EQUALS: return Keyboard::Equal; case AKEYCODE_LEFT_BRACKET: return Keyboard::LBracket; diff --git a/src/SFML/Window/DRM/InputImplUDev.cpp b/src/SFML/Window/DRM/InputImplUDev.cpp index 67f76d8e4..2c78cf979 100644 --- a/src/SFML/Window/DRM/InputImplUDev.cpp +++ b/src/SFML/Window/DRM/InputImplUDev.cpp @@ -218,7 +218,7 @@ namespace case KEY_L: return sf::Keyboard::L; case KEY_SEMICOLON: return sf::Keyboard::Semicolon; case KEY_APOSTROPHE: return sf::Keyboard::Quote; - case KEY_GRAVE: return sf::Keyboard::Tilde; + case KEY_GRAVE: return sf::Keyboard::Grave; case KEY_LEFTSHIFT: return sf::Keyboard::LShift; case KEY_BACKSLASH: return sf::Keyboard::Backslash; case KEY_Z: return sf::Keyboard::Z; diff --git a/src/SFML/Window/OSX/HIDInputManager.mm b/src/SFML/Window/OSX/HIDInputManager.mm index 20df43379..8c2d7a010 100644 --- a/src/SFML/Window/OSX/HIDInputManager.mm +++ b/src/SFML/Window/OSX/HIDInputManager.mm @@ -182,7 +182,7 @@ Keyboard::Key HIDInputManager::localizedKey(UniChar ch) case 0x27: return Keyboard::Apostrophe; case 0x2f: return Keyboard::Slash; case 0x5c: return Keyboard::Backslash; - case 0x7e: return Keyboard::Tilde; + case 0x60: return Keyboard::Grave; case 0x3d: return Keyboard::Equal; case 0x2d: return Keyboard::Hyphen; case 0x20: return Keyboard::Space; @@ -310,7 +310,7 @@ UniChar HIDInputManager::toUnicode(Keyboard::Key key) case Keyboard::Apostrophe: return 0x27; case Keyboard::Slash: return 0x2f; case Keyboard::Backslash: return 0x5c; - case Keyboard::Tilde: return 0x7e; + case Keyboard::Grave: return 0x60; case Keyboard::Equal: return 0x3d; case Keyboard::Hyphen: return 0x2d; case Keyboard::Space: return 0x20; diff --git a/src/SFML/Window/Unix/KeySymToKeyMapping.cpp b/src/SFML/Window/Unix/KeySymToKeyMapping.cpp index 04143f143..8e8a7f559 100644 --- a/src/SFML/Window/Unix/KeySymToKeyMapping.cpp +++ b/src/SFML/Window/Unix/KeySymToKeyMapping.cpp @@ -59,7 +59,7 @@ Keyboard::Key keySymToKey(KeySym symbol) case XK_period: return Keyboard::Period; case XK_apostrophe: return Keyboard::Quote; case XK_backslash: return Keyboard::BackSlash; - case XK_grave: return Keyboard::Tilde; + case XK_grave: return Keyboard::Grave; case XK_space: return Keyboard::Space; case XK_Return: return Keyboard::Return; case XK_KP_Enter: return Keyboard::Return; @@ -172,7 +172,7 @@ KeySym keyToKeySym(Keyboard::Key key) case Keyboard::Period: return XK_period; case Keyboard::Quote: return XK_apostrophe; case Keyboard::BackSlash: return XK_backslash; - case Keyboard::Tilde: return XK_grave; + case Keyboard::Grave: return XK_grave; case Keyboard::Space: return XK_space; case Keyboard::Return: return XK_Return; case Keyboard::BackSpace: return XK_BackSpace; diff --git a/src/SFML/Window/Win32/InputImpl.cpp b/src/SFML/Window/Win32/InputImpl.cpp index 1b7515730..1e18a9058 100644 --- a/src/SFML/Window/Win32/InputImpl.cpp +++ b/src/SFML/Window/Win32/InputImpl.cpp @@ -106,7 +106,7 @@ Keyboard::Key virtualKeyToSfKey(UINT virtualKey) case VK_OEM_7: key = Keyboard::Apostrophe; break; case VK_OEM_2: key = Keyboard::Slash; break; case VK_OEM_5: key = Keyboard::Backslash; break; - case VK_OEM_3: key = Keyboard::Tilde; break; + case VK_OEM_3: key = Keyboard::Grave; break; case VK_OEM_PLUS: key = Keyboard::Equal; break; case VK_OEM_MINUS: key = Keyboard::Hyphen; break; case VK_SPACE: key = Keyboard::Space; break; @@ -218,7 +218,7 @@ int sfKeyToVirtualKey(Keyboard::Key key) case Keyboard::Apostrophe: virtualKey = VK_OEM_7; break; case Keyboard::Slash: virtualKey = VK_OEM_2; break; case Keyboard::Backslash: virtualKey = VK_OEM_5; break; - case Keyboard::Tilde: virtualKey = VK_OEM_3; break; + case Keyboard::Grave: virtualKey = VK_OEM_3; break; case Keyboard::Equal: virtualKey = VK_OEM_PLUS; break; case Keyboard::Hyphen: virtualKey = VK_OEM_MINUS; break; case Keyboard::Space: virtualKey = VK_SPACE; break; diff --git a/src/SFML/Window/Win32/WindowImplWin32.cpp b/src/SFML/Window/Win32/WindowImplWin32.cpp index 26d4f2846..a58ad2cfd 100755 --- a/src/SFML/Window/Win32/WindowImplWin32.cpp +++ b/src/SFML/Window/Win32/WindowImplWin32.cpp @@ -1169,7 +1169,7 @@ Keyboard::Key WindowImplWin32::virtualKeyCodeToSF(WPARAM key, LPARAM flags) case VK_OEM_PERIOD: return Keyboard::Period; case VK_OEM_7: return Keyboard::Apostrophe; case VK_OEM_5: return Keyboard::Backslash; - case VK_OEM_3: return Keyboard::Tilde; + case VK_OEM_3: return Keyboard::Grave; case VK_ESCAPE: return Keyboard::Escape; case VK_SPACE: return Keyboard::Space; case VK_RETURN: return Keyboard::Enter;