Input|libgui: Handle the non-US backslash/tilde/accent key

skyjake · Sep 1, 2019 · d13c484 · d13c484
1 parent 579d2ec
commit d13c484
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/doomsday/apps/client/src/ui/b_util.cpp b/doomsday/apps/client/src/ui/b_util.cpp
@@ -903,6 +903,7 @@ static keyname_t const keyNames[] = {
     { DDKEY_MULTIPLY,    "multiply" },
     { DDKEY_SECTION,     "section" },
     { DDKEY_WINMENU,     "winmenu" },
+    { DDKEY_ISOEXTRAKEY, "extra" },
     { 0, nullptr}
 };
 

diff --git a/doomsday/libs/gui/include/de/input/ddkey.h b/doomsday/libs/gui/include/de/input/ddkey.h
@@ -90,6 +90,7 @@ enum {
     DDKEY_MULTIPLY,     ///< '*' on the numeric keypad.
     DDKEY_SECTION,      ///< §
     DDKEY_WINMENU,      ///< Windows-specific context menu key.
+    DDKEY_ISOEXTRAKEY,  ///< Non-US: backslash, or tilde/accent, or </> (depending on country).
     DD_HIGHEST_KEYCODE
 };
 

diff --git a/doomsday/libs/gui/src/input/keyevent.cpp b/doomsday/libs/gui/src/input/keyevent.cpp
@@ -221,6 +221,11 @@ int KeyEvent::ddKeyFromSDL(int sdlKey, int scancode)
         return sdlKey;
     }
 
+    if (scancode == SDL_SCANCODE_NONUSBACKSLASH)
+    {
+        return DDKEY_ISOEXTRAKEY;
+    }
+
     // Non-character-inserting keys.
     switch (sdlKey)
     {