diff --git a/src/blackinput/linux/keyboardlinux.cpp b/src/blackinput/linux/keyboardlinux.cpp index dd2789195..984822fa7 100644 --- a/src/blackinput/linux/keyboardlinux.cpp +++ b/src/blackinput/linux/keyboardlinux.cpp @@ -21,7 +21,7 @@ using namespace BlackMisc::Input; namespace BlackInput { - + // https://www.cl.cam.ac.uk/~mgk25/ucs/keysymdef.h static QHash keyMapping { { XK_0, Key_0 }, @@ -76,6 +76,8 @@ namespace BlackInput { XK_BackSpace, Key_Back }, { XK_Tab, Key_Tab }, { XK_Escape, Key_Esc }, + { XK_space, Key_Space }, + { XK_dead_grave, Key_DeadGrave }, { XK_comma, Key_Comma }, }; diff --git a/src/blackinput/macos/keyboardmacos.mm b/src/blackinput/macos/keyboardmacos.mm index 3cedf7c20..61ad3d757 100644 --- a/src/blackinput/macos/keyboardmacos.mm +++ b/src/blackinput/macos/keyboardmacos.mm @@ -19,7 +19,7 @@ using namespace BlackMisc::Input; namespace BlackInput { - + // https://developer.apple.com/documentation/iokit/1592915-anonymous?language=objc static QHash keyMapping { { kHIDUsage_Keyboard0, Key_0 }, @@ -67,6 +67,8 @@ namespace BlackInput { kHIDUsage_KeyboardDeleteOrBackspace, Key_Back }, { kHIDUsage_KeyboardTab, Key_Tab }, { kHIDUsage_KeyboardEscape, Key_Esc }, + { kHIDUsage_KeyboardSpacebar, Key_Space }, + { kHIDUsage_KeyboardGraveAccentAndTilde, Key_DeadGrave }, { kHIDUsage_KeyboardComma, Key_Comma }, { kHIDUsage_Keypad0, Key_Numpad0 }, { kHIDUsage_Keypad1, Key_Numpad1 }, diff --git a/src/blackinput/win/keyboardwindows.cpp b/src/blackinput/win/keyboardwindows.cpp index c9b17fe75..970b4f42d 100644 --- a/src/blackinput/win/keyboardwindows.cpp +++ b/src/blackinput/win/keyboardwindows.cpp @@ -67,6 +67,8 @@ namespace BlackInput { VK_BACK, Key_Back }, { VK_TAB, Key_Tab }, { VK_ESCAPE, Key_Esc }, + { VK_SPACE, Key_Space }, + { WM_DEADCHAR, Key_DeadGrave }, { VK_MULTIPLY, Key_Multiply }, { VK_OEM_COMMA, Key_Comma }, { VK_NUMPAD0, Key_Numpad0 }, diff --git a/src/blackmisc/input/keyboardkey.cpp b/src/blackmisc/input/keyboardkey.cpp index fb0492fd2..61f55e4a2 100644 --- a/src/blackmisc/input/keyboardkey.cpp +++ b/src/blackmisc/input/keyboardkey.cpp @@ -58,19 +58,21 @@ namespace BlackMisc { case Key_Multiply: return QStringLiteral("NumMultiply"); // return QStringLiteral(u"×"); case Key_Divide: return QStringLiteral("NumDivide"); // return QStringLiteral(u"÷"); - case Key_Numpad0: return QStringLiteral("Num0"); - case Key_Numpad1: return QStringLiteral("Num1"); - case Key_Numpad2: return QStringLiteral("Num2"); - case Key_Numpad3: return QStringLiteral("Num3"); - case Key_Numpad4: return QStringLiteral("Num4"); - case Key_Numpad5: return QStringLiteral("Num5"); - case Key_Numpad6: return QStringLiteral("Num6"); - case Key_Numpad7: return QStringLiteral("Num7"); - case Key_Numpad8: return QStringLiteral("Num8"); - case Key_Numpad9: return QStringLiteral("Num9"); - case Key_Esc: return QStringLiteral("ESC"); - case Key_Tab: return QStringLiteral("Tab"); - case Key_Back: return QStringLiteral("Backspace"); + case Key_Numpad0: return QStringLiteral("Num0"); + case Key_Numpad1: return QStringLiteral("Num1"); + case Key_Numpad2: return QStringLiteral("Num2"); + case Key_Numpad3: return QStringLiteral("Num3"); + case Key_Numpad4: return QStringLiteral("Num4"); + case Key_Numpad5: return QStringLiteral("Num5"); + case Key_Numpad6: return QStringLiteral("Num6"); + case Key_Numpad7: return QStringLiteral("Num7"); + case Key_Numpad8: return QStringLiteral("Num8"); + case Key_Numpad9: return QStringLiteral("Num9"); + case Key_Esc: return QStringLiteral("ESC"); + case Key_Space: return QStringLiteral("Space"); + case Key_DeadGrave: return QStringLiteral("DeadGrave"); + case Key_Tab: return QStringLiteral("Tab"); + case Key_Back: return QStringLiteral("Backspace"); default: return QChar::fromLatin1(static_cast(m_keyCode)); } } diff --git a/src/blackmisc/input/keyboardkeylist.cpp b/src/blackmisc/input/keyboardkeylist.cpp index dd59b8575..b6717deb7 100644 --- a/src/blackmisc/input/keyboardkeylist.cpp +++ b/src/blackmisc/input/keyboardkeylist.cpp @@ -48,6 +48,8 @@ namespace BlackMisc CKeyboardKey(Key_Back), CKeyboardKey(Key_Tab), CKeyboardKey(Key_Esc), + CKeyboardKey(Key_Space), + CKeyboardKey(Key_DeadGrave), CKeyboardKey(Key_A), CKeyboardKey(Key_B), CKeyboardKey(Key_C), diff --git a/src/blackmisc/input/keycodes.h b/src/blackmisc/input/keycodes.h index bb5b88fa7..1d7153bd3 100644 --- a/src/blackmisc/input/keycodes.h +++ b/src/blackmisc/input/keycodes.h @@ -29,7 +29,9 @@ namespace BlackMisc Key_AltRight, Key_Back, Key_Tab, - Key_Esc, + Key_Esc = 27, + Key_Space = 32, + Key_DeadGrave, // message is sent for a combining key, such as a diacritic. Key_Plus = 43, Key_Comma, Key_Minus,