Scancode

include/SFML/Window/Event.hpp

@@ -61,11 +61,12 @@ class Event
     ////////////////////////////////////////////////////////////
     struct KeyEvent
     {
-        Keyboard::Key code;    //!< Code of the key that has been pressed
-        bool          alt;     //!< Is the Alt key pressed?
-        bool          control; //!< Is the Control key pressed?
-        bool          shift;   //!< Is the Shift key pressed?
-        bool          system;  //!< Is the System key pressed?
+        Keyboard::Key code;          //!< Code of the key that has been pressed
+        Keyboard::Scancode scancode; //!< Physical code of the key that has been pressed
+        bool          alt;           //!< Is the Alt key pressed?
+        bool          control;       //!< Is the Control key pressed?
+        bool          shift;         //!< Is the Shift key pressed?
+        bool          system;        //!< Is the System key pressed?
     };
 
     ////////////////////////////////////////////////////////////

src/SFML/Window/Android/InputImpl.cpp

@@ -43,6 +43,30 @@ bool InputImpl::isKeyPressed(Keyboard::Key /* key */)
     return false;
 }
 
+bool InputImpl::isKeyPressed(Keyboard::Scancode /* codes */)
+{
+    // Not applicable
+    return false;
+}
+
+Keyboard::Key InputImpl::localize(Keyboard::Scancode /* code */)
+{
+    // Not applicable
+    return Keyboard::Unknown;
+}
+
+Keyboard::Scancode InputImpl::delocalize(Keyboard::Key /* key */)
+{
+    // Not applicable
+    return Keyboard::Scan::Unknown;
+}
+
+String InputImpl::getDescription(Keyboard::Scancode /* code */)
+{
+    // Not applicable
+    return "";
+}
+
 ////////////////////////////////////////////////////////////
 void InputImpl::setVirtualKeyboardVisible(bool visible)
 {

src/SFML/Window/Android/InputImpl.hpp

@@ -45,19 +45,37 @@ class InputImpl
 public:
 
     ////////////////////////////////////////////////////////////
-    /// \brief Check if a key is pressed
+    /// \copydoc sf::Keyboard::isKeyPressed(Key)
     ///
-    /// \param key Key to check
+    ////////////////////////////////////////////////////////////
+    static bool isKeyPressed(Keyboard::Key key);
+
+    ////////////////////////////////////////////////////////////
+    /// \copydoc sf::Keyboard::isKeyPressed(Scancode)
     ///
-    /// \return True if the key is pressed, false otherwise
+    ////////////////////////////////////////////////////////////
+    static bool isKeyPressed(Keyboard::Scancode code);
+
+    ////////////////////////////////////////////////////////////
+    /// \copydoc sf::Keyboard::localize
     ///
     ////////////////////////////////////////////////////////////
-    static bool isKeyPressed(Keyboard::Key key);
+    static Keyboard::Key localize(Keyboard::Scancode code);
 
     ////////////////////////////////////////////////////////////
-    /// \brief Show or hide the virtual keyboard
+    /// \copydoc sf::Keyboard::delocalize
     ///
-    /// \param visible True to show, false to hide
+    ////////////////////////////////////////////////////////////
+    static Keyboard::Scancode delocalize(Keyboard::Key key);
+
+    ////////////////////////////////////////////////////////////
+    /// \copydoc sf::Keyboard::getDescription
+    ///
+    ////////////////////////////////////////////////////////////
+    static String getDescription(Keyboard::Scancode code);
+
+    ////////////////////////////////////////////////////////////
+    /// \copydoc sf::Keyboard::setVirtualKeyboardVisible
     ///
     ////////////////////////////////////////////////////////////
     static void setVirtualKeyboardVisible(bool visible);

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;

src/SFML/Window/CMakeLists.txt

@@ -118,6 +118,12 @@ elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_OPENBSD OR SFML_OS_NETBSD)
             ${SRCROOT}/Unix/ClipboardImpl.cpp
             ${SRCROOT}/Unix/InputImpl.cpp
             ${SRCROOT}/Unix/InputImpl.hpp
+            ${SRCROOT}/Unix/KeyboardImpl.hpp
+            ${SRCROOT}/Unix/KeyboardImpl.cpp
+            ${SRCROOT}/Unix/KeySymToKeyMapping.hpp
+            ${SRCROOT}/Unix/KeySymToKeyMapping.cpp
+            ${SRCROOT}/Unix/KeySymToUnicodeMapping.hpp
+            ${SRCROOT}/Unix/KeySymToUnicodeMapping.cpp
             ${SRCROOT}/Unix/SensorImpl.cpp
             ${SRCROOT}/Unix/SensorImpl.hpp
             ${SRCROOT}/Unix/Display.cpp

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;
@@ -407,6 +407,7 @@ namespace
                             //
                             event.type = inputEvent.value ? sf::Event::KeyPressed : sf::Event::KeyReleased;
                             event.key.code = kb;
+                            event.key.scancode = sf::Keyboard::Scan::Unknown; // TODO: not implemented
                             event.key.alt = altDown();
                             event.key.control = controlDown();
                             event.key.shift = shiftDown();
@@ -567,6 +568,41 @@ bool InputImpl::isKeyPressed(Keyboard::Key key)
     return keyMap[static_cast<std::size_t>(key)];
 }
 
+////////////////////////////////////////////////////////////
+bool InputImpl::isKeyPressed(Keyboard::Scancode /* code */)
+{
+    // TODO: not implemented
+    err() << "sf::Keyboard::isKeyPressed(Keyboard::Scancode) is not implemented for DRM." << std::endl;
+    return false;
+}
+
+
+////////////////////////////////////////////////////////////
+Keyboard::Key InputImpl::localize(Keyboard::Scancode /* code */)
+{
+    // TODO: not implemented
+    err() << "sf::Keyboard::localize is not implemented for DRM." << std::endl;
+    return Keyboard::Unknown;
+}
+
+
+////////////////////////////////////////////////////////////
+Keyboard::Scancode InputImpl::delocalize(Keyboard::Key /* key */)
+{
+    // TODO: not implemented
+    err() << "sf::Keyboard::delocalize is not implemented for DRM." << std::endl;
+    return Keyboard::Scan::Unknown;
+}
+
+
+////////////////////////////////////////////////////////////
+String InputImpl::getDescription(Keyboard::Scancode /* code */)
+{
+    // TODO: not implemented
+    err() << "sf::Keyboard::getDescription is not implemented for DRM." << std::endl;
+    return "";
+}
+
 
 ////////////////////////////////////////////////////////////
 void InputImpl::setVirtualKeyboardVisible(bool /*visible*/)

src/SFML/Window/DRM/InputImplUDev.hpp

@@ -46,19 +46,37 @@ class InputImpl
 public:
 
     ////////////////////////////////////////////////////////////
-    /// \brief Check if a key is pressed
+    /// \copydoc sf::Keyboard::isKeyPressed(Key)
     ///
-    /// \param key Key to check
+    ////////////////////////////////////////////////////////////
+    static bool isKeyPressed(Keyboard::Key key);
+
+    ////////////////////////////////////////////////////////////
+    /// \copydoc sf::Keyboard::isKeyPressed(Scancode)
     ///
-    /// \return True if the key is pressed, false otherwise
+    ////////////////////////////////////////////////////////////
+    static bool isKeyPressed(Keyboard::Scancode code);
+
+    ////////////////////////////////////////////////////////////
+    /// \copydoc sf::Keyboard::localize
     ///
     ////////////////////////////////////////////////////////////
-    static bool isKeyPressed(Keyboard::Key key);
+    static Keyboard::Key localize(Keyboard::Scancode code);
 
     ////////////////////////////////////////////////////////////
-    /// \brief Show or hide the virtual keyboard
+    /// \copydoc sf::Keyboard::delocalize
     ///
-    /// \param visible True to show, false to hide
+    ////////////////////////////////////////////////////////////
+    static Keyboard::Scancode delocalize(Keyboard::Key key);
+
+    ////////////////////////////////////////////////////////////
+    /// \copydoc sf::Keyboard::getDescription
+    ///
+    ////////////////////////////////////////////////////////////
+    static String getDescription(Keyboard::Scancode code);
+
+    ////////////////////////////////////////////////////////////
+    /// \copydoc sf::Keyboard::setVirtualKeyboardVisible
     ///
     ////////////////////////////////////////////////////////////
     static void setVirtualKeyboardVisible(bool visible);

src/SFML/Window/Keyboard.cpp

@@ -27,6 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Keyboard.hpp>
 #include <SFML/Window/InputImpl.hpp>
+#include <SFML/System/String.hpp>
 
 
 namespace sf
@@ -37,6 +38,29 @@ bool Keyboard::isKeyPressed(Key key)
     return priv::InputImpl::isKeyPressed(key);
 }
 
+////////////////////////////////////////////////////////////
+bool Keyboard::isKeyPressed(Scancode code)
+{
+    return priv::InputImpl::isKeyPressed(code);
+}
+
+////////////////////////////////////////////////////////////
+Keyboard::Key Keyboard::localize(Scancode code)
+{
+    return priv::InputImpl::localize(code);
+}
+
+////////////////////////////////////////////////////////////
+Keyboard::Scancode Keyboard::delocalize(Key key)
+{
+    return priv::InputImpl::delocalize(key);
+}
+
+////////////////////////////////////////////////////////////
+String Keyboard::getDescription(Scancode code)
+{
+    return priv::InputImpl::getDescription(code);
+}
 
 ////////////////////////////////////////////////////////////
 void Keyboard::setVirtualKeyboardVisible(bool visible)